[修复] 修复各种bug

Author: kice

OKEGui/OKEGui/Gui/WizardWindow.xaml.cs

@@ -448,7 +448,7 @@ public class JsonProfile
             public string ProjectName { get; set; }
             public string EncoderType { get; set; }
             public string Encoder { get; set; }
-            public string EnocderParam { get; set; }
+            public string EncoderParam { get; set; }
             public string ContainerFormat { get; set; }
             public string VideoFormat { get; set; }
             public List<JobDetails.AudioInfo> AudioTracks { get; set; }
@@ -480,7 +480,7 @@ private bool LoadJsonProfile(string profile)
                 wizardInfo.EncoderInfo = this.GetEncoderInfo(wizardInfo.EncoderPath);
             }
 
-            wizardInfo.EncoderParam = okeProj.EnocderParam;
+            wizardInfo.EncoderParam = okeProj.EncoderParam;
 
             Dictionary<string, ComboBoxItem> comboItems = new Dictionary<string, ComboBoxItem>() {
                 { "MKV",    MKVContainer},
@@ -522,8 +522,12 @@ private bool LoadJsonProfile(string profile)
             }
             comboItems[wizardInfo.AudioFormat].IsSelected = true;
 
-            wizardInfo.InputScript = new FileInfo(projDir.FullName + "\\" + okeProj.InputScript).FullName;
-            wizardInfo.VSScript = File.ReadAllText(wizardInfo.InputScript);
+            var scriptFile = new FileInfo(projDir.FullName + "\\" + okeProj.InputScript);
+
+            if (scriptFile.Exists) {
+                wizardInfo.InputScript = scriptFile.FullName;
+                wizardInfo.VSScript = File.ReadAllText(wizardInfo.InputScript);
+            }
 
             // 预览
             wizardInfo.ProjectPreview += "项目名字: " + wizardInfo.TaskNamePrefix;
@@ -638,8 +642,12 @@ private void OpenProjectBtn_Click(object sender, RoutedEventArgs e)
             }
             comboItems[wizardInfo.AudioFormat].IsSelected = true;
 
-            wizardInfo.InputScript = new FileInfo(projDir.FullName + "\\" + okeproj.ReadString("OKEProject", "InputScript", "")).FullName;
-            wizardInfo.VSScript = File.ReadAllText(wizardInfo.InputScript);
+            var scriptFile = new FileInfo(projDir.FullName + "\\" + okeproj.ReadString("OKEProject", "InputScript", ""));
+
+            if (scriptFile.Exists) {
+                wizardInfo.InputScript = scriptFile.FullName;
+                wizardInfo.VSScript = File.ReadAllText(wizardInfo.InputScript);
+            }
 
             // 预览
             wizardInfo.ProjectPreview += "项目名字: " + wizardInfo.TaskNamePrefix;

OKEGui/OKEGui/OKEGui.csproj

@@ -140,6 +140,7 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <None Include="demo.json" />
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>

OKEGui/OKEGui/demo.json

@@ -14,26 +14,28 @@
 //InputScript = demo1.vpy
 //ExtractAudioTrack = true(暂时不使用)
 {
-      "Version" : 2,
-      "ProjectName" : "Demo2",
-      "EncoderType" : "x265",
-      "Encoder" : "x265-10b.exe",
-      "EnocderParam" : "--crf 19",
-      "ContainerFormat" : "mkv",
-      "VideoFormat" : "hevc",
-      // "AudioFormat" : "flac"
-      // 封装顺序安装json文件顺序
-      // track是第几个音轨？并不是第几个轨道
-      "AudioTracks" : [{
-            "TrackId" : 1, 
-            "Format" : "aac",
-            "Bitrate" : 128,
-            "ExtraArg" : "-adst"
-      },
-      {
-            "TrackId" : 0, 
-            "Format" : "flac",
-            "SkipMuxing" : true
-      }],
-      "InputScript" : "demo1.vpy"
+    "Version": 2,
+    "ProjectName": "Demo2",
+    "EncoderType": "x265",
+    "Encoder": "x265-10b.exe",
+    "EncoderParam": "--crf 19",
+    "ContainerFormat": "mkv",
+    "VideoFormat": "hevc",
+    // "AudioFormat" : "flac"
+    // 封装顺序安装json文件顺序
+    // track是第几个音轨？并不是第几个轨道
+    "AudioTracks": [
+        {
+            "TrackId": 1,
+            "Format": "aac",
+            "Bitrate": 128,
+            "ExtraArg": "-adst"
+        },
+        {
+            "TrackId": 0,
+            "Format": "flac",
+            "SkipMuxing": true
+        }
+    ],
+    "InputScript": "demo1.vpy"
 }