WinGui: Completely replace the plist preset import code with the functionality built into libhb. This now allows the new json preset format to be imported, as well as the legacy plist format.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7318 b64f7644-9d1e-0410-96f1-a4d463321fa5

5 files changed, 103 insertions, 460 deletions

diff --git a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
index 82c5eb329..a95c9b1ea 100644
--- a/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs
@@ -46,7 +46,7 @@ namespace HandBrakeWPF.Services.Presets.Factories
             preset.Name = importedPreset.PresetName;

             preset.Description = importedPreset.PresetDescription;

             preset.UsePictureFilters = importedPreset.UsesPictureFilters;

-            preset.UseDeinterlace = importedPreset.PictureDecombDeinterlace;

+            preset.UseDeinterlace = !importedPreset.PictureDecombDeinterlace;

             preset.Task = new EncodeTask();

 

             // Step 1, Create the EncodeTask Object that can be loaded into the UI.

diff --git a/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistFactory.cs b/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistFactory.cs
index eb38c62ad..d50f23be9 100644
--- a/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistFactory.cs
@@ -96,25 +96,6 @@ namespace HandBrakeWPF.Services.Presets.Factories
         }

 

         /// <summary>

-        /// The get null bool value.

-        /// </summary>

-        /// <param name="value">

-        /// The value.

-        /// </param>

-        /// <returns>

-        /// The System.String.

-        /// </returns>

-        private static string getNullBoolValue(bool? value)

-        {

-            if (!value.HasValue)

-            {

-                return "1";

-            }

-

-            return value.Value ? "1" : "0";

-        }

-

-        /// <summary>

         /// Add the encode settings to the preset

         /// </summary>

         /// <param name="xmlWriter">

diff --git a/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistPresetFactory.cs b/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistPresetFactory.cs
deleted file mode 100644
index d58e111eb..000000000
--- a/win/CS/HandBrakeWPF/Services/Presets/Factories/PlistPresetFactory.cs
+++ /dev/null
@@ -1,440 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------

-// <copyright file="PlistPresetFactory.cs" company="HandBrake Project (http://handbrake.fr)">

-//   This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.

-// </copyright>

-// <summary>

-//   A Factory to translate a Plist object into a Preset.

-// </summary>

-// --------------------------------------------------------------------------------------------------------------------

-

-namespace HandBrakeWPF.Services.Presets.Factories

-{

-    using System.Collections.Generic;

-    using System.Collections.ObjectModel;

-    using System.ComponentModel;

-    using System.Globalization;

-    using System.Linq;

-

-    using HandBrake.ApplicationServices.Services.Encode.Model;

-    using HandBrake.ApplicationServices.Services.Encode.Model.Models;

-    using HandBrake.ApplicationServices.Services.Encode.Model.Models.Video;

-    using HandBrake.ApplicationServices.Utilities;

-    using HandBrake.ApplicationServices.Interop.Model.Encoding;

-

-    using HandBrakeWPF.Model.Audio;

-    using HandBrakeWPF.Model.Subtitles;

-    using HandBrakeWPF.Services.Presets;

-    using HandBrakeWPF.Services.Presets.Model;

-    using HandBrakeWPF.Utilities;

-

-    using PresetPictureSettingsMode = HandBrakeWPF.Model.Picture.PresetPictureSettingsMode;

-

-    /// <summary>

-    /// A Factory to translate a Plist object into a Preset.

-    /// </summary>

-    public class PlistPresetFactory

-    {

-        /// <summary>

-        /// The lang list.

-        /// </summary>

-        private static IDictionary<string, string> langList;

-

-        /// <summary>

-        /// Initializes static members of the <see cref="PlistPresetFactory"/> class. 

-        /// </summary>

-        static PlistPresetFactory()

-        {

-            IDictionary<string, string> langMap = LanguageUtilities.MapLanguages();

-            langList = (from entry in langMap select entry).ToDictionary(pair => pair.Value, pair => pair.Key);

-        }

-

-        /// <summary>

-        /// The create preset.

-        /// </summary>

-        /// <param name="plist">

-        /// The plist.

-        /// </param>

-        /// <returns>

-        /// The <see cref="Preset"/>.

-        /// </returns>

-        public static Preset CreatePreset(PList plist)

-        {

-            Preset preset = new Preset

-                                {

-                                    Task = new EncodeTask(),

-                                    Category = PresetService.UserPresetCatgoryName,

-                                    AudioTrackBehaviours = new AudioBehaviours(),

-                                    SubtitleTrackBehaviours = new SubtitleBehaviours()

-                                };

-

-            // Parse the settings out.

-            foreach (var item in plist)

-            {

-                if (item.Key == "AudioList")

-                {

-                    List<AudioTrack> tracks = ParseAudioTracks(item.Value);

-                    preset.Task.AudioTracks = new ObservableCollection<AudioTrack>(tracks);

-                }

-                else

-                {

-                    ParseSetting(item, preset);

-                }

-            }

-

-            // Handle the PictureDecombDeinterlace key

-            if (preset.UseDeinterlace)

-            {

-                preset.Task.Decomb = Decomb.Off;

-                preset.Task.CustomDecomb = string.Empty;

-            }

-

-            // Depending on the selected preset options, we may need to change some settings around.

-            // If the user chose not to use fitlers, remove them.

-            if (!preset.UsePictureFilters)

-            {

-                preset.Task.Detelecine = Detelecine.Off;

-                preset.Task.Denoise = Denoise.Off;

-                preset.Task.Deinterlace = Deinterlace.Off;

-                preset.Task.Decomb = Decomb.Off;

-                preset.Task.Deblock = 0;

-                preset.Task.Grayscale = false;

-            }

-

-            // IF we are using Source Max, Set the Max Width / Height values.

-            if (preset.PictureSettingsMode == PresetPictureSettingsMode.SourceMaximum)

-            {

-                preset.Task.MaxWidth = preset.Task.Height;

-                preset.Task.MaxHeight = preset.Task.Width;

-            }

-

-            return preset;

-        }

-

-        /// <summary>

-        /// Parse a setting and set it in the given preset.

-        /// </summary>

-        /// <param name="kvp">

-        /// The kvp setting pair.

-        /// </param>

-        /// <param name="preset">

-        /// The preset object.

-        /// </param>

-        private static void ParseSetting(KeyValuePair<string, dynamic> kvp, Preset preset)

-        {

-            switch (kvp.Key)

-            {

-                // Output Settings

-                case "FileFormat":

-                    preset.Task.OutputFormat = Converters.GetFileFormat(kvp.Value.Replace("file", string.Empty).Trim());

-                    break;

-                case "Mp4HttpOptimize":

-                    preset.Task.OptimizeMP4 = kvp.Value == 1;

-                    break;

-                case "Mp4iPodCompatible":

-                    preset.Task.IPod5GSupport = kvp.Value == 1;

-                    break;

-

-                // Picture Settings

-                case "PictureAutoCrop":

-                    preset.Task.HasCropping = kvp.Value != 1;

-                    break;

-                case "PictureTopCrop":

-                    preset.Task.Cropping.Top = kvp.Value;

-                    break;

-                case "PictureBottomCrop":

-                    preset.Task.Cropping.Bottom = kvp.Value;

-                    break;

-                case "PictureLeftCrop":

-                    preset.Task.Cropping.Left = kvp.Value;

-                    break;

-                case "PictureRightCrop":

-                    preset.Task.Cropping.Right = kvp.Value;

-                    break;

-                case "PictureHeight":

-                    preset.Task.Height = kvp.Value == null || kvp.Value == 0 ? null : kvp.Value;

-                    break;

-                case "PictureWidth":

-                    preset.Task.Width = kvp.Value == null || kvp.Value == 0 ? null : kvp.Value;

-                    break;

-                case "PictureKeepRatio":

-                    preset.Task.KeepDisplayAspect = kvp.Value == 1;

-                    break;

-                case "PicturePAR":

-                    preset.Task.Anamorphic = (Anamorphic)kvp.Value;

-                    break;

-                case "PictureModulus":

-                    preset.Task.Modulus = kvp.Value;

-                    break;

-

-                // Filters

-                case "PictureDeblock":

-                    preset.Task.Deblock = kvp.Value;

-                    break;

-                case "PictureDecomb":

-                    preset.Task.Decomb = (Decomb)kvp.Value;

-                    break;

-                case "PictureDecombCustom":

-                    preset.Task.CustomDecomb = kvp.Value;

-                    break;

-                case "PictureDecombDeinterlace":

-                    preset.UseDeinterlace = kvp.Value == true;

-                    break;

-                case "PictureDeinterlace":

-                    preset.Task.Deinterlace = (Deinterlace)kvp.Value;

-                    break;

-                case "PictureDeinterlaceCustom":

-                    preset.Task.CustomDeinterlace = kvp.Value;

-                    break;

-                case "PictureDenoise":

-                    preset.Task.Denoise = (Denoise)kvp.Value;

-                    break;

-                case "DenoisePreset":

-                    preset.Task.DenoisePreset = (DenoisePreset)kvp.Value; // TODO to be confirmed.

-                    break;

-                case "DenoiseTune":

-                    preset.Task.DenoiseTune = (DenoiseTune)kvp.Value; // TODO to be confirmed.

-                    break;

-                case "PictureDenoiseCustom":

-                    preset.Task.CustomDenoise = kvp.Value;

-                    break;

-                case "PictureDetelecine":

-                    preset.Task.Detelecine = (Detelecine)kvp.Value;

-                    break;

-                case "PictureDetelecineCustom":

-                    preset.Task.CustomDetelecine = kvp.Value;

-                    break;

-

-                // Video Tab

-                case "VideoAvgBitrate":

-                    if (!string.IsNullOrEmpty(kvp.Value))

-                    {

-                        preset.Task.VideoBitrate = int.Parse(kvp.Value);

-                    }

-                    break;

-                case "VideoEncoder":

-                    preset.Task.VideoEncoder = EnumHelper<VideoEncoder>.GetValue(kvp.Value);

-                    break;

-                case "VideoFramerate":

-                    preset.Task.Framerate = kvp.Value == "Same as source" || string.IsNullOrEmpty(kvp.Value) ? null : double.Parse(kvp.Value, CultureInfo.InvariantCulture);

-                    break;

-                case "VideoFramerateMode":

-                    string parsedValue = kvp.Value;

-                    switch (parsedValue)

-                    {

-                        case "vfr":

-                            preset.Task.FramerateMode = FramerateMode.VFR;

-                            break;

-                        case "cfr":

-                            preset.Task.FramerateMode = FramerateMode.CFR;

-                            break;

-                        default:

-                            preset.Task.FramerateMode = FramerateMode.PFR;

-                            break;

-                    }

-                    break;

-                case "VideoGrayScale":

-                    preset.Task.Grayscale = kvp.Value == true;

-                    break;

-                case "VideoQualitySlider":

-                    preset.Task.Quality = double.Parse(kvp.Value.ToString(), CultureInfo.InvariantCulture);

-                    break;

-                case "VideoQualityType": // The Type of Quality Mode used

-                    preset.Task.VideoEncodeRateType = (VideoEncodeRateType)kvp.Value;

-                    break;

-                case "VideoTurboTwoPass":

-                    preset.Task.TurboFirstPass = kvp.Value == 1;

-                    break;

-                case "VideoTwoPass":

-                    preset.Task.TwoPass = kvp.Value == 1;

-                    break;

-

-                case "VideoOptionExtra":

-                    preset.Task.ExtraAdvancedArguments = kvp.Value;

-                    break;

-                case "VideoLevel":

-                    preset.Task.VideoLevel = new VideoLevel(kvp.Value, kvp.Value);

-                    break;

-                case "VideoProfile":

-                    preset.Task.VideoProfile = new VideoProfile(kvp.Value, kvp.Value);

-                    break;

-                case "VideoPreset":

-                    preset.Task.VideoPreset = new VideoPreset(kvp.Value, kvp.Value);

-                    break;

-                case "VideoTune":

-                    string[] split = kvp.Value.ToString().Split(',');

-                    foreach (var item in split)

-                    {

-                        preset.Task.VideoTunes.Add(new VideoTune(item, item));

-                    }

-                    break;

-

-                // Chapter Markers Tab

-                case "ChapterMarkers":

-                    preset.Task.IncludeChapterMarkers = kvp.Value == true;

-                    break;

-

-                // Advanced tab

-                case "x264Option":

-                case "lavcOption":

-                    preset.Task.AdvancedEncoderOptions = kvp.Value;

-                    break;

-

-                // Preset Information

-                case "PresetBuildNumber":

-                    preset.Version = kvp.Value;

-                    break;

-                case "PresetDescription":

-                    preset.Description = kvp.Value;

-                    break;

-                case "PresetName":

-                    preset.Name = kvp.Value;

-                    break;

-                case "Type":

-                    // preset.Task.Type = kvp.Value; // TODO find out what this is

-                    break;

-                case "UsesMaxPictureSettings":

-                    // TODO Not sure if this is used now!?

-                    break;

-                case "UsesPictureFilters":

-                    preset.UsePictureFilters = kvp.Value == 1;

-                    break;

-                case "UsesPictureSettings":

-                    preset.PictureSettingsMode = (PresetPictureSettingsMode)kvp.Value;

-                    break;

-

-                // Allowed Passthru

-                case "AudioAllowAACPass":

-                    preset.Task.AllowedPassthruOptions.AudioAllowAACPass = kvp.Value == true;

-                    break;

-                case "AudioAllowAC3Pass":

-                    preset.Task.AllowedPassthruOptions.AudioAllowAC3Pass = kvp.Value == true;

-                    break;

-                case "AudioAllowDTSHDPass":

-                    preset.Task.AllowedPassthruOptions.AudioAllowDTSHDPass = kvp.Value == true;

-                    break;

-                case "AudioAllowDTSPass":

-                    preset.Task.AllowedPassthruOptions.AudioAllowDTSPass = kvp.Value == true;

-                    break;

-                case "AudioAllowMP3Pass":

-                    preset.Task.AllowedPassthruOptions.AudioAllowMP3Pass = kvp.Value == true;

-                    break;

-                case "AudioEncoderFallback":

-                    preset.Task.AllowedPassthruOptions.AudioEncoderFallback = EnumHelper<AudioEncoder>.GetValue(kvp.Value);

-                    break;

-

-                // Audio Defaults

-                case "AudioLanguageList":

-                    preset.AudioTrackBehaviours.SelectedLangauges = new BindingList<string>(ParseLangaugeCodeList(kvp.Value));

-                    break;

-                case "AudioSecondaryEncoderMode":

-                    break;

-                case "AudioTrackSelectionBehavior":

-                    preset.AudioTrackBehaviours.SelectedBehaviour = kvp.Value == "all"

-                                                                        ? AudioBehaviourModes.AllMatching

-                                                                        : kvp.Value == "first"

-                                                                              ? AudioBehaviourModes.FirstMatch

-                                                                              : AudioBehaviourModes.None;

-                    break;

-

-                // Subtitle Defaults

-                case "SubtitleAddForeignAudioSearch":

-                    preset.SubtitleTrackBehaviours.AddForeignAudioScanTrack = kvp.Value == true;

-                    break;

-                case "SubtitleAddCC":

-                    preset.SubtitleTrackBehaviours.AddClosedCaptions = kvp.Value == true;

-                    break;

-                case "SubtitleLanguageList":

-                    preset.SubtitleTrackBehaviours.SelectedLangauges = new BindingList<string>(ParseLangaugeCodeList(kvp.Value));

-                    break;

-                case "SubtitleTrackSelectionBehavior":

-                    preset.SubtitleTrackBehaviours.SelectedBehaviour = kvp.Value == "all"

-                                                                     ? SubtitleBehaviourModes.AllMatching

-                                                                     : kvp.Value == "first"

-                                                                           ? SubtitleBehaviourModes.FirstMatch

-                                                                           : SubtitleBehaviourModes.None;

-                    break;

-            }

-        }

-

-        /// <summary>

-        /// Parse a number of audio tracks

-        /// </summary>

-        /// <param name="audioList">

-        /// The audio list.

-        /// </param>

-        /// <returns>

-        /// The <see cref="List"/> of audio tracks

-        /// </returns>

-        private static List<AudioTrack> ParseAudioTracks(IEnumerable<dynamic> audioList)

-        {

-            return audioList.Select(item => ParseAudioTrackParameters(item)).Cast<AudioTrack>().ToList();

-        }

-

-        /// <summary>

-        /// The parse langauge code list.

-        /// </summary>

-        /// <param name="languages">

-        /// The languages.

-        /// </param>

-        /// <returns>

-        /// The <see cref="IEnumerable"/>.

-        /// </returns>

-        private static IEnumerable<string> ParseLangaugeCodeList(IEnumerable<object> languages)

-        {

-            List<string> languageCodesList = new List<string>();

-            foreach (var item in languages)

-            {

-                string language;

-                if (langList.TryGetValue(item.ToString(), out language))

-                {

-                    languageCodesList.Add(language);

-                }            

-            }

-

-            return languageCodesList;

-        }

-

-        /// <summary>

-        /// Parse an audio track's parameters.

-        /// </summary>

-        /// <param name="audioTrack">

-        /// The audio track params

-        /// </param>

-        /// <returns>

-        /// An <see cref="AudioTrack"/> Object

-        /// </returns>

-        private static AudioTrack ParseAudioTrackParameters(Dictionary<string, dynamic> audioTrack)

-        {

-            AudioTrack track = new AudioTrack();

-            foreach (var item in audioTrack)

-            {

-                switch (item.Key)

-                {

-                    case "AudioBitrate":

-                        track.Bitrate = int.Parse(item.Value);

-                        break;

-                    case "AudioEncoder":

-                        track.Encoder = Converters.GetAudioEncoder(item.Value.Trim());

-                        break;

-                    case "AudioMixdown":

-                        track.MixDown = Converters.GetAudioMixDown(item.Value.Trim());

-                        break;

-                    case "AudioSamplerate":

-                        track.SampleRate = item.Value == "Auto" ? 0 : double.Parse(item.Value);

-                        break;

-                    case "AudioTrack":

-                        // track.SourceTrack = value; We don't do anything with this one.

-                        break;

-                    case "AudioTrackDRCSlider":

-                        track.DRC = item.Value;

-                        break;

-                    case "AudioTrackGainSlider":

-                        track.Gain = (int)item.Value;

-                        break;

-                }

-            }

-

-            return track;

-        }

-    }

-}

diff --git a/win/CS/HandBrakeWPF/Services/Presets/Interfaces/IPresetService.cs b/win/CS/HandBrakeWPF/Services/Presets/Interfaces/IPresetService.cs
index 9035eae70..de76a1af3 100644
--- a/win/CS/HandBrakeWPF/Services/Presets/Interfaces/IPresetService.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/Interfaces/IPresetService.cs
@@ -46,6 +46,14 @@ namespace HandBrakeWPF.Services.Presets.Interfaces
         bool Add(Preset preset);

 

         /// <summary>

+        /// The import.

+        /// </summary>

+        /// <param name="filename">

+        /// The filename.

+        /// </param>

+        void Import(string filename);

+

+        /// <summary>

         /// Update a preset

         /// </summary>

         /// <param name="update">

diff --git a/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs b/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
index ec0098358..c6e3c3e4b 100644
--- a/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
+++ b/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs
@@ -21,9 +21,14 @@ namespace HandBrakeWPF.Services.Presets
     using HandBrake.ApplicationServices.Exceptions;

     using HandBrake.ApplicationServices.Interop;

     using HandBrake.ApplicationServices.Interop.Json.Presets;

+    using HandBrake.ApplicationServices.Interop.Model.Encoding;

     using HandBrake.ApplicationServices.Services.Encode.Model.Models;

     using HandBrake.ApplicationServices.Utilities;

 

+    using HandBrakeWPF.Model.Audio;

+    using HandBrakeWPF.Model.Picture;

+    using HandBrakeWPF.Model.Subtitles;

+    using HandBrakeWPF.Properties;

     using HandBrakeWPF.Services.Interfaces;

     using HandBrakeWPF.Services.Presets.Factories;

     using HandBrakeWPF.Services.Presets.Interfaces;

@@ -162,6 +167,95 @@ namespace HandBrakeWPF.Services.Presets
         }

 

         /// <summary>

+        /// The import.

+        /// </summary>

+        /// <param name="filename">

+        /// The filename.

+        /// </param>

+        public void Import(string filename)

+        {

+            // TODO needs a tidy up but will do for now.

+            if (!string.IsNullOrEmpty(filename))

+            {

+                PresetTransportContainer container = HandBrakePresetService.GetPresetFromFile(filename);

+

+                if (container == null || container.PresetList == null || container.PresetList.Count == 0)

+                {

+                    this.errorService.ShowError(Resources.Main_PresetImportFailed, Resources.Main_PresetImportFailedSolution, string.Empty);

+                    return;

+                }

+

+                HBPreset hbPreset = container.PresetList.FirstOrDefault();

+

+                Preset preset = null;

+                try

+                {

+                    preset = JsonPresetFactory.ImportPreset(hbPreset);

+                    preset.Category = UserPresetCatgoryName;

+                    preset.AudioTrackBehaviours = new AudioBehaviours();

+                    preset.SubtitleTrackBehaviours = new SubtitleBehaviours();

+

+                    // Handle the PictureDecombDeinterlace key

+                    if (preset.UseDeinterlace)

+                    {

+                        preset.Task.Decomb = Decomb.Off;

+                        preset.Task.CustomDecomb = string.Empty;

+                    }

+

+                    // Depending on the selected preset options, we may need to change some settings around.

+                    // If the user chose not to use fitlers, remove them.

+                    if (!preset.UsePictureFilters)

+                    {

+                        preset.Task.Detelecine = Detelecine.Off;

+                        preset.Task.Denoise = Denoise.Off;

+                        preset.Task.Deinterlace = Deinterlace.Off;

+                        preset.Task.Decomb = Decomb.Off;

+                        preset.Task.Deblock = 0;

+                        preset.Task.Grayscale = false;

+                    }

+

+                    // IF we are using Source Max, Set the Max Width / Height values.

+                    if (preset.PictureSettingsMode == PresetPictureSettingsMode.SourceMaximum)

+                    {

+                        preset.Task.MaxWidth = preset.Task.Height;

+                        preset.Task.MaxHeight = preset.Task.Width;

+                    }

+                }

+                catch (Exception exc)

+                {

+                    this.errorService.ShowError(Resources.Main_PresetImportFailed, Resources.Main_PresetImportFailedSolution, exc);

+                }

+

+                if (preset == null)

+                {

+                    this.errorService.ShowError(Resources.Main_PresetImportFailed, Resources.Main_PresetImportFailedSolution, string.Empty);

+                    return;

+                }

+

+                // TODO Better version checking.

+                

+                if (this.CheckIfPresetExists(preset.Name))

+                {

+                    if (!CanUpdatePreset(preset.Name))

+                    {

+                        MessageBox.Show(Resources.Main_PresetErrorBuiltInName, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);

+                        return;

+                    }

+

+                    MessageBoxResult result = MessageBox.Show(Resources.Main_PresetOverwriteWarning, Resources.Overwrite, MessageBoxButton.YesNo, MessageBoxImage.Warning);

+                    if (result == MessageBoxResult.Yes)

+                    {

+                        Update(preset);

+                    }

+                }

+                else

+                {

+                    Add(preset);

+                }

+            }

+        }

+

+        /// <summary>

         /// Update a preset

         /// </summary>

         /// <param name="update">