Shared - Remember Generic File Type

Fixes #705
NickvisionApps · Dec 24, 2023 · f2a902d · f2a902d
1 parent f4b9e21
commit f2a902d
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 3 deletions.
diff --git a/NickvisionTubeConverter.GNOME/Program.cs b/NickvisionTubeConverter.GNOME/Program.cs
@@ -46,6 +46,7 @@ public Program(string[] args)
         _mainWindowController.AppInfo.Changelog =
             @"* Fixed an issue where split chapters were not renamed correctly
               * Fixed an issue where videos would not download greater than 1080p resolution
+              * Parabolic will now remember the chosen file type for generic downloads
               * Updated translations (Thanks everyone on Weblate!)";
         _application.OnActivate += OnActivate;
         g_signal_connect_data(_application.Handle, "open", _openCallback, IntPtr.Zero, IntPtr.Zero, 0);

diff --git a/NickvisionTubeConverter.GNOME/Views/AddDownloadDialog.cs b/NickvisionTubeConverter.GNOME/Views/AddDownloadDialog.cs
@@ -363,7 +363,11 @@ await Task.Run(async () =>
                 if (_controller.DisallowConversions)
                 {
                     _fileTypeRow.SetModel(Gtk.StringList.New(new string[] { _("Video"), _("Audio") }));
-                    _fileTypeRow.SetSelected(0);
+                    _fileTypeRow.SetSelected(_controller.PreviousGenericMediaFileType switch
+                    {
+                        MediaFileType.Audio => 1,
+                        _ => 0
+                    });
                 }
                 else
                 {

diff --git a/NickvisionTubeConverter.Shared/Controllers/AddDownloadDialogController.cs b/NickvisionTubeConverter.Shared/Controllers/AddDownloadDialogController.cs
@@ -72,6 +72,10 @@ public class AddDownloadDialogController
     /// </summary>
     public MediaFileType PreviousMediaFileType => Configuration.Current.PreviousMediaFileType;
     /// <summary>
+    /// The previously used generic MediaFileType
+    /// </summary>
+    public MediaFileType PreviousGenericMediaFileType => Configuration.Current.PreviousGenericMediaFileType;
+    /// <summary>
     /// The previously used subtitle downloading state
     /// </summary>
     public bool PreviousSubtitleState => Configuration.Current.PreviousSubtitleState;
@@ -271,7 +275,11 @@ public void PopulateDownloads(MediaFileType mediaFileType, Quality quality, int?
             }
         }
         Configuration.Current.PreviousSaveFolder = saveFolder;
-        if (!mediaFileType.GetIsGeneric())
+        if (mediaFileType.GetIsGeneric())
+        {
+            Configuration.Current.PreviousGenericMediaFileType = mediaFileType;
+        }
+        else
         {
             Configuration.Current.PreviousMediaFileType = mediaFileType;
         }

diff --git a/NickvisionTubeConverter.Shared/Linux/org.nickvision.tubeconverter.metainfo.xml.in b/NickvisionTubeConverter.Shared/Linux/org.nickvision.tubeconverter.metainfo.xml.in
@@ -47,6 +47,7 @@
       <description translatable="no">
         <p>- Fixed an issue where split chapters were not renamed correctly</p>
         <p>- Fixed an issue where videos would not download greater than 1080p resolution</p>
+        <p>- Parabolic will now remember the chosen file type for generic downloads</p>
         <p>- Updated translations (Thanks everyone on Weblate!)</p>
       </description>
     </release>

diff --git a/NickvisionTubeConverter.Shared/Models/Configuration.cs b/NickvisionTubeConverter.Shared/Models/Configuration.cs
@@ -137,6 +137,10 @@ public class Configuration : ConfigurationBase
     /// </summary>
     public MediaFileType PreviousMediaFileType { get; set; }
     /// <summary>
+    /// The previously used generic media file type
+    /// </summary>
+    public MediaFileType PreviousGenericMediaFileType { get; set; }
+    /// <summary>
     /// The previously used video resolution
     /// </summary>
     public string PreviousVideoResolution { get; set; }
@@ -193,6 +197,7 @@ public Configuration()
         //Remember
         PreviousSaveFolder = "";
         PreviousMediaFileType = MediaFileType.MP4;
+        PreviousGenericMediaFileType = MediaFileType.Video;
         PreviousVideoResolution = "";
         PreviousSubtitleState = false;
         PreviousPreferAV1State = false;

diff --git a/NickvisionTubeConverter.WinUI/App.xaml.cs b/NickvisionTubeConverter.WinUI/App.xaml.cs
@@ -24,6 +24,7 @@ public App()
         _controller = new MainWindowController(Array.Empty<string>());
         _controller.AppInfo.Changelog = @"- Fixed an issue where split chapters were not renamed correctly
 - Fixed an issue where videos would not download greater than 1080p resolution
+- Parabolic will now remember the chosen file type for generic downloads
 - Redesigned the app's UI
 - Updated translations (Thanks everyone on Weblate!)";
         if (_controller.Theme != Theme.System)

diff --git a/NickvisionTubeConverter.WinUI/Views/AddDownloadDialog.xaml.cs b/NickvisionTubeConverter.WinUI/Views/AddDownloadDialog.xaml.cs
@@ -533,7 +533,11 @@ private async Task SearchUrlAsync(string url)
                 if (_controller.DisallowConversions)
                 {
                     CmbFileType.ItemsSource = new string[] { _("Video"), _("Audio") };
-                    CmbFileType.SelectedIndex = 0;
+                    CmbFileType.SelectedIndex = _controller.PreviousGenericMediaFileType switch
+                    {
+                        MediaFileType.Audio => 1,
+                        _ => 0
+                    };
                 }
                 else
                 {