From 0459b39db5addd4acb700e85f7e7e39b249ae576 Mon Sep 17 00:00:00 2001
From: sr55 <sr55.hb@outlook.com>
Date: Sun, 30 Dec 2018 21:25:51 +0000
Subject: [PATCH] WinGui:  Fix issues with "Any" language selection with the
 "First" option used.  For both Audio and Subtitle tabs, this should now only
 provide 1 track. Fixes #1735  and makes the behaviour consistent with the
 Mac/Linux GUI's

---
 .../HandBrakeWPF/ViewModels/AudioViewModel.cs | 105 ++++++++++--------
 .../ViewModels/SubtitlesViewModel.cs          |  39 +++----
 2 files changed, 74 insertions(+), 70 deletions(-)

diff --git a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
index d5b7840ff..90a3d249f 100644
--- a/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs
@@ -393,24 +393,6 @@ namespace HandBrakeWPF.ViewModels
             this.NotifyOfPropertyChange(() => this.Task);
         }
 
-        /// <summary>
-        /// Add all remaining for selected languages.
-        /// </summary>
-        public void AddAllRemainingForSelectedLanguages()
-        {
-            // Add them if they are not already added.
-            foreach (Audio sourceTrack in this.GetSelectedLanguagesTracks())
-            {
-                // Step 2: Check if the track list already contrains this track
-                bool found = this.Task.AudioTracks.Any(audioTrack => Equals(audioTrack.ScannedTrack, sourceTrack));
-                if (!found)
-                {
-                    // If it doesn't, add it.
-                    this.Add(sourceTrack, true);
-                }
-            }
-        }
-
         #endregion
 
         #region Methods
@@ -479,24 +461,6 @@ namespace HandBrakeWPF.ViewModels
             return true;
         }
 
-        /// <summary>
-        /// Add all source tracks that don't currently exist on the list.
-        /// </summary>
-        private void AddAllRemainingTracks()
-        {
-            // For all the source audio tracks
-            foreach (Audio sourceTrack in this.SourceTracks)
-            {
-                // Step 2: Check if the track list already contrains this track
-                bool found = this.Task.AudioTracks.Any(audioTrack => Equals(audioTrack.ScannedTrack, sourceTrack));
-                if (!found)
-                {
-                    // If it doesn't, add it.
-                    this.Add(sourceTrack, true);
-                }
-            }
-        }
-
         /// <summary>
         /// Attempt to automatically select the correct audio tracks based on the users settings.
         /// </summary>
@@ -549,6 +513,13 @@ namespace HandBrakeWPF.ViewModels
         /// </summary>
         private void AddFirstForSelectedLanguages()
         {
+            bool anyLanguageSelected = this.AudioBehaviours.SelectedLangauges.Contains(Constants.Any);
+
+            if (anyLanguageSelected && this.Task.AudioTracks.Count >= 1)
+            {
+                return;
+            }
+
             foreach (Audio sourceTrack in this.GetSelectedLanguagesTracks())
             {
                 // Step 2: Check if the track list already contrains this track
@@ -569,6 +540,48 @@ namespace HandBrakeWPF.ViewModels
 
                     // If it doesn't, add it.
                     this.Add(sourceTrack, true);
+
+                    // If we are using "(Any)" then break here. We only add the first track in this instance.
+                    if (anyLanguageSelected)
+                    {
+                        break;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Add all source tracks that don't currently exist on the list.
+        /// </summary>
+        private void AddAllRemainingTracks()
+        {
+            // For all the source audio tracks
+            foreach (Audio sourceTrack in this.SourceTracks)
+            {
+                // Step 2: Check if the track list already contrains this track
+                bool found = this.Task.AudioTracks.Any(audioTrack => Equals(audioTrack.ScannedTrack, sourceTrack));
+                if (!found)
+                {
+                    // If it doesn't, add it.
+                    this.Add(sourceTrack, true);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Add all remaining for selected languages.
+        /// </summary>
+        public void AddAllRemainingForSelectedLanguages()
+        {
+            // Add them if they are not already added.
+            foreach (Audio sourceTrack in this.GetSelectedLanguagesTracks())
+            {
+                // Step 2: Check if the track list already contrains this track
+                bool found = this.Task.AudioTracks.Any(audioTrack => Equals(audioTrack.ScannedTrack, sourceTrack));
+                if (!found)
+                {
+                    // If it doesn't, add it.
+                    this.Add(sourceTrack, true);
                 }
             }
         }
@@ -605,21 +618,15 @@ namespace HandBrakeWPF.ViewModels
         /// </returns>
         private IEnumerable<Audio> GetSelectedLanguagesTracks()
         {
-            List<Audio> trackList = new List<Audio>();
-
-            List<string> isoCodes = LanguageUtilities.GetLanguageCodes(this.AudioBehaviours.SelectedLangauges.ToArray());
+            // Translate to Iso Codes
+            List<string> iso6392Codes = this.AudioBehaviours.SelectedLangauges.Contains(Constants.Any)
+                ? LanguageUtilities.GetIsoCodes()
+                : LanguageUtilities.GetLanguageCodes(this.AudioBehaviours.SelectedLangauges.ToArray());
 
-            if (isoCodes.Contains(Constants.Undefined))
-            {
-                isoCodes = LanguageUtilities.GetIsoCodes();
-            }
-
-            foreach (string code in isoCodes)
-            {
-                trackList.AddRange(this.SourceTracks.Where(source => source.LanguageCode.Trim() == code));
-            }
+            List<Audio> availableTracks =
+                this.SourceTracks.Where(audio => iso6392Codes.Contains(audio.LanguageCode.Trim())).ToList();
 
-            return trackList;
+            return availableTracks;
         }
 
         #endregion
diff --git a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
index fb8dc838c..a847bc060 100644
--- a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
@@ -183,14 +183,7 @@ namespace HandBrakeWPF.ViewModels
         /// </summary>
         public void AddAllRemainingForSelectedLanguages()
         {
-            // Translate to Iso Codes
-            List<string> iso6392Codes = this.SubtitleBehaviours.SelectedLangauges.Contains(Constants.Any)
-                                            ? LanguageUtilities.GetIsoCodes()
-                                            : LanguageUtilities.GetLanguageCodes(
-                                                this.SubtitleBehaviours.SelectedLangauges.ToArray());
-                                 
-            List<Subtitle> availableTracks =
-                this.SourceTracks.Where(subtitle => iso6392Codes.Contains(subtitle.LanguageCodeClean)).ToList();
+            List<Subtitle> availableTracks = this.GetSelectedLanguagesTracks();
 
             foreach (Subtitle subtitle in this.SourceTitlesSubset(availableTracks))
             {
@@ -203,9 +196,10 @@ namespace HandBrakeWPF.ViewModels
         /// </summary>
         public void AddFirstForSelectedLanguages()
         {
+            bool anyLanguageSelected = this.SubtitleBehaviours.SelectedLangauges.Contains(Constants.Any);
             foreach (Subtitle sourceTrack in this.GetSelectedLanguagesTracks())
             {
-                // Step 2: Check if the track list already contrains this track
+                // Step 2: Check if the track list already contains this track
                 bool found = this.Task.SubtitleTracks.Any(track => Equals(track.SourceTrack, sourceTrack));
                 if (!found)
                 {
@@ -228,6 +222,12 @@ namespace HandBrakeWPF.ViewModels
 
                     // If it doesn't, add it.
                     this.Add(sourceTrack);
+
+                    // If we are using "(Any)" then break here. We only add the first track in this instance.
+                    if (anyLanguageSelected)
+                    {
+                        break;
+                    }
                 }
             }
         }
@@ -632,21 +632,18 @@ namespace HandBrakeWPF.ViewModels
         /// <returns>
         /// A list of source subtitle tracks.
         /// </returns>
-        private IEnumerable<Subtitle> GetSelectedLanguagesTracks()
+        private List<Subtitle> GetSelectedLanguagesTracks()
         {
-            List<Subtitle> trackList = new List<Subtitle>();
-
-            List<string> isoCodes = this.SubtitleBehaviours.SelectedLangauges.Contains(Constants.Any)
-                                            ? LanguageUtilities.GetIsoCodes()
-                                            : LanguageUtilities.GetLanguageCodes(
-                                                this.SubtitleBehaviours.SelectedLangauges.ToArray());
+            // Translate to Iso Codes
+            List<string> iso6392Codes = this.SubtitleBehaviours.SelectedLangauges.Contains(Constants.Any)
+                ? LanguageUtilities.GetIsoCodes()
+                : LanguageUtilities.GetLanguageCodes(
+                    this.SubtitleBehaviours.SelectedLangauges.ToArray());
 
-            foreach (string code in isoCodes)
-            {
-                trackList.AddRange(this.SourceTracks.Where(source => source.LanguageCode == code));
-            }
+            List<Subtitle> availableTracks =
+                this.SourceTracks.Where(subtitle => iso6392Codes.Contains(subtitle.LanguageCodeClean)).ToList();
 
-            return trackList;
+           return availableTracks;
         }
 
         /// <summary>
-- 
2.40.0