Several URL list fixes (lay295#1007)

* Fix crash when a given VOD/Clip is not found * Fix queue button remaining disabled on error
ScrubN · Mar 24, 2024 · 63e2984 · 63e2984
1 parent d02269d
commit 63e2984
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/TwitchDownloaderWPF/WindowUrlList.xaml.cs b/TwitchDownloaderWPF/WindowUrlList.xaml.cs
@@ -25,13 +25,13 @@ private async void btnQueue_Click(object sender, RoutedEventArgs e)
         {
             btnQueue.IsEnabled = false;
             List<string> idList = new List<string>();
-            List<string> urlList = new List<string>(textList.Text.Split('\n', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries));
             List<string> invalidList = new List<string>();
             List<string> errorList = new List<string>();
             List<TaskData> dataList = new List<TaskData>();
             Dictionary<string, string> idDict = new Dictionary<string, string>();
 
-            foreach (var url in urlList)
+            var urls = textList.Text.Split('\n', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries);
+            foreach (var url in urls)
             {
                 string id = PageChatDownload.ValidateUrl(url);
 
@@ -49,6 +49,7 @@ private async void btnQueue_Click(object sender, RoutedEventArgs e)
             if (invalidList.Count > 0)
             {
                 MessageBox.Show(Translations.Strings.UnableToParseInputsMessage + Environment.NewLine + string.Join(Environment.NewLine, invalidList.ToArray()), Translations.Strings.UnableToParseInputs, MessageBoxButton.OK, MessageBoxImage.Error);
+                btnQueue.IsEnabled = true;
                 return;
             }
 
@@ -84,9 +85,8 @@ private async void btnQueue_Click(object sender, RoutedEventArgs e)
                     continue;
 
                 string id = taskDict[task.Id];
-                if (!task.IsFaulted)
+                if (!task.IsFaulted && task.Result.data.video is { } videoInfo)
                 {
-                    var videoInfo = task.Result.data.video;
                     var thumbUrl = videoInfo.thumbnailURLs.FirstOrDefault();
                     if (!ThumbnailService.TryGetThumb(thumbUrl, out var thumbnail))
                     {
@@ -123,9 +123,8 @@ private async void btnQueue_Click(object sender, RoutedEventArgs e)
                     continue;
 
                 string id = taskDict[task.Id];
-                if (!task.IsFaulted)
+                if (!task.IsFaulted && task.Result.data.clip is { } clipInfo)
                 {
-                    var clipInfo = task.Result.data.clip;
                     var thumbUrl = clipInfo.thumbnailURL;
                     if (!ThumbnailService.TryGetThumb(thumbUrl, out var thumbnail))
                     {
@@ -153,6 +152,7 @@ private async void btnQueue_Click(object sender, RoutedEventArgs e)
             if (errorList.Count > 0)
             {
                 MessageBox.Show(Translations.Strings.UnableToGetInfoMessage + Environment.NewLine + string.Join(Environment.NewLine, errorList.ToArray()), Translations.Strings.UnableToGetInfo, MessageBoxButton.OK, MessageBoxImage.Error);
+                btnQueue.IsEnabled = true;
                 return;
             }