added experimental music playlist support

ManuFlosoYT · Feb 21, 2024 · acc0adf · acc0adf
1 parent bb003fa
commit acc0adf
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 7 deletions.
diff --git a/FastWebDownloader/Downloader.cs b/FastWebDownloader/Downloader.cs
@@ -4,6 +4,7 @@
 using System.Threading.Tasks;
 using YoutubeDLSharp;
 using YoutubeDLSharp.Metadata;
+using System.Diagnostics;
 using YoutubeDLSharp.Options;
 
 namespace FastWebDownloader
@@ -20,7 +21,7 @@ public static void ReadFile()
 
             list.RemoveAt(0);
 
-
+            Console.WriteLine();
             Console.ForegroundColor = ConsoleColor.Yellow;
             Console.Write("Are you downloading music? (y/n) (invalid inputs will be considered as 'n'): ");
             char responseMusic = Console.ReadKey().KeyChar;
@@ -46,8 +47,23 @@ public static void ReadFile()
 
             }
 
+            /* NOT YET IMPLEMENTED
+
+            Console.ForegroundColor = ConsoleColor.Yellow;
+            Console.Write("Converting all audio files to the correct format");
             Console.ForegroundColor = ConsoleColor.White;
 
+
+            //convert opus to mp3
+            string path = Path.Combine(Directory.GetCurrentDirectory(), "downloads");
+            Process process = new Process();
+            process.StartInfo.FileName = "cmd.exe";
+            process.StartInfo.Arguments = $"cd {path} || for %f in (*.opus) do ffmpeg -i \"%f\" \"%~nf.mp3\" || del *.opus";
+            process.Start();
+            process.WaitForExit();
+
+            */
+
             Console.WriteLine();
             Console.ForegroundColor = ConsoleColor.Yellow;
             Console.Write("Do you want to wipe config.yaml? (y/n) (invalid inputs will be considered as 'n'): ");
@@ -95,11 +111,18 @@ public static async Task Download(string url, bool IsMusic)
                 RestrictFilenames = true
             };
 
+            var optionsMusic = new OptionSet()
+            {
+                NoContinue = true,
+                RestrictFilenames = true,
+            };
+
             if (IsMusic)
             {
                 var resMusic = await ytdl.RunAudioDownload(
                     url,
-                    AudioConversionFormat.Mp3
+                    AudioConversionFormat.Mp3,
+                    overrideOptions: optionsMusic
                 );
             }
             else
@@ -130,7 +153,7 @@ public static async Task DownloadPlaylist(string url, bool IsMusic)
 
             var options = new OptionSet()
             {
-                Exec = "for %f in (*.mp3 *.wav *.flac *.ogg) do ffmpeg -i \"%f\" \"%~nf.mp3\""
+                RestrictFilenames = true
             };
 
 
@@ -144,7 +167,8 @@ public static async Task DownloadPlaylist(string url, bool IsMusic)
             else
             {
                 var res = await ytdl.RunVideoPlaylistDownload(
-                    url
+                    url,
+                    overrideOptions: options
                 );
             }
 

diff --git a/FastWebDownloader/UI.cs b/FastWebDownloader/UI.cs
@@ -21,9 +21,8 @@ public static void MainMenu()
             Console.WriteLine("3. Exit");
             Console.ForegroundColor = ConsoleColor.White;
 
-
-            string input = Console.ReadLine();
-            if (int.TryParse(input, out int choice))
+            char response = Console.ReadKey().KeyChar;
+            if (int.TryParse(response.ToString(), out int choice))
             {
                 if (choice < 1 || choice > 3)
                 {