Fixes thumbnail retrieval

Author: gfrn

WPFMETRO/MainWindow.xaml.cs

@@ -154,7 +154,7 @@ private async void SelectButton_Click(object sender, RoutedEventArgs e)
                 await Task.Run(() => formats=queue.GetFormats(Url));
                 await Task.Run(() => videoInfo = queue.GetInfo(Url));
 
-                    if (formats.Count > 0)
+                if (formats.Count > 0)
                 {
                     FiletypeBox.IsEnabled = AddToQueueButton.IsEnabled = true;
                     UrlBox.Background = Brushes.DarkGreen;
@@ -246,8 +246,8 @@ private async void AddFromTextButton_Click(object sender, RoutedEventArgs e)
             string filename = "%(title)s.%(ext)s";
             string path = PathBox.Text + "/";
             string filetype = "default";
-            string title = videoInfo[0];
-            string thumbURL = videoInfo[1] == "N.A" ? null : videoInfo[1];
+            string title = videoInfo[0] ?? "N.A.";
+            string thumbURL = videoInfo[1];
             formats.Add("default", "default (mp4)");
 
             foreach (string video in videos)
@@ -283,10 +283,13 @@ public void UpdateCard()
 
                     if (video.ThumbURL != null)
                     {
-                        image.BeginInit();
-                        image.UriSource = new Uri(video.ThumbURL);
-                        image.DecodePixelWidth = 600;
-                        image.EndInit();
+                        var imageData = new WebClient().DownloadData(new Uri(video.ThumbURL + ".jpg"));
+                        var bitmapImage = new BitmapImage { CacheOption = BitmapCacheOption.OnLoad };
+                        bitmapImage.BeginInit();
+                        bitmapImage.StreamSource = new MemoryStream(imageData);
+                        bitmapImage.EndInit();
+
+                        image = bitmapImage;
                     }
                     else
                     {

WPFMETRO/Queue.cs

@@ -44,24 +44,24 @@ public List<string> GetInfo(string url)
         {
             string[] args = { "--encoding utf-8 --skip-download --get-title --no-warnings " + url, "--encoding utf-8 --skip-download --list-thumbnails --no-warnings " + url };
             List<string> response = new List<string>();
-            string info = "N.A.";
             bool isThumb = false;
             bool isNext = false;
 
             foreach (string argument in args)
             {
                 ytbDLInfo.Arguments = argument;
                 ytbDL = Process.Start(ytbDLInfo);
+                string info = null;
 
                 ytbDL.OutputDataReceived += new DataReceivedEventHandler(
                     (s, f) =>
                     {
                         string output = f.Data ?? "null";
                         if (isThumb)
                         {
-                            if(isNext)
+                            if(isNext && info == null)
                             {
-                                info = output == "null" ? info : output.Substring(output.LastIndexOf(' ')+1);
+                                info = output == "null" || output.Contains("No thumbnail") ? info : output.Substring(output.LastIndexOf(' ')+1);
                             }
                             else
                             {
@@ -218,8 +218,14 @@ public void DownloadChannel(string ID, string filename, string path, string file
 
         }
 
-            public void ModifyQueue(string title, string thumbURL, string ID, string filename, string path, string filetype, Dictionary<string, string> formats)
+        public void ModifyQueue(string title, string thumbURL, string ID, string filename, string path, string filetype, Dictionary<string, string> formats)
         {
+            if(filetype == null)
+            {
+                MessageBox.Show("Please select a filetype");
+                return;
+            }
+
             string fullpath = filename == "%(title)s.%(ext)s" ? path + title + "." + formats[filetype] : path + filename + "." + formats[filetype];
             if (File.Exists(fullpath))
             {
@@ -245,16 +251,16 @@ public void ModifyQueue(string title, string thumbURL, string ID, string filenam
                 }
                 else
                 {
-                                Video video = new Video();
-                                video.ID = ID;
-                                video.Name = filename;
-                                video.Path = path;
-                                video.SelectedFormat = filetype;
-                                video.ThumbURL = thumbURL;
-                                video.Title = title;
-                                video.AvailableFormats = formats.ToList();
-
-                                Videos.Add(video);
+                        Video video = new Video();
+                        video.ID = ID;
+                        video.Name = filename;
+                        video.Path = path;
+                        video.SelectedFormat = filetype;
+                        video.ThumbURL = thumbURL;
+                        video.Title = title;
+                        video.AvailableFormats = formats.ToList();
+
+                        Videos.Add(video);
                 }
             }
             else
@@ -264,7 +270,6 @@ public void ModifyQueue(string title, string thumbURL, string ID, string filenam
                     case 0:
                         throw new QueueException(Localization.Strings.InvalidURL);
                     default:
-
                         Video videoNonYoutube = new Video();
                         videoNonYoutube.ID = ID;
                         videoNonYoutube.Name = filename;
@@ -278,7 +283,6 @@ public void ModifyQueue(string title, string thumbURL, string ID, string filenam
                         break;
                 }
             }
-
         }
     }
 }