some misc bug fixed with a few improved.

1.bug fix: 'PrepareTemporaryDirectory' and 'PrepareOutputDirectory' try to change UI elements' properties directly in build thread. 2.bug fix: a key name error in Simplified Chinese translation file. 3.bug fix: multi-line text translation was broken. 4.add a message to build output when caught a exception in build thread.
timefox · May 4, 2020 · a60b98f · a60b98f
1 parent 4175621
commit a60b98f
Show file tree

Hide file tree

Showing 5 changed files with 221 additions and 193 deletions.
diff --git a/LanguageFiles/zh_cn.lang b/LanguageFiles/zh_cn.lang
@@ -251,5 +251,7 @@ String142=ʧ
 String143=��ɡ�
 String144=���ڼ����ʱĿ¼���趨
 String145=���ڼ��ʣ����̿ռ�
-String147=���ڼ�����Ŀ¼���趨
-String146=���ڼ������ļ���������
+String146=���ڼ�����Ŀ¼���趨
+String147=���ڼ������ļ���������
+String148=ʱ������ֹ��
+String149=��
diff --git a/TeconMoon's WiiVC Injector/Form1.cs b/TeconMoon's WiiVC Injector/Form1.cs
@@ -2350,7 +2350,7 @@ private void CancelBuild()
 
         private bool PrepareTemporaryDirectory()
         {
-            TemporaryDirectory.Text = TemporaryDirectory.Text.Trim();
+            Invoke(new Action(() => { TemporaryDirectory.Text = TemporaryDirectory.Text.Trim(); }));
 
             string tempDir = TemporaryDirectory.Text;
 
@@ -2382,7 +2382,7 @@ private bool PrepareTemporaryDirectory()
             //
             // Restore the default temp dir location on failed.
             //
-            TemporaryDirectory.Text = Path.GetTempPath();
+            Invoke(new Action(() => { TemporaryDirectory.Text = Path.GetTempPath(); }));
             Registry.CurrentUser.CreateSubKey("WiiVCInjector")
                 .DeleteValue("TemporaryDirectory");
 
@@ -2420,8 +2420,9 @@ private bool CheckFreeDiskSpaceForPack()
 
         private bool PrepareOutputDirectory()
         {
-            // Specify Path Variables to be called later
-            OutputDirectory.Text = OutputDirectory.Text.Trim();
+            // Specify Path Variables to be called later           
+            Invoke(new Action(() => { OutputDirectory.Text = OutputDirectory.Text.Trim(); }));
+
             if (String.IsNullOrEmpty(OutputDirectory.Text))
             {
                 FolderBrowserDialog OutputFolderSelect = new FolderBrowserDialog();
@@ -3210,7 +3211,7 @@ private bool BuildPack()
         {
             BuildStep[] buildSteps = new BuildStep[]
             {
-new BuildStep
+                new BuildStep
                 {
                     buildAction = PrepareTemporaryDirectory,
                     description = tr.Tr("Checking temporary directory"),
@@ -3280,12 +3281,6 @@ private bool BuildPack()
 
             ThrowProcessException = true;
             int succeed = 0;
-            int totalProgress = 0;
-
-            foreach (BuildStep buildStep in buildSteps)
-            {
-                totalProgress += buildStep.progressWeight;
-            }
 
             Stopwatch stepStopwatch = new Stopwatch();
 
@@ -3320,7 +3315,7 @@ private bool BuildPack()
                     {
                         BeginInvoke(ActBuildOutput, new BuildOutputItem()
                         {
-                            s = buildStatus + tr.Tr("failed.") + "\r\n\r\n",
+                            s = buildStep.description + tr.Tr("failed.") + "\r\n\r\n",
                             buildOutputType = BuildOutputType.botError,
                         });
                         break;
@@ -3341,6 +3336,12 @@ private bool BuildPack()
                 catch (Exception ex)
                 {
                     Console.Write("buildStep throws an exception: " + ex.Message);
+                    BeginInvoke(ActBuildOutput, new BuildOutputItem()
+                    {
+                        s = buildStep.description + tr.Tr(" terminated unexpectedly: ") + ex.Message + tr.Tr(".") + "\r\n\r\n",
+                        buildOutputType = BuildOutputType.botError,
+                    });
+
                     break;
                 }
             }
@@ -3501,12 +3502,11 @@ private void AutoBuildDragDrop(DragEventArgs e)
                 String[] files = (String[])e.Data.GetData(DataFormats.FileDrop);
                 foreach (String s in files)
                 {
-                    FileAttributes attr = File.GetAttributes(s);
-
                     //detect whether its a directory or file
-                    if ((attr & FileAttributes.Directory) == FileAttributes.Directory)
+                    if (Directory.Exists(s))
                     {
-                        foreach (string file in "*.iso|*.wbfs".Split(',', ';', '|').SelectMany(_ => Directory.EnumerateFiles(s, "*" + _, System.IO.SearchOption.AllDirectories)))
+                        foreach (string file in "*.iso|*.wbfs".Split('|').SelectMany(
+                            pattern => Directory.EnumerateFiles(s, pattern, System.IO.SearchOption.AllDirectories)))
                         {
                             Program.AppendAutoBuildList(file);
                         }