remove unusable code

ZjzMisaka · Aug 7, 2023 · 72151fe · 72151fe
1 parent ec6b71f
commit 72151fe
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 162 deletions.
diff --git a/DataTransformer/Helper/IniHelper.cs b/DataTransformer/Helper/IniHelper.cs
@@ -1,13 +1,8 @@
-using DocumentFormat.OpenXml.Wordprocessing;
-using IniParser;
+using IniParser;
 using IniParser.Model;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
 using System.Threading;
-using System.Threading.Tasks;
 using System.Windows;
 
 namespace DataTransformer
@@ -29,8 +24,6 @@ public static void CheckAndCreateIniFile()
             parsedINIDataToBeSaved["Thread"].AddKey("EnableTimeoutSetting", "False");
             parsedINIDataToBeSaved["Thread"].AddKey("TotalTimeoutLimitAnalyze", "120000");
             parsedINIDataToBeSaved["Thread"].AddKey("PerTimeoutLimitAnalyze", "60000");
-            parsedINIDataToBeSaved["Thread"].AddKey("TotalTimeoutLimitOutput", "120000");
-            parsedINIDataToBeSaved["Thread"].AddKey("PerTimeoutLimitOutput", "60000");
             parsedINIDataToBeSaved["Thread"].AddKey("FileSystemWatcherInvokeDalay", "1000");
             parsedINIDataToBeSaved["Thread"].AddKey("FreshInterval", "100");
             parsedINIDataToBeSaved.Sections.AddSection("Window");
@@ -168,55 +161,6 @@ public static int GetPerTimeoutLimitAnalyze()
             return Int32.Parse(data["Thread"]["PerTimeoutLimitAnalyze"]);
         }
 
-        public static void SetTotalTimeoutLimitOutput(int count)
-        {
-            if (!File.Exists("Setting.ini"))
-            {
-                return;
-            }
-
-            FileIniDataParser parser = new FileIniDataParser();
-            IniData data = parser.ReadFile("Setting.ini");
-            data["Thread"]["TotalTimeoutLimitOutput"] = count.ToString();
-            parser.WriteFile("Setting.ini", data);
-        }
-
-        public static int GetTotalTimeoutLimitOutput()
-        {
-            if (!File.Exists("Setting.ini"))
-            {
-                return -1;
-            }
-
-            FileIniDataParser parser = new FileIniDataParser();
-            IniData data = parser.ReadFile("Setting.ini");
-            return Int32.Parse(data["Thread"]["TotalTimeoutLimitOutput"]);
-        }
-        public static void SetPerTimeoutLimitOutput(int count)
-        {
-            if (!File.Exists("Setting.ini"))
-            {
-                return;
-            }
-
-            FileIniDataParser parser = new FileIniDataParser();
-            IniData data = parser.ReadFile("Setting.ini");
-            data["Thread"]["PerTimeoutLimitOutput"] = count.ToString();
-            parser.WriteFile("Setting.ini", data);
-        }
-
-        public static int GetPerTimeoutLimitOutput()
-        {
-            if (!File.Exists("Setting.ini"))
-            {
-                return -1;
-            }
-
-            FileIniDataParser parser = new FileIniDataParser();
-            IniData data = parser.ReadFile("Setting.ini");
-            return Int32.Parse(data["Thread"]["PerTimeoutLimitOutput"]);
-        }
-
         public static void SetFileSystemWatcherInvokeDalay(int time)
         {
             if (!File.Exists("Setting.ini"))

diff --git a/DataTransformer/Resources/StringResource.en-US.xaml b/DataTransformer/Resources/StringResource.en-US.xaml
@@ -23,16 +23,12 @@
     <sys:String x:Key="MenuEnableTimeoutSetting">Enable timeout setting (_E)</sys:String>
     <sys:String x:Key="MenuTotalTimeoutLimitAnalyze">Analysis stage timeout (_T)</sys:String>
     <sys:String x:Key="MenuPerTimeoutLimitAnalyze">Single analysis timeout (_P)</sys:String>
-    <sys:String x:Key="MenuTotalTimeoutLimitOutput">Output stage timeout (_T)</sys:String>
-    <sys:String x:Key="MenuPerTimeoutLimitOutput">Single output timeout (_P)</sys:String>
     <sys:String x:Key="MenuFileSystemWatcherInvokeDalay">Watch file response time (_D)</sys:String>
     <sys:String x:Key="MenuFreshInterval">Interface refresh interval in thread (_F)</sys:String>
     <sys:String x:Key="MaxThreadCount">_Maximum number of threads</sys:String>
     <sys:String x:Key="EnableTimeoutSetting">Enable timeout setting</sys:String>
     <sys:String x:Key="TotalTimeoutLimitAnalyze">Analysis stage timeout (ms)</sys:String>
     <sys:String x:Key="PerTimeoutLimitAnalyze">Single analysis timeout (ms)</sys:String>
-    <sys:String x:Key="TotalTimeoutLimitOutput">Output stage timeout (ms)</sys:String>
-    <sys:String x:Key="PerTimeoutLimitOutput">Single output timeout (ms)</sys:String>
     <sys:String x:Key="FileSystemWatcherInvokeDalay">Watch file response time (ms)</sys:String>
     <sys:String x:Key="FreshInterval">Interface refresh interval in thread (ms)</sys:String>
     <sys:String x:Key="MenuSourceCode">Source code (_C)</sys:String>

diff --git a/DataTransformer/Resources/StringResource.ja-JP.xaml b/DataTransformer/Resources/StringResource.ja-JP.xaml
@@ -23,16 +23,12 @@
     <sys:String x:Key="MenuEnableTimeoutSetting">タイムアウト設定を有効にする (_E)</sys:String>
     <sys:String x:Key="MenuTotalTimeoutLimitAnalyze">分析フェーズのタイムアウト (_T)</sys:String>
     <sys:String x:Key="MenuPerTimeoutLimitAnalyze">単一の分析のタイムアウト (_P)</sys:String>
-    <sys:String x:Key="MenuTotalTimeoutLimitOutput">出力ステージのタイムアウト (_T)</sys:String>
-    <sys:String x:Key="MenuPerTimeoutLimitOutput">単一出力タイムアウト (_P)</sys:String>
     <sys:String x:Key="MenuFileSystemWatcherInvokeDalay">ウォッチファイル反応時間 (_D)</sys:String>
     <sys:String x:Key="MenuFreshInterval">スレッド内のインターフェイスの更新間隔 (_F)</sys:String>
     <sys:String x:Key="MaxThreadCount">スレッドの最大数</sys:String>
     <sys:String x:Key="EnableTimeoutSetting">タイムアウト設定を有効にする</sys:String>
     <sys:String x:Key="TotalTimeoutLimitAnalyze">分析フェーズのタイムアウト (ms)</sys:String>
     <sys:String x:Key="PerTimeoutLimitAnalyze">単一の分析のタイムアウト (ms)</sys:String>
-    <sys:String x:Key="TotalTimeoutLimitOutput">出力ステージのタイムアウト (ms)</sys:String>
-    <sys:String x:Key="PerTimeoutLimitOutput">単一出力タイムアウト (ms)</sys:String>
     <sys:String x:Key="FileSystemWatcherInvokeDalay">ウォッチファイル反応時間 (ms)</sys:String>
     <sys:String x:Key="FreshInterval">スレッド内のインターフェイスの更新間隔 (ms)</sys:String>
     <sys:String x:Key="MenuSourceCode">ソフトウェアのソースコード (_C)</sys:String>

diff --git a/DataTransformer/Resources/StringResource.zh-CN.xaml b/DataTransformer/Resources/StringResource.zh-CN.xaml
@@ -23,16 +23,12 @@
     <sys:String x:Key="MenuEnableTimeoutSetting">启用超时时间设置 (_E)</sys:String>
     <sys:String x:Key="MenuTotalTimeoutLimitAnalyze">分析阶段超时时间 (_T)</sys:String>
     <sys:String x:Key="MenuPerTimeoutLimitAnalyze">单次分析超时时间 (_P)</sys:String>
-    <sys:String x:Key="MenuTotalTimeoutLimitOutput">输出阶段超时时间 (_T)</sys:String>
-    <sys:String x:Key="MenuPerTimeoutLimitOutput">单次输出超时时间 (_P)</sys:String>
     <sys:String x:Key="MenuFileSystemWatcherInvokeDalay">监视文件响应时间 (_D)</sys:String>
     <sys:String x:Key="MenuFreshInterval">线程中界面刷新间隔 (_F)</sys:String>
     <sys:String x:Key="MaxThreadCount">最大线程数</sys:String>
     <sys:String x:Key="EnableTimeoutSetting">启用超时时间设置</sys:String>
     <sys:String x:Key="TotalTimeoutLimitAnalyze">分析阶段超时时间 (ms)</sys:String>
     <sys:String x:Key="PerTimeoutLimitAnalyze">单次分析超时时间 (ms)</sys:String>
-    <sys:String x:Key="TotalTimeoutLimitOutput">输出阶段超时时间 (ms)</sys:String>
-    <sys:String x:Key="PerTimeoutLimitOutput">单次输出超时时间 (ms)</sys:String>
     <sys:String x:Key="FileSystemWatcherInvokeDalay">监视文件响应时间 (ms)</sys:String>
     <sys:String x:Key="FreshInterval">线程中界面刷新间隔 (ms)</sys:String>
     <sys:String x:Key="MenuSourceCode">软件源码 (_C)</sys:String>

diff --git a/DataTransformer/Setting.ini b/DataTransformer/Setting.ini
@@ -3,8 +3,6 @@ MaxThreadCount = 25
 EnableTimeoutSetting = False
 TotalTimeoutLimitAnalyze = 120000
 PerTimeoutLimitAnalyze = 60000
-TotalTimeoutLimitOutput = 120000
-PerTimeoutLimitOutput = 60000
 FileSystemWatcherInvokeDalay = 1000
 FreshInterval = 100
 

diff --git a/DataTransformer/View/MainWindow.xaml b/DataTransformer/View/MainWindow.xaml
@@ -55,8 +55,6 @@
                                 <MenuItem Header="{DynamicResource MenuEnableTimeoutSetting}" Name="menu_enable_timeout_setting" Command="{Binding MenuSetCheckboxCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Self}}" />
                                 <MenuItem Header="{DynamicResource MenuTotalTimeoutLimitAnalyze}" Name="menu_total_timeout_limit_analyze" Command="{Binding MenuSetStrCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Self}}" />
                                 <MenuItem Header="{DynamicResource MenuPerTimeoutLimitAnalyze}" Name="menu_per_timeout_limit_analyze" Command="{Binding MenuSetStrCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Self}}" />
-                                <MenuItem Header="{DynamicResource MenuTotalTimeoutLimitOutput}" Name="menu_total_timeout_limit_output" Command="{Binding MenuSetStrCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Self}}" />
-                                <MenuItem Header="{DynamicResource MenuPerTimeoutLimitOutput}" Name="menu_per_timeout_limit_output" Command="{Binding MenuSetStrCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Self}}" />
                                 <MenuItem Header="{DynamicResource MenuFileSystemWatcherInvokeDalay}" Name="menu_file_system_watcher_invoke_dalay" Command="{Binding MenuSetStrCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Self}}" />
                                 <MenuItem Header="{DynamicResource MenuFreshInterval}" Name="menu_fresh_interval" Command="{Binding MenuSetStrCommand}" CommandParameter="{Binding RelativeSource={RelativeSource Self}}" />
                             </MenuItem>

diff --git a/DataTransformer/ViewModel/MainWindowViewModel.cs b/DataTransformer/ViewModel/MainWindowViewModel.cs
@@ -44,14 +44,12 @@ class MainWindowViewModel : ObservableObject, IDropTarget
     {
         private enum ReadFileReturnType { ANALYZER, FILEPATH };
         private SmartThreadPool smartThreadPoolAnalyze = null;
-        private SmartThreadPool smartThreadPoolOutput = null;
         private Thread runningThread;
         private Thread runBeforeAnalyzeCsvThread;
         private Thread runBeforeSetResultThread;
         private Thread runEndThread;
         private Thread fileSystemWatcherInvokeThread;
         private ConcurrentDictionary<string, long> currentAnalizingDictionary;
-        private ConcurrentDictionary<string, long> currentOutputtingDictionary;
         private ConcurrentDictionary<string, Analyzer> analyzerListForSetResult;
         private Dictionary<FileSystemWatcher, string> fileSystemWatcherDic;
         private Stopwatch stopwatchBeforeFileSystemWatcherInvoke;
@@ -60,8 +58,6 @@ private enum ReadFileReturnType { ANALYZER, FILEPATH };
         private bool enableTimeoutSetting;
         private int totalTimeoutLimitAnalyze;
         private int perTimeoutLimitAnalyze;
-        private int totalTimeoutLimitOutput;
-        private int perTimeoutLimitOutput;
         private bool runNotSuccessed;
         private Scanner scanner;
         private int fileSystemWatcherInvokeDalay;
@@ -518,7 +514,6 @@ public MainWindowViewModel()
             ICSharpCode.AvalonEdit.Search.SearchPanel.Install(TeLog);
 
             currentAnalizingDictionary = new ConcurrentDictionary<string, long>();
-            currentOutputtingDictionary = new ConcurrentDictionary<string, long>();
             fileSystemWatcherDic = new Dictionary<FileSystemWatcher, string>();
             scanner = new Scanner();
 
@@ -643,8 +638,6 @@ private void WindowLoaded(RoutedEventArgs eventArgs)
             enableTimeoutSetting = IniHelper.GetEnableTimeoutSetting();
             totalTimeoutLimitAnalyze = IniHelper.GetTotalTimeoutLimitAnalyze();
             perTimeoutLimitAnalyze = IniHelper.GetPerTimeoutLimitAnalyze();
-            totalTimeoutLimitOutput = IniHelper.GetTotalTimeoutLimitOutput();
-            perTimeoutLimitOutput = IniHelper.GetPerTimeoutLimitOutput();
 
             CbExecuteInSequenceIsChecked = IniHelper.GetIsExecuteInSequence();
             CbIsAutoOpenIsChecked = IniHelper.GetIsAutoOpen();
@@ -938,42 +931,6 @@ private void MenuSetStr(object sender)
                 }
                 IniHelper.SetPerTimeoutLimitAnalyze(perTimeoutLimitAnalyze);
             }
-            else if (((MenuItem)sender).Name == "menu_total_timeout_limit_output")
-            {
-                textBox.Text = IniHelper.GetTotalTimeoutLimitOutput().ToString();
-                int res = CustomizableMessageBox.MessageBox.Show(new RefreshList { textBox, new ButtonSpacer(1, GridUnitType.Star, true), Application.Current.FindResource("Ok").ToString(), Application.Current.FindResource("Cancel").ToString() }, Application.Current.FindResource("TotalTimeoutLimitOutput").ToString(), Application.Current.FindResource("Setting").ToString());
-                if (res == 3)
-                {
-                    return;
-                }
-                try
-                {
-                    totalTimeoutLimitOutput = int.Parse(textBox.Text.Trim());
-                }
-                catch (Exception ex)
-                {
-                    CustomizableMessageBox.MessageBox.Show(new RefreshList { new ButtonSpacer(), Application.Current.FindResource("Ok").ToString() }, ex.Message, Application.Current.FindResource("Error").ToString(), MessageBoxImage.Error);
-                }
-                IniHelper.SetTotalTimeoutLimitOutput(totalTimeoutLimitOutput);
-            }
-            else if (((MenuItem)sender).Name == "menu_per_timeout_limit_output")
-            {
-                textBox.Text = IniHelper.GetPerTimeoutLimitOutput().ToString();
-                int res = CustomizableMessageBox.MessageBox.Show(new RefreshList { textBox, new ButtonSpacer(1, GridUnitType.Star, true), Application.Current.FindResource("Ok").ToString(), Application.Current.FindResource("Cancel").ToString() }, Application.Current.FindResource("PerTimeoutLimitOutput").ToString(), Application.Current.FindResource("Setting").ToString());
-                if (res == 3)
-                {
-                    return;
-                }
-                try
-                {
-                    perTimeoutLimitOutput = int.Parse(textBox.Text.Trim());
-                }
-                catch (Exception ex)
-                {
-                    CustomizableMessageBox.MessageBox.Show(new RefreshList { new ButtonSpacer(), Application.Current.FindResource("Ok").ToString() }, ex.Message, Application.Current.FindResource("Error").ToString(), MessageBoxImage.Error);
-                }
-                IniHelper.SetPerTimeoutLimitOutput(perTimeoutLimitOutput);
-            }
             else if (((MenuItem)sender).Name == "menu_file_system_watcher_invoke_dalay")
             {
                 textBox.Text = IniHelper.GetFileSystemWatcherInvokeDalay().ToString();
@@ -2558,7 +2515,6 @@ private async Task<bool> StartLogic(List<CsvExplainer> csvExplainers, List<Analy
             analyzeCsvInvokeCount = 0;
             analyzerListForSetResult = new ConcurrentDictionary<string, Analyzer>();
             currentAnalizingDictionary = new ConcurrentDictionary<string, long>();
-            currentOutputtingDictionary = new ConcurrentDictionary<string, long>();
             GlobalObjects.GlobalObjects.ClearGlobalParamDic();
 
             GlobalDic.Reset();
@@ -2591,24 +2547,6 @@ private async Task<bool> StartLogic(List<CsvExplainer> csvExplainers, List<Analy
             };
             RenewSmartThreadPoolAnalyze(stpAnalyze);
 
-            STPStartInfo stpOutput = new STPStartInfo();
-            stpOutput.CallToPostExecute = CallToPostExecute.WhenWorkItemNotCanceled;
-            stpOutput.PostExecuteWorkItemCallback = delegate (IWorkItemResult wir)
-            {
-                string filePath = null;
-                try
-                {
-                    filePath = wir.GetResult().ToString();
-                }
-                catch (Exception ex)
-                {
-                    Logger.Error(ex.Message + "\n" + ex.StackTrace);
-                }
-
-                currentOutputtingDictionary.TryRemove(filePath, out _);
-            };
-            RenewSmartThreadPoolOutput(stpOutput);
-
             Dictionary<Analyzer, Tuple<RunOption, CsvExplainer>> compilerDic = new Dictionary<Analyzer, Tuple<RunOption, CsvExplainer>>();
             int totalCount = 0;
             for (int i = 0; i < csvExplainers.Count; ++i)
@@ -2832,18 +2770,18 @@ private async Task<bool> StartLogic(List<CsvExplainer> csvExplainers, List<Analy
                         return false;
                     }
                     long timeCostSs = GetNowSs() - startTime;
-                    if (enableTimeoutSetting && perTimeoutLimitOutput > 0 && timeCostSs >= perTimeoutLimitOutput)
+                    if (enableTimeoutSetting && perTimeoutLimitAnalyze > 0 && timeCostSs >= perTimeoutLimitAnalyze)
                     {
                         runEndThread.Interrupt();
                         runEndThread.Join();
 
                         if (!isAuto)
                         {
-                            CustomizableMessageBox.MessageBox.Show(new RefreshList { new ButtonSpacer(), Application.Current.FindResource("Ok").ToString() }, $"RunEnd\n{Application.Current.FindResource("Timeout").ToString()}. \n{perTimeoutLimitOutput / 1000.0}(s)", Application.Current.FindResource("Error").ToString(), MessageBoxImage.Error);
+                            CustomizableMessageBox.MessageBox.Show(new RefreshList { new ButtonSpacer(), Application.Current.FindResource("Ok").ToString() }, $"RunEnd\n{Application.Current.FindResource("Timeout").ToString()}. \n{perTimeoutLimitAnalyze / 1000.0}(s)", Application.Current.FindResource("Error").ToString(), MessageBoxImage.Error);
                         }
                         else
                         {
-                            Logger.Error($"RunEnd\n{Application.Current.FindResource("Timeout").ToString()}. \n{perTimeoutLimitOutput / 1000.0}(s)");
+                            Logger.Error($"RunEnd\n{Application.Current.FindResource("Timeout").ToString()}. \n{perTimeoutLimitAnalyze / 1000.0}(s)");
                         }
                         FinishRunning(true);
                         return false;
@@ -3179,19 +3117,6 @@ private void RenewSmartThreadPoolAnalyze(STPStartInfo stp)
             }
         }
 
-        private void RenewSmartThreadPoolOutput(STPStartInfo stp)
-        {
-            if (smartThreadPoolOutput != null)
-            {
-                smartThreadPoolOutput.Dispose();
-            }
-            smartThreadPoolOutput = new SmartThreadPool(stp);
-            if (maxThreadCount > 0)
-            {
-                smartThreadPoolOutput.MaxThreads = maxThreadCount;
-            }
-        }
-
         private void SetAutoStatusAll()
         {
             List<String> rulesList = Directory.GetFiles(".\\Rules", "*.json").ToList();
@@ -3228,17 +3153,6 @@ private void CheckAndCloseThreads(bool isCloseWindow)
                     // DO NOTHING
                 }
             }
-            if (smartThreadPoolOutput != null && !smartThreadPoolOutput.IsShuttingdown)
-            {
-                try
-                {
-                    smartThreadPoolOutput.Shutdown();
-                }
-                catch
-                {
-                    // DO NOTHING
-                }
-            }
             if (runBeforeAnalyzeCsvThread != null && runBeforeAnalyzeCsvThread.IsAlive)
             {
                 runBeforeAnalyzeCsvThread.Interrupt();