Further fixes to playlists, thumb gen

gfrn · Dec 20, 2020 · 62d194d · 62d194d
1 parent 308efd7
commit 62d194d
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 25 deletions.
diff --git a/WPFMETRO/Localization/Strings.Designer.cs b/WPFMETRO/Localization/Strings.Designer.cs
diff --git a/WPFMETRO/Localization/Strings.pt-BR.resx b/WPFMETRO/Localization/Strings.pt-BR.resx
@@ -289,7 +289,7 @@
     <value>Para aplicar as mudanças de idioma, reinicie o programa</value>
   </data>
   <data name="RetrievingFormats" xml:space="preserve">
-    <value>Buscando Formatos...</value>
+    <value>Buscando Dados...</value>
   </data>
   <data name="SaveChanges" xml:space="preserve">
     <value>Salvar</value>

diff --git a/WPFMETRO/Localization/Strings.resx b/WPFMETRO/Localization/Strings.resx
@@ -289,7 +289,7 @@
     <value>Restart the program to apply language changes</value>
   </data>
   <data name="RetrevingFormats" xml:space="preserve">
-    <value>Retrieving Formats...</value>
+    <value>Retrieving Video Metadata...</value>
   </data>
   <data name="SaveChanges" xml:space="preserve">
     <value>Save Changes</value>

diff --git a/WPFMETRO/MainWindow.xaml.cs b/WPFMETRO/MainWindow.xaml.cs
@@ -134,6 +134,7 @@ private bool IsRunningAsAdmin()
 
         private async void SelectButton_Click(object sender, RoutedEventArgs e)
         {
+            DownloadStatus.Text = Localization.Strings.RetrevingFormats;
             UrlBox.Background = Brushes.Transparent;
             formats.Clear();
             string Url = UrlBox.Text;
@@ -145,11 +146,12 @@ private async void SelectButton_Click(object sender, RoutedEventArgs e)
                 FiletypeBox.ItemsSource = formats;
                 FiletypeBox.IsEnabled = AddToQueueButton.IsEnabled = true;
                 UrlBox.Background = Brushes.DarkGreen;
+
+
             }
             else
             {
                 UrlBox.Text = UrlBox.Text.Contains(@"&list=") ? UrlBox.Text.Substring(0, UrlBox.Text.IndexOf(@"&list=")) : UrlBox.Text;
-                DownloadStatus.Text = Localization.Strings.RetrevingFormats;
 
                 await Task.Run(() => formats=queue.GetFormats(Url));
                 await Task.Run(() => videoInfo=queue.GetInfo(Url));
@@ -284,7 +286,9 @@ public void UpdateCard()
 
                     if (video.ThumbURL != null)
                     {
-                        var imageData = new WebClient().DownloadData(new Uri(video.ThumbURL + ".jpg"));
+                        string extension = video.ThumbURL.Substring(video.ThumbURL.LastIndexOf("."));
+                        video.ThumbURL = extension == ".jpg" ? video.ThumbURL : video.ThumbURL + ".jpg";
+                        var imageData = new WebClient().DownloadData(new Uri(video.ThumbURL));
                         var bitmapImage = new BitmapImage { CacheOption = BitmapCacheOption.OnLoad };
                         bitmapImage.BeginInit();
                         bitmapImage.StreamSource = new MemoryStream(imageData);

diff --git a/WPFMETRO/Properties/AssemblyInfo.cs b/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.0.6")]
-[assembly: AssemblyFileVersion("1.5.0.6")]
+[assembly: AssemblyVersion("1.5.0.7")]
+[assembly: AssemblyFileVersion("1.5.0.7")]
diff --git a/WPFMETRO/Queue.cs b/WPFMETRO/Queue.cs
@@ -101,7 +101,7 @@ public Dictionary<string, string> GetFormats(string url)
                     {
                         output = f.Data ?? "null";
 
-                        if (output != "null")
+                        if (output != "null" && !output.Contains("["))
                         {
                             if (isNext)
                             {
@@ -172,23 +172,7 @@ public void DownloadPlaylist(string ID, string filename, string path, string fil
 
                 foreach (var playlistItem in playlistItemsListResponse.Items)
                 {
-                    var videoRequest = yt.Videos.List("snippet,status");
-
-                    videoRequest.Id = playlistItem.Id;
-
-                    var videoListResponse = videoRequest.Execute();
-
-                    if (videoListResponse.Items.Count < 1)
-                    {
-                        throw new QueueException(Localization.Strings.InvalidURL);
-                    }
-                    foreach (var videoItem in videoListResponse.Items)
-                    {
-                        if (videoItem.Status != null)
-                        {
-                            ModifyQueue(videoItem.Snippet.Title, videoItem.Snippet.Thumbnails.Default__.Url, "https://www.youtube.com/watch?v=" + playlistItem.Snippet.ResourceId.VideoId, filename, path, filetype, formats);
-                        }
-                    }
+                    ModifyQueue(playlistItem.Snippet.Title, playlistItem.Snippet.Thumbnails.Default__.Url, "https://www.youtube.com/watch?v=" + playlistItem.Snippet.ResourceId.VideoId, filename, path, filetype, formats);
                 }
 
                 nextPageToken = playlistItemsListResponse.NextPageToken;