Fix app crash when fetching videos in VOD/Clip mass downloaders (#1193)

* Fix app crash when fetching videos in vod/clip mass downloaders * Do not fail silently when verbose errors are disabled * Add custom translations
lay295 · Aug 27, 2024 · b2dc445 · b2dc445
1 parent d54ae22
commit b2dc445
Show file tree

Hide file tree

Showing 13 changed files with 204 additions and 3 deletions.
diff --git a/TwitchDownloaderWPF/Translations/Strings.Designer.cs b/TwitchDownloaderWPF/Translations/Strings.Designer.cs
diff --git a/TwitchDownloaderWPF/Translations/Strings.es.resx b/TwitchDownloaderWPF/Translations/Strings.es.resx
@@ -937,4 +937,16 @@
   <data name="TaskRetry" xml:space="preserve">
     <value>Retry</value>
   </data>
+  <data name="UnableToGetChannelVideos" xml:space="preserve">
+    <value>Unable to Get Videos</value>
+  </data>
+  <data name="UnableToGetChannelVideosMessage" xml:space="preserve">
+    <value>Unable to get channel videos: {0}</value>
+  </data>
+  <data name="UnableToGetChannelClips" xml:space="preserve">
+    <value>Unable to Get Clips</value>
+  </data>
+  <data name="UnableToGetChannelClipsMessage" xml:space="preserve">
+    <value>Unable to get channel clips: {0}</value>
+  </data>
 </root>
diff --git a/TwitchDownloaderWPF/Translations/Strings.fr.resx b/TwitchDownloaderWPF/Translations/Strings.fr.resx
@@ -936,4 +936,16 @@
   <data name="TaskRetry" xml:space="preserve">
     <value>Retry</value>
   </data>
+  <data name="UnableToGetChannelVideos" xml:space="preserve">
+    <value>Unable to Get Videos</value>
+  </data>
+  <data name="UnableToGetChannelVideosMessage" xml:space="preserve">
+    <value>Unable to get channel videos: {0}</value>
+  </data>
+  <data name="UnableToGetChannelClips" xml:space="preserve">
+    <value>Unable to Get Clips</value>
+  </data>
+  <data name="UnableToGetChannelClipsMessage" xml:space="preserve">
+    <value>Unable to get channel clips: {0}</value>
+  </data>
 </root>
diff --git a/TwitchDownloaderWPF/Translations/Strings.it.resx b/TwitchDownloaderWPF/Translations/Strings.it.resx
@@ -937,4 +937,16 @@
   <data name="TaskRetry" xml:space="preserve">
     <value>Retry</value>
   </data>
+  <data name="UnableToGetChannelVideos" xml:space="preserve">
+    <value>Unable to Get Videos</value>
+  </data>
+  <data name="UnableToGetChannelVideosMessage" xml:space="preserve">
+    <value>Unable to get channel videos: {0}</value>
+  </data>
+  <data name="UnableToGetChannelClips" xml:space="preserve">
+    <value>Unable to Get Clips</value>
+  </data>
+  <data name="UnableToGetChannelClipsMessage" xml:space="preserve">
+    <value>Unable to get channel clips: {0}</value>
+  </data>
 </root>
diff --git a/TwitchDownloaderWPF/Translations/Strings.ja.resx b/TwitchDownloaderWPF/Translations/Strings.ja.resx
@@ -935,4 +935,16 @@
   <data name="TaskRetry" xml:space="preserve">
     <value>Retry</value>
   </data>
+  <data name="UnableToGetChannelVideos" xml:space="preserve">
+    <value>Unable to Get Videos</value>
+  </data>
+  <data name="UnableToGetChannelVideosMessage" xml:space="preserve">
+    <value>Unable to get channel videos: {0}</value>
+  </data>
+  <data name="UnableToGetChannelClips" xml:space="preserve">
+    <value>Unable to Get Clips</value>
+  </data>
+  <data name="UnableToGetChannelClipsMessage" xml:space="preserve">
+    <value>Unable to get channel clips: {0}</value>
+  </data>
 </root>
diff --git a/TwitchDownloaderWPF/Translations/Strings.pl.resx b/TwitchDownloaderWPF/Translations/Strings.pl.resx
@@ -936,4 +936,16 @@
   <data name="TaskRetry" xml:space="preserve">
     <value>Retry</value>
   </data>
+  <data name="UnableToGetChannelVideos" xml:space="preserve">
+    <value>Unable to Get Videos</value>
+  </data>
+  <data name="UnableToGetChannelVideosMessage" xml:space="preserve">
+    <value>Unable to get channel videos: {0}</value>
+  </data>
+  <data name="UnableToGetChannelClips" xml:space="preserve">
+    <value>Unable to Get Clips</value>
+  </data>
+  <data name="UnableToGetChannelClipsMessage" xml:space="preserve">
+    <value>Unable to get channel clips: {0}</value>
+  </data>
 </root>
diff --git a/TwitchDownloaderWPF/Translations/Strings.pt-br.resx b/TwitchDownloaderWPF/Translations/Strings.pt-br.resx
@@ -935,4 +935,16 @@
   <data name="TaskRetry" xml:space="preserve">
     <value>Retry</value>
   </data>
+  <data name="UnableToGetChannelVideos" xml:space="preserve">
+    <value>Unable to Get Videos</value>
+  </data>
+  <data name="UnableToGetChannelVideosMessage" xml:space="preserve">
+    <value>Unable to get channel videos: {0}</value>
+  </data>
+  <data name="UnableToGetChannelClips" xml:space="preserve">
+    <value>Unable to Get Clips</value>
+  </data>
+  <data name="UnableToGetChannelClipsMessage" xml:space="preserve">
+    <value>Unable to get channel clips: {0}</value>
+  </data>
 </root>
diff --git a/TwitchDownloaderWPF/Translations/Strings.resx b/TwitchDownloaderWPF/Translations/Strings.resx
@@ -935,4 +935,16 @@
   <data name="TaskRetry" xml:space="preserve">
     <value>Retry</value>
   </data>
+  <data name="UnableToGetChannelVideos" xml:space="preserve">
+    <value>Unable to Get Videos</value>
+  </data>
+  <data name="UnableToGetChannelVideosMessage" xml:space="preserve">
+    <value>Unable to get channel videos: {0}</value>
+  </data>
+  <data name="UnableToGetChannelClips" xml:space="preserve">
+    <value>Unable to Get Clips</value>
+  </data>
+  <data name="UnableToGetChannelClipsMessage" xml:space="preserve">
+    <value>Unable to get channel clips: {0}</value>
+  </data>
 </root>
diff --git a/TwitchDownloaderWPF/Translations/Strings.ru.resx b/TwitchDownloaderWPF/Translations/Strings.ru.resx
@@ -936,4 +936,16 @@
   <data name="TaskRetry" xml:space="preserve">
     <value>Retry</value>
   </data>
+  <data name="UnableToGetChannelVideos" xml:space="preserve">
+    <value>Unable to Get Videos</value>
+  </data>
+  <data name="UnableToGetChannelVideosMessage" xml:space="preserve">
+    <value>Unable to get channel videos: {0}</value>
+  </data>
+  <data name="UnableToGetChannelClips" xml:space="preserve">
+    <value>Unable to Get Clips</value>
+  </data>
+  <data name="UnableToGetChannelClipsMessage" xml:space="preserve">
+    <value>Unable to get channel clips: {0}</value>
+  </data>
 </root>
diff --git a/TwitchDownloaderWPF/Translations/Strings.tr.resx b/TwitchDownloaderWPF/Translations/Strings.tr.resx
@@ -937,4 +937,16 @@
   <data name="TaskRetry" xml:space="preserve">
     <value>Retry</value>
   </data>
+  <data name="UnableToGetChannelVideos" xml:space="preserve">
+    <value>Unable to Get Videos</value>
+  </data>
+  <data name="UnableToGetChannelVideosMessage" xml:space="preserve">
+    <value>Unable to get channel videos: {0}</value>
+  </data>
+  <data name="UnableToGetChannelClips" xml:space="preserve">
+    <value>Unable to Get Clips</value>
+  </data>
+  <data name="UnableToGetChannelClipsMessage" xml:space="preserve">
+    <value>Unable to get channel clips: {0}</value>
+  </data>
 </root>
diff --git a/TwitchDownloaderWPF/Translations/Strings.uk.resx b/TwitchDownloaderWPF/Translations/Strings.uk.resx
@@ -936,4 +936,16 @@
   <data name="TaskRetry" xml:space="preserve">
     <value>Retry</value>
   </data>
+  <data name="UnableToGetChannelVideos" xml:space="preserve">
+    <value>Unable to Get Videos</value>
+  </data>
+  <data name="UnableToGetChannelVideosMessage" xml:space="preserve">
+    <value>Unable to get channel videos: {0}</value>
+  </data>
+  <data name="UnableToGetChannelClips" xml:space="preserve">
+    <value>Unable to Get Clips</value>
+  </data>
+  <data name="UnableToGetChannelClipsMessage" xml:space="preserve">
+    <value>Unable to get channel clips: {0}</value>
+  </data>
 </root>
diff --git a/TwitchDownloaderWPF/Translations/Strings.zh-cn.resx b/TwitchDownloaderWPF/Translations/Strings.zh-cn.resx
@@ -938,4 +938,16 @@
   <data name="TaskRetry" xml:space="preserve">
     <value>Retry</value>
   </data>
+  <data name="UnableToGetChannelVideos" xml:space="preserve">
+    <value>Unable to Get Videos</value>
+  </data>
+  <data name="UnableToGetChannelVideosMessage" xml:space="preserve">
+    <value>Unable to get channel videos: {0}</value>
+  </data>
+  <data name="UnableToGetChannelClips" xml:space="preserve">
+    <value>Unable to Get Clips</value>
+  </data>
+  <data name="UnableToGetChannelClipsMessage" xml:space="preserve">
+    <value>Unable to get channel clips: {0}</value>
+  </data>
 </root>
diff --git a/TwitchDownloaderWPF/WindowMassDownload.xaml.cs b/TwitchDownloaderWPF/WindowMassDownload.xaml.cs
@@ -83,7 +83,24 @@ private async Task UpdateList()
                 {
                     currentCursor = cursorList[cursorIndex];
                 }
-                GqlVideoSearchResponse res = await TwitchHelper.GetGqlVideos(currentChannel, currentCursor, videoCount);
+
+                GqlVideoSearchResponse res;
+                try
+                {
+                    res = await TwitchHelper.GetGqlVideos(currentChannel, currentCursor, videoCount);
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show(this, string.Format(Translations.Strings.UnableToGetChannelVideosMessage, ex.Message), Translations.Strings.UnableToGetChannelVideos, MessageBoxButton.OK, MessageBoxImage.Error);
+
+                    if (Settings.Default.VerboseErrors)
+                    {
+                        MessageBox.Show(this, ex.ToString(), Translations.Strings.VerboseErrorOutput, MessageBoxButton.OK, MessageBoxImage.Error);
+                    }
+
+                    return;
+                }
+
                 videoList.Clear();
                 if (res.data.user != null)
                 {
@@ -125,7 +142,24 @@ private async Task UpdateList()
                 {
                     currentCursor = cursorList[cursorIndex];
                 }
-                GqlClipSearchResponse res = await TwitchHelper.GetGqlClips(currentChannel, period, currentCursor, videoCount);
+
+                GqlClipSearchResponse res;
+                try
+                {
+                    res = await TwitchHelper.GetGqlClips(currentChannel, period, currentCursor, videoCount);
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show(this, string.Format(Translations.Strings.UnableToGetChannelClipsMessage, ex.Message), Translations.Strings.UnableToGetChannelClips, MessageBoxButton.OK, MessageBoxImage.Error);
+
+                    if (Settings.Default.VerboseErrors)
+                    {
+                        MessageBox.Show(this, ex.ToString(), Translations.Strings.VerboseErrorOutput, MessageBoxButton.OK, MessageBoxImage.Error);
+                    }
+
+                    return;
+                }
+
                 videoList.Clear();
                 if (res.data.user != null)
                 {