Fixes issue with downloading videos with no audio

Author: gfrn

WPFMETRO/Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.1.0")]
-[assembly: AssemblyFileVersion("1.5.1.0")]
+[assembly: AssemblyVersion("1.5.1.1")]
+[assembly: AssemblyFileVersion("1.5.1.1")]

WPFMETRO/Queue.cs

@@ -113,6 +113,7 @@ public Dictionary<string, string> GetFormats(string url)
                                     desc = values[1].ToString() + " (";
                                     if (values[2].ToString() == "audio")
                                     {
+                                        hasAudio = true;
                                         code = values[0].ToString();
                                         desc += "audio";
                                         desc += values.Count > 5 && values[5].ToString() != "audio" ? " " + values[5].ToString() + ")" : ")";
@@ -128,7 +129,7 @@ public Dictionary<string, string> GetFormats(string url)
                                     code = values[0].ToString();
                                     desc = values[1].ToString() + " (" + values[2].ToString() + ")";
                                 }
-                                hasAudio = !hasAudio && values[1].ToString() == "mp4" || values[1].ToString() == "webm" || values[1].ToString() == "m4a" ? true : hasAudio;
+
                                 code += output.Contains("video only") ? "-y" : "-n";
 
                                 formats.Add(code, desc);

WPFMETRO/Resources/Splash.txt

@@ -58,4 +58,7 @@ Vi sittar h
 Life's a lot more fun when you aren't responsible for your actions.
 Get in there, Lewis!
 Drive through penalty, drive through penalty
-Escort, 3, 4, 5, 6, 6.5, WRX
+Escort, 3, 4, 5, 6, 6.5, WRX
+This splash text file is getting out of hand
+I hope you'll take it as a sign, that everything will be OK
+This program may cause cardiovascular issues

WPFMETRO/Video.cs

@@ -56,15 +56,14 @@ public void DownloadVideo()
                             break;
                         default:
                             arguments += "-f ";
-
-                            if (SelectedFormat.Contains(" "))
+                            if (SelectedFormat.Contains(" ") && AvailableFormats[AvailableFormats.Count - 1].Value == "flac")
                             {
                                 arguments += SelectedFormat.Substring(0, SelectedFormat.IndexOf(" "));
                                 if (SelectedFormat.Substring(SelectedFormat.Length - 1) == "y")
                                 {
                                     int spaceIndex = SelectedFormat.IndexOf(" ");
                                     arguments += SelectedFormat.Contains("mp4") ? "+bestaudio[ext!=webm]" : "+bestaudio[ext=webm]‌";
-                                    arguments += " --merge-output-format" + SelectedFormat.Substring(spaceIndex, SelectedFormat.Length - spaceIndex - 2);
+                                    arguments += " --merge-output-format" + SelectedFormat.Substring(spaceIndex, SelectedFormat.Length - spaceIndex - 2); 
                                 }
                             }
                             else
@@ -75,8 +74,11 @@ public void DownloadVideo()
                             break;
                     }
                 }
-                arguments += SelectedFormat == "default" ? "-o \"" + Path + Name + "\"" : " -o \"" + Path + Name + "\"";
-                arguments += " -i " + ID;
+                   
+                string formatAndID = SelectedFormat == "default" ? "" : " ";
+                formatAndID += "-o \"" + Path + Name + "\"" + " -i " + ID;
+
+                arguments += formatAndID;
 
                 ytbDLInfo.Arguments = arguments;
                 ytbDL = Process.Start(ytbDLInfo);

WPFMETRO/WPFMETRO.csproj

@@ -26,7 +26,7 @@
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>false</MapFileExtensions>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
-    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationRevision>3</ApplicationRevision>
     <ApplicationVersion>1.5.1.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>