diff options
| author | sr55 <[email protected]> | 2014-01-21 20:27:57 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2014-01-21 20:27:57 +0000 |
| commit | 1c5cdd2e5767b3b25df9da740034e1f05a43d271 (patch) | |
| tree | d6230a366fdb4785faa69974efa3e3a6afb5b713 /win/CS/HandBrakeWPF | |
| parent | 675678a7157fac5c8ad6a69edd21fbf33d263c08 (diff) | |
WinGui: Make the Preset Plist importer a bit more robust by checking versions and automatically falling back to a value for invalid key/value pairs from old versions.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5988 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrakeWPF')
| -rw-r--r-- | win/CS/HandBrakeWPF/Properties/Resources.Designer.cs | 39 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Properties/Resources.resx | 15 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs | 27 |
3 files changed, 81 insertions, 0 deletions
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs index 297b6a576..6206412ef 100644 --- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs +++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs @@ -672,6 +672,45 @@ namespace HandBrakeWPF.Properties { }
/// <summary>
+ /// Looks up a localized string similar to Preset Version.
+ /// </summary>
+ public static string Preset_OldVersion_Header {
+ get {
+ return ResourceManager.GetString("Preset_OldVersion_Header", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to The preset you are trying to import is from a different version of HandBrake.
+ ///Some values may be reset to default as a result.
+ ///
+ ///Do you wish to proceed?.
+ /// </summary>
+ public static string Preset_OldVersion_Message {
+ get {
+ return ResourceManager.GetString("Preset_OldVersion_Message", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Unable to import preset!.
+ /// </summary>
+ public static string Preset_UnableToImport_Header {
+ get {
+ return ResourceManager.GetString("Preset_UnableToImport_Header", resourceCulture);
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to Unable to import the preset as it appears to be corrupted or from an older version of HandBrake..
+ /// </summary>
+ public static string Preset_UnableToImport_Message {
+ get {
+ return ResourceManager.GetString("Preset_UnableToImport_Message", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to The Built-in presets have been reset..
/// </summary>
public static string Presets_ResetComplete {
diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx index afd114c0c..76ddea9ee 100644 --- a/win/CS/HandBrakeWPF/Properties/Resources.resx +++ b/win/CS/HandBrakeWPF/Properties/Resources.resx @@ -486,4 +486,19 @@ Your custom presets have not been updated so you may have to re-create these by <data name="Updated" xml:space="preserve">
<value>Updated</value>
</data>
+ <data name="Preset_OldVersion_Header" xml:space="preserve">
+ <value>Preset Version</value>
+ </data>
+ <data name="Preset_OldVersion_Message" xml:space="preserve">
+ <value>The preset you are trying to import is from a different version of HandBrake.
+Some values may be reset to default as a result.
+
+Do you wish to proceed?</value>
+ </data>
+ <data name="Preset_UnableToImport_Header" xml:space="preserve">
+ <value>Unable to import preset!</value>
+ </data>
+ <data name="Preset_UnableToImport_Message" xml:space="preserve">
+ <value>Unable to import the preset as it appears to be corrupted or from an older version of HandBrake.</value>
+ </data>
</root>
\ No newline at end of file diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs index 0499e7157..a531b549c 100644 --- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs @@ -1539,6 +1539,33 @@ namespace HandBrakeWPF.ViewModels if (!string.IsNullOrEmpty(filename))
{
PList plist = new PList(filename);
+
+ object build;
+ plist.TryGetValue("PresetBuildNumber", out build);
+
+ string buildNumber = build as string;
+ if (buildNumber == null)
+ {
+ MessageBox.Show(
+ Resources.Preset_UnableToImport_Message,
+ Resources.Preset_UnableToImport_Header,
+ MessageBoxButton.YesNo, MessageBoxImage.Question);
+ return;
+ }
+
+ if (buildNumber != userSettingService.GetUserSetting<int>(UserSettingConstants.HandBrakeBuild).ToString(CultureInfo.InvariantCulture))
+ {
+ MessageBoxResult result = MessageBox.Show(
+ Resources.Preset_OldVersion_Message,
+ Resources.Preset_OldVersion_Header,
+ MessageBoxButton.YesNo, MessageBoxImage.Question);
+
+ if (result == MessageBoxResult.No)
+ {
+ return;
+ }
+ }
+
Preset preset = PlistPresetFactory.CreatePreset(plist);
if (this.presetService.CheckIfPresetExists(preset.Name))
|