Deprecate support for "SkipMuxing", "IncludeSub" and "SubtitleLanguage"

Author: LittlePox

OKEGui/OKEGui/Model/Info/AudioInfo.cs

@@ -10,8 +10,6 @@ public class AudioInfo : Info
     {
         public string OutputCodec;
         public int Bitrate;
-        [ObsoleteAttribute("SkipMuxing is obsolete. Use MuxOption instead.", false)]
-        public bool SkipMuxing;
 
         public AudioInfo() : base()
         {

OKEGui/OKEGui/Properties/AssemblyInfo.cs

@@ -47,4 +47,4 @@
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.11.*")]
+[assembly: AssemblyVersion("5.0.*")]

OKEGui/OKEGui/Task/AddTaskService.cs

@@ -15,6 +15,16 @@ public static class AddTaskService
         public static TaskProfile LoadJsonAsProfile(string filePath, DirectoryInfo jsonDir)
         {
             string profileStr = File.ReadAllText(filePath);
+
+            foreach (string option in Constants.deprecatedOptions)
+            {
+                if (profileStr.IndexOf(option, StringComparison.OrdinalIgnoreCase) >= 0)
+                {
+                    MessageBox.Show(option + "已不再支持", "json文件版本太老了", MessageBoxButton.OK, MessageBoxImage.Error);
+                    return null;
+                }
+            }
+
             TaskProfile json;
             try
             {
@@ -125,17 +135,6 @@ public static TaskProfile ProcessJsonProfile(TaskProfile json, DirectoryInfo pro
                 }
             }
 
-            json.SubtitleLanguage = string.IsNullOrEmpty(json.SubtitleLanguage) ? Constants.language : json.SubtitleLanguage;
-            if (json.IncludeSub && json.SubtitleTracks == null)
-            {
-                MessageBox.Show("现在用SubtitleTracks指定字幕，指定了IncludeSub = true将视为有一条视频轨道", "IncludeSub不再使用", MessageBoxButton.OK, MessageBoxImage.Warning);
-                Info info = new Info
-                {
-                    Language = json.SubtitleLanguage
-                };
-                json.SubtitleTracks = new List<Info> { info };
-            }
-
             if (json.AudioTracks != null && json.AudioTracks.Count > 0)
             {
                 // 主音轨
@@ -160,11 +159,6 @@ public static TaskProfile ProcessJsonProfile(TaskProfile json, DirectoryInfo pro
                     {
                         track.Language = Constants.language;
                     }
-                    if (track.MuxOption == MuxOption.Default && track.SkipMuxing)
-                    {
-                        MessageBox.Show("现在用MuxOption指定封装法则，指定了SkipMuxing = true的音轨将不被抽取。", "SkipMuxing不再使用", MessageBoxButton.OK, MessageBoxImage.Warning);
-                        track.MuxOption = MuxOption.Skip;
-                    }
                 }
             }
             else

OKEGui/OKEGui/Task/TaskProfile.cs

@@ -22,10 +22,6 @@ public class TaskProfile : ICloneable
         public uint FpsDen;
         public List<AudioInfo> AudioTracks;
         public string InputScript;
-        [ObsoleteAttribute("IncludeSub is obsolete. Use SubtitleTracks instead.", false)]
-        public bool IncludeSub;
-        [ObsoleteAttribute("SubtitleLanguage is obsolete. Use SubtitleTracks instead.", false)]
-        public string SubtitleLanguage;
         public List<Info> SubtitleTracks;
         public List<string> InputFiles;
         public EpisodeConfig Config;

OKEGui/OKEGui/Utils/Constants.cs

@@ -66,5 +66,8 @@ public static class Constants
         public static readonly Regex inputRegex = new Regex("# *OKE:INPUTFILE([\\s]+\\w+[ ]*=[ ]*)([r]*[\"'].*[\"'])", RegexOptions.Multiline | RegexOptions.IgnoreCase);
         public static readonly Regex debugRegex = new Regex("# *OKE:DEBUG([\\s]+\\w+[ ]*=[ ]*)(\\w+)", RegexOptions.Multiline | RegexOptions.IgnoreCase);
 
+        //Deprecated option list
+        public static readonly List<string> deprecatedOptions = new List<string> { "SkipMuxing", "IncludeSub", "SubtitleLanguage" };
+
     }
 }