WinGui: Remove Preset AutoName function as it hasn't ever worked properly.

3 files changed, 6 insertions, 7 deletions

diff --git a/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs b/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
index 19969cbaa..47a852a0c 100644
--- a/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
+++ b/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs
@@ -58,7 +58,7 @@ namespace HandBrakeWPF.Helpers
             {

                 // Get the Source Name and remove any invalid characters

                 string sourceName = Path.GetInvalidFileNameChars().Aggregate(sourceOrLabelName, (current, character) => current.Replace(character.ToString(), string.Empty));

-                string sanitisedPresetName = presetName != null ? Path.GetInvalidFileNameChars().Aggregate(presetName.Name, (current, character) => current.Replace(character.ToString(), string.Empty)) : string.Empty;

+              //  string sanitisedPresetName = presetName != null ? Path.GetInvalidFileNameChars().Aggregate(presetName.Name, (current, character) => current.Replace(character.ToString(), string.Empty)) : string.Empty;

 

                 // Remove Underscores

                 if (userSettingService.GetUserSetting<bool>(UserSettingConstants.AutoNameRemoveUnderscore))

@@ -94,13 +94,12 @@ namespace HandBrakeWPF.Helpers
                 {

                     destinationFilename = userSettingService.GetUserSetting<string>(UserSettingConstants.AutoNameFormat);

                     destinationFilename =

-                        destinationFilename

-                            .Replace("{source}", sourceName)

+                        destinationFilename.Replace("{source}", sourceName)

                             .Replace(Constants.Title, dvdTitle)

                             .Replace(Constants.Chapters, combinedChapterTag)

                             .Replace(Constants.Date, DateTime.Now.Date.ToShortDateString().Replace('/', '-'))

-                            .Replace(Constants.Time, DateTime.Now.ToString("HH:mm"))

-                            .Replace(Constants.Preset, sanitisedPresetName);

+                            .Replace(Constants.Time, DateTime.Now.ToString("HH:mm"));

+                           // .Replace(Constants.Preset, sanitisedPresetName);

 

                     if (task.VideoEncodeRateType == VideoEncodeRateType.ConstantQuality)

                     {

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index 2fe0cec2e..465a52b2a 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -1156,7 +1156,7 @@ namespace HandBrakeWPF.Properties {
         ///   Looks up a localized string similar to The format of the output file. In addition to any supported file system character, you can use the following placeholders that will be replaced when you change title or scan a source.

         ///

         ///Live Update Options: {source} {title} {chapters} 

-        ///Non-Live Options: {date} {time} {quality} {bitrate} {preset} (These only change if you scan a new source, change title or chapters).

+        ///Non-Live Options: {date} {time} {quality} {bitrate} (These only change if you scan a new source, change title or chapters).

         /// </summary>

         public static string Options_AdditionalFormatOptions {

             get {

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index b1b496c7d..c4b66797a 100644
--- a/win/CS/HandBrakeWPF/Properties/Resources.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -480,7 +480,7 @@ Do you wish to proceed?</value>
     <value>The format of the output file. In addition to any supported file system character, you can use the following placeholders that will be replaced when you change title or scan a source.

 

 Live Update Options: {source} {title} {chapters} 

-Non-Live Options: {date} {time} {quality} {bitrate} {preset} (These only change if you scan a new source, change title or chapters)</value>

+Non-Live Options: {date} {time} {quality} {bitrate} (These only change if you scan a new source, change title or chapters)</value>

   </data>

   <data name="Options_DefaultPathAdditionalParams" xml:space="preserve">

     <value>Available additional Options: {source_path} or {source_folder_name}