changes for 3.3.0

Author: argorar

App.config

@@ -22,6 +22,7 @@
     <add key="HighQuality" value="true" />
     <add key="EncodingMode" value="Variable" />
     <add key="AudioEnabled" value="false" />
+    <add key="PathDownload" value="" />
     <add key="ClientSettingsProvider.ServiceUri" value="" />
   </appSettings>
   <system.web>

Binaries/Win64/youtube-dl.exe

@@ -6,31 +6,31 @@
 using Microsoft.WindowsAPICodePack.Taskbar;
 using Timer = System.Windows.Forms.Timer;
 using static WebMConverter.Utility;
+using System.Linq;
 
 namespace WebMConverter.Dialogs
 {
     public partial class DownloadDialog : Form
     {
         public string Outfile;
+        public string OutputPath;
 
         private readonly string _infile;
-        private YoutubeDL _filenameGetterProcess;
         private YoutubeDL _downloaderProcess;
 
         private Timer _timer;
         private bool _ended;
         private bool _panic;
-        private bool _gettingFilename;
 
         private TaskbarManager taskbarManager;
 
-        public DownloadDialog(string url)
+        public DownloadDialog(string url, string outputPath)
         {
             InitializeComponent();
             pictureStatus.BackgroundImage = StatusImages.Images["Happening"];
 
             _infile = '"' + url.Replace(@"""", @"\""") + '"';
-            Outfile = Path.GetTempPath();
+            OutputPath = outputPath;
 
             taskbarManager = TaskbarManager.Instance;
         }
@@ -41,26 +41,32 @@ private void ProcessOnErrorDataReceived(object sender, DataReceivedEventArgs arg
                 boxOutput.Invoke((Action)(() => boxOutput.AppendText(Environment.NewLine + args.Data)));
         }
 
-        private void FilenameGetterOnOutputDataReceived(object sender, DataReceivedEventArgs args)
-        {
-            if (args.Data != null)
-                Outfile = Path.Combine(Outfile, args.Data);
-        }
-
         private void ProcessOnOutputDataReceived(object sender, DataReceivedEventArgs args)
         {
             if (args.Data != null)
             {
                 boxOutput.Invoke((Action)(() => boxOutput.AppendText(Environment.NewLine + args.Data)));
 
                 if (DataContainsProgress(args.Data))
+                {
                     ParseAndUpdateProgress(args.Data);
+                    if(String.IsNullOrEmpty(Outfile))
+                        GetId(args.Data);
+                }
+
             }
         }
 
+        private void GetId(string data)
+        {
+            if(data.Contains("Destination:"))
+                Outfile = data.Split('-').LastOrDefault().Split('.')[0];
+        }
+
         // example youtube-dl line:
         // [download]  51.5% of ~3.85MiB at 20.49MiB/s ETA 00:00
 
+        private bool DataContainsFFMPEG(string data) => data.StartsWith("[ffmpeg]");
         private bool DataContainsProgress(string data) => data.StartsWith("[download]");
 
         private void ParseAndUpdateProgress(string input)
@@ -80,29 +86,18 @@ private void ParseAndUpdateProgress(string input)
 
         private void DownloadDialog_Load(object sender, EventArgs e)
         {
-            _filenameGetterProcess = new YoutubeDL("--get-filename " + _infile);
+            boxOutput.AppendText($"{Environment.NewLine}Starting Process");
             _downloaderProcess = new YoutubeDL(null);
 
-            _gettingFilename = true;
-
-            _filenameGetterProcess.ErrorDataReceived += ProcessOnErrorDataReceived;
-            _filenameGetterProcess.OutputDataReceived += FilenameGetterOnOutputDataReceived;
-            _filenameGetterProcess.Exited += (o, args) => boxOutput.Invoke((Action) (() =>
-            {
-                if (_panic) return;
-                boxOutput.AppendText($"{Environment.NewLine}Downloading to {Outfile}");
-                _downloaderProcess.StartInfo.Arguments = $@"-o ""{Outfile}"" {_infile}";
-
-                _timer = new Timer { Interval = 500 };
-                _timer.Tick += Exited;
-                _timer.Start();
-            }));
+            if(_infile.Contains("youtube"))
+                _downloaderProcess.StartInfo.Arguments = $@"-f bestvideo+bestaudio  {_infile}";
+            else
+                _downloaderProcess.StartInfo.Arguments = $@" {_infile}";
 
             _downloaderProcess.ErrorDataReceived += ProcessOnErrorDataReceived;
             _downloaderProcess.OutputDataReceived += ProcessOnOutputDataReceived;
             _downloaderProcess.Exited += (o, args) => boxOutput.Invoke((Action)(() =>
             {
-                if (_panic) return; //This should stop that one exception when closing the converter
                 boxOutput.AppendText($"{Environment.NewLine}--- YOUTUBE-DL HAS EXITED ---");
                 buttonCancel.Enabled = false;
 
@@ -111,35 +106,15 @@ private void DownloadDialog_Load(object sender, EventArgs e)
                 _timer.Start();
             }));
 
-            taskbarManager.SetProgressState(TaskbarProgressBarState.Indeterminate); // can't get progress for filename getter
-            progressBar.Style = ProgressBarStyle.Marquee;
-            _filenameGetterProcess.Start();
+            taskbarManager.SetProgressState(TaskbarProgressBarState.Normal);
+            progressBar.Style = ProgressBarStyle.Blocks;
+            _downloaderProcess.Start();
         }
 
         private void Exited(object sender, EventArgs eventArgs)
         {
             _timer.Stop();
 
-            if (_gettingFilename)
-            {
-                if (_filenameGetterProcess.ExitCode != 0)
-                {
-                    boxOutput.AppendText($"{Environment.NewLine}{Environment.NewLine}youtube-dl.exe exited with exit code {_filenameGetterProcess.ExitCode}. That's usually bad.");
-                    boxOutput.AppendText($"{Environment.NewLine}If you have no idea what went wrong, open an issue on GitGud and copy paste the output of this window there.");
-                    pictureStatus.BackgroundImage = StatusImages.Images["Failure"];
-                    buttonCancel.Enabled = true;
-                    _ended = true;
-                }
-                else
-                {
-                    _gettingFilename = false;
-                    taskbarManager.SetProgressState(TaskbarProgressBarState.Normal);
-                    progressBar.Style = ProgressBarStyle.Blocks;
-                    _downloaderProcess.Start();
-                }
-                return;
-            }
-
             if (_downloaderProcess.ExitCode != 0)
             {
                 boxOutput.AppendText($"{Environment.NewLine}{Environment.NewLine}youtube-dl.exe exited with exit code {_downloaderProcess.ExitCode}. That's usually bad.");
@@ -153,27 +128,45 @@ private void Exited(object sender, EventArgs eventArgs)
                 boxOutput.AppendText($"{Environment.NewLine}{Environment.NewLine}Video downloaded succesfully!");
                 pictureStatus.BackgroundImage = StatusImages.Images["Success"];
                 buttonLoad.Enabled = true;
+                buttonCancel.Enabled = true;
+                buttonCancel.Text = "Close";
+                MoveNewFile();
+                this.Activate();
+            }
+
+            _ended = true;
+        }
+
+        private void MoveNewFile()
+        {
+            if (String.IsNullOrEmpty(Outfile))
+                return;
 
-                // workaround for https://github.com/rg3/youtube-dl/issues/11472
-                if (!File.Exists(Outfile))
+            string[] fileEntries = Directory.GetFiles(".");
+            foreach (string fileName in fileEntries) 
+            {
+                if (fileName.Contains(Outfile))
                 {
-                    Outfile = Path.ChangeExtension(Outfile, "mkv");
+                    Outfile = fileName;
+                    break;
                 }
             }
-
-            _ended = true;
+            File.Move(Outfile, Path.Combine(OutputPath, Outfile));
         }
 
         private void buttonCancel_Click(object sender, EventArgs e)
         {
-            if (!_ended || _panic) //Prevent stack overflow
+            if (buttonCancel.Text.Equals("Close"))
             {
-                if (!_filenameGetterProcess.HasExited)
-                    KillProcessAndChildren(_filenameGetterProcess.Id);
+                if(!_downloaderProcess.HasExited)
+                    KillProcessAndChildren(_downloaderProcess.Id);
 
-                if (_gettingFilename)
-                    return;
+                Dispose();
+                return;
+            }
 
+            if (!_ended || _panic) //Prevent stack overflow
+            {
                 if (!_downloaderProcess.HasExited)
                     KillProcessAndChildren(_downloaderProcess.Id);
             }
@@ -190,7 +183,6 @@ private void ConverterForm_FormClosing(object sender, FormClosingEventArgs e)
 
         private void ConverterForm_FormClosed(object sender, FormClosedEventArgs e)
         {
-            _filenameGetterProcess.Dispose();
             _downloaderProcess.Dispose();
         }
 
@@ -201,5 +193,13 @@ private void buttonLoad_Click(object sender, EventArgs e)
         }
 
         private void boxOutput_TextChanged(object sender, EventArgs e) => NativeMethods.SendMessage(boxOutput.Handle, 0x115, 7, 0);
+
+        internal string GetOutfile()
+        {
+            if (String.IsNullOrEmpty(Outfile))
+                return String.Empty;
+
+            return OutputPath + Outfile.Substring(1);
+        }
     }
 }

Dialogs/DownloadDialog.Designer.cs

@@ -128,7 +128,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADc
-        CgAAAk1TRnQBSQFMAgEBAwEAAUgBAAFIAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CgAAAk1TRnQBSQFMAgEBAwEAAVABAAFQAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA