Fix application crash when enqueuing to an invalid destination folder (…

…#1201) * Revert removing unused translations (from #1174) * Fix application crash when enqueuing to an invalid destination folder * Fix default enqueue folder only saving when the browser button was used * Inherit documentation from Directory.CreateDirectory * Thanks rider
lay295 · Aug 29, 2024 · 1f61521 · 1f61521
1 parent c878915
commit 1f61521
Show file tree

Hide file tree

Showing 15 changed files with 185 additions and 9 deletions.
diff --git a/TwitchDownloaderCore/TwitchHelper.cs b/TwitchDownloaderCore/TwitchHelper.cs
@@ -927,6 +927,7 @@ public static void CleanUpClaimedFile([AllowNull] FileInfo fileInfo, [AllowNull]
             }
         }
 
+        /// <inheritdoc cref="Directory.CreateDirectory"/>
         public static DirectoryInfo CreateDirectory(string path)
         {
             DirectoryInfo directoryInfo = Directory.CreateDirectory(path);

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
@@ -672,6 +672,12 @@
   <data name="ApplicationLanguageTooltip" xml:space="preserve">
     <value>¿TwitchDownloaderWPF no está disponible en tu idioma? ¡Haz clic para saber cómo ayudar a traducir!</value>
   </data>
+  <data name="InvalidFolderPath" xml:space="preserve">
+    <value>Ruta de carpeta no válida</value>
+  </data>
+  <data name="InvalidFolderPathMessage" xml:space="preserve">
+    <value>La carpeta no existe</value>
+  </data>
   <data name="StatusCanceled" xml:space="preserve">
     <value>Cancelado</value>
   </data>

diff --git a/TwitchDownloaderWPF/Translations/Strings.fr.resx b/TwitchDownloaderWPF/Translations/Strings.fr.resx
@@ -672,6 +672,12 @@
   <data name="ApplicationLanguageTooltip" xml:space="preserve">
     <value>TwitchDownloaderWPF n'est pas disponible dans votre langue maternelle ? Cliquez pour apprendre comment aider à traduire !</value>
   </data>
+  <data name="InvalidFolderPath" xml:space="preserve">
+    <value>Chemin d'accès au répertoire non valide</value>
+  </data>
+  <data name="InvalidFolderPathMessage" xml:space="preserve">
+    <value>Le répertoire n'existe pas</value>
+  </data>
   <data name="StatusCanceled" xml:space="preserve">
     <value>Annulé</value>
   </data>

diff --git a/TwitchDownloaderWPF/Translations/Strings.it.resx b/TwitchDownloaderWPF/Translations/Strings.it.resx
@@ -672,6 +672,12 @@
   <data name="ApplicationLanguageTooltip" xml:space="preserve">
     <value>TwitchDownloaderWPF non è disponibile nella tua lingua? Fai click per sapere come aiutare o tradutte!</value>
   </data>
+  <data name="InvalidFolderPath" xml:space="preserve">
+    <value>Percorso della cartella non valido</value>
+  </data>
+  <data name="InvalidFolderPathMessage" xml:space="preserve">
+    <value>La cartella non esiste</value>
+  </data>
   <data name="StatusCanceled" xml:space="preserve">
     <value>Cancellato</value>
   </data>

diff --git a/TwitchDownloaderWPF/Translations/Strings.ja.resx b/TwitchDownloaderWPF/Translations/Strings.ja.resx
@@ -672,6 +672,12 @@
   <data name="ApplicationLanguageTooltip" xml:space="preserve">
     <value>あなたの母国語でTwitchDownloaderWPFが利用できませんか？クリックで翻訳を手伝う方法を学ぶ！</value>
   </data>
+  <data name="InvalidFolderPath" xml:space="preserve">
+    <value>不正なフォルダパス</value>
+  </data>
+  <data name="InvalidFolderPathMessage" xml:space="preserve">
+    <value>フォルダが存在しません</value>
+  </data>
   <data name="StatusCanceled" xml:space="preserve">
     <value>キャンセルされた</value>
   </data>

diff --git a/TwitchDownloaderWPF/Translations/Strings.pl.resx b/TwitchDownloaderWPF/Translations/Strings.pl.resx
@@ -672,6 +672,12 @@
   <data name="ApplicationLanguageTooltip" xml:space="preserve">
     <value>TwitchDownloaderWPF nie jest dostępny w twoim natywnym języku? Kliknij, aby dowiedzieć się jak nas wspomóc!</value>
   </data>
+  <data name="InvalidFolderPath" xml:space="preserve">
+    <value>Nieprawidłowa Ścieżka Folderu</value>
+  </data>
+  <data name="InvalidFolderPathMessage" xml:space="preserve">
+    <value>Folder nie istnieje</value>
+  </data>
   <data name="StatusCanceled" xml:space="preserve">
     <value>Anulowano</value>
   </data>

diff --git a/TwitchDownloaderWPF/Translations/Strings.pt-br.resx b/TwitchDownloaderWPF/Translations/Strings.pt-br.resx
@@ -676,6 +676,12 @@
   <data name="ApplicationLanguageTooltip" xml:space="preserve">
     <value>O TwitchDownloaderWPF não está disponível em sua languagem nativa? Clique para aprender como ajudar a traduzir!</value>
   </data>
+  <data name="InvalidFolderPath" xml:space="preserve">
+    <value>Diretório da Pasta Inválido</value>
+  </data>
+  <data name="InvalidFolderPathMessage" xml:space="preserve">
+    <value>A pasta não existe</value>
+  </data>
   <data name="StatusCanceled" xml:space="preserve">
     <value>Cancelado</value>
   </data>

diff --git a/TwitchDownloaderWPF/Translations/Strings.resx b/TwitchDownloaderWPF/Translations/Strings.resx
@@ -672,6 +672,12 @@
   <data name="ApplicationLanguageTooltip" xml:space="preserve">
     <value>Is TwitchDownloaderWPF not available in your native language? Click to learn how to help translate!</value>
   </data>
+  <data name="InvalidFolderPath" xml:space="preserve">
+    <value>Invalid Folder Path</value>
+  </data>
+  <data name="InvalidFolderPathMessage" xml:space="preserve">
+    <value>The folder does not exist</value>
+  </data>
   <data name="StatusCanceled" xml:space="preserve">
     <value>Canceled</value>
   </data>

diff --git a/TwitchDownloaderWPF/Translations/Strings.ru.resx b/TwitchDownloaderWPF/Translations/Strings.ru.resx
@@ -672,6 +672,12 @@
   <data name="ApplicationLanguageTooltip" xml:space="preserve">
     <value>TwitchDownloaderWPF не доступен на твоем языке? Нажми здесь чтобы узнать как помочь с переводом!</value>
   </data>
+  <data name="InvalidFolderPath" xml:space="preserve">
+    <value>Неправильный путь к папке</value>
+  </data>
+  <data name="InvalidFolderPathMessage" xml:space="preserve">
+    <value>Папка не существует</value>
+  </data>
   <data name="StatusCanceled" xml:space="preserve">
     <value>Отменено</value>
   </data>

diff --git a/TwitchDownloaderWPF/Translations/Strings.tr.resx b/TwitchDownloaderWPF/Translations/Strings.tr.resx
@@ -673,6 +673,12 @@
   <data name="ApplicationLanguageTooltip" xml:space="preserve">
     <value>TwitchDownloaderWPF ana dilinizde mevcut değil mi?  Çeviriye nasıl yardım edeceğinizi öğrenmek için tıklayın!</value>
   </data>
+  <data name="InvalidFolderPath" xml:space="preserve">
+    <value>Geçersiz Klasör Yolu</value>
+  </data>
+  <data name="InvalidFolderPathMessage" xml:space="preserve">
+    <value>Klasör mevcut değil</value>
+  </data>
   <data name="StatusCanceled" xml:space="preserve">
     <value>İptal edildi</value>
   </data>

diff --git a/TwitchDownloaderWPF/Translations/Strings.uk.resx b/TwitchDownloaderWPF/Translations/Strings.uk.resx
@@ -672,6 +672,12 @@
   <data name="ApplicationLanguageTooltip" xml:space="preserve">
     <value>TwitchDownloaderWPF недоступно на вашій мові? Натисніть тут, щоб дізнатися, як допомогти з перекладом!</value>
   </data>
+  <data name="InvalidFolderPath" xml:space="preserve">
+    <value>Неправильний шлях до папки</value>
+  </data>
+  <data name="InvalidFolderPathMessage" xml:space="preserve">
+    <value>Папка не існує</value>
+  </data>
   <data name="StatusCanceled" xml:space="preserve">
     <value>Скасовано</value>
   </data>

diff --git a/TwitchDownloaderWPF/Translations/Strings.zh-cn.resx b/TwitchDownloaderWPF/Translations/Strings.zh-cn.resx
@@ -672,6 +672,12 @@
   <data name="ApplicationLanguageTooltip" xml:space="preserve">
     <value>TwitchDownloaderWPF 没有你的母语版本？点击了解如何帮助翻译！</value>
   </data>
+  <data name="InvalidFolderPath" xml:space="preserve">
+    <value>文件夹路径无效</value>
+  </data>
+  <data name="InvalidFolderPathMessage" xml:space="preserve">
+    <value>文件夹不存在</value>
+  </data>
   <data name="StatusCanceled" xml:space="preserve">
     <value>已取消</value>
   </data>

diff --git a/TwitchDownloaderWPF/WindowQueueOptions.xaml b/TwitchDownloaderWPF/WindowQueueOptions.xaml
@@ -30,7 +30,7 @@
         <StackPanel Orientation="Vertical" Grid.Column="1" Grid.Row="1">
             <WrapPanel Orientation="Horizontal">
                 <TextBlock Text="{lex:Loc DownloadFolder}" HorizontalAlignment="Left" Margin="0,6,0,0" VerticalAlignment="Top" Foreground="{DynamicResource AppText}"/>
-                <TextBox x:Name="textFolder" HorizontalAlignment="Left" Height="23" Margin="3,0,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" MinWidth="300" Background="{DynamicResource AppElementBackground}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}"/>
+                <TextBox x:Name="textFolder" HorizontalAlignment="Left" Height="23" Margin="3,0,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" MinWidth="300" TextChanged="TextFolder_OnTextChanged" Background="{DynamicResource AppElementBackground}" BorderBrush="{DynamicResource AppElementBorder}" Foreground="{DynamicResource AppText}"/>
                 <Button x:Name="btnFolder" Content="{lex:Loc Browse}" HorizontalAlignment="Left" Margin="3,0,0,0" VerticalAlignment="Top" MinWidth="60" Click="btnFolder_Click" Background="{DynamicResource ActionButtonBackground}" Foreground="{DynamicResource ActionButtonText}" BorderBrush="{DynamicResource ActionButtonBorder}"/>
             </WrapPanel>
             <CheckBox x:Name="checkVideo" Content="{lex:Loc DownloadVideo}" HorizontalAlignment="Left" Margin="0,8,0,0" VerticalAlignment="Top" Checked="CheckVideo_OnChecked" Unchecked="CheckVideo_OnChecked" Foreground="{DynamicResource AppText}" BorderBrush="{DynamicResource AppElementBorder}"/>

diff --git a/TwitchDownloaderWPF/WindowQueueOptions.xaml.cs b/TwitchDownloaderWPF/WindowQueueOptions.xaml.cs
@@ -126,7 +126,21 @@ private void btnQueue_Click(object sender, RoutedEventArgs e)
                     string folderPath = textFolder.Text;
                     if (!Directory.Exists(folderPath))
                     {
-                        TwitchHelper.CreateDirectory(folderPath);
+                        try
+                        {
+                            TwitchHelper.CreateDirectory(folderPath);
+                        }
+                        catch (Exception ex)
+                        {
+                            MessageBox.Show(this, Translations.Strings.InvalidFolderPathMessage, Translations.Strings.InvalidFolderPath, MessageBoxButton.OK, MessageBoxImage.Error);
+
+                            if (Settings.Default.VerboseErrors)
+                            {
+                                MessageBox.Show(this, ex.ToString(), Translations.Strings.VerboseErrorOutput, MessageBoxButton.OK, MessageBoxImage.Error);
+                            }
+
+                            return;
+                        }
                     }
 
                     VideoDownloadOptions downloadOptions = vodDownloadPage.GetOptions(null, textFolder.Text);
@@ -226,7 +240,21 @@ private void btnQueue_Click(object sender, RoutedEventArgs e)
                     string folderPath = textFolder.Text;
                     if (!Directory.Exists(folderPath))
                     {
-                        TwitchHelper.CreateDirectory(folderPath);
+                        try
+                        {
+                            TwitchHelper.CreateDirectory(folderPath);
+                        }
+                        catch (Exception ex)
+                        {
+                            MessageBox.Show(this, Translations.Strings.InvalidFolderPathMessage, Translations.Strings.InvalidFolderPath, MessageBoxButton.OK, MessageBoxImage.Error);
+
+                            if (Settings.Default.VerboseErrors)
+                            {
+                                MessageBox.Show(this, ex.ToString(), Translations.Strings.VerboseErrorOutput, MessageBoxButton.OK, MessageBoxImage.Error);
+                            }
+
+                            return;
+                        }
                     }
 
                     ClipDownloadOptions downloadOptions = new ClipDownloadOptions
@@ -330,7 +358,21 @@ private void btnQueue_Click(object sender, RoutedEventArgs e)
                     string folderPath = textFolder.Text;
                     if (!Directory.Exists(folderPath))
                     {
-                        TwitchHelper.CreateDirectory(folderPath);
+                        try
+                        {
+                            TwitchHelper.CreateDirectory(folderPath);
+                        }
+                        catch (Exception ex)
+                        {
+                            MessageBox.Show(this, Translations.Strings.InvalidFolderPathMessage, Translations.Strings.InvalidFolderPath, MessageBoxButton.OK, MessageBoxImage.Error);
+
+                            if (Settings.Default.VerboseErrors)
+                            {
+                                MessageBox.Show(this, ex.ToString(), Translations.Strings.VerboseErrorOutput, MessageBoxButton.OK, MessageBoxImage.Error);
+                            }
+
+                            return;
+                        }
                     }
 
                     ChatDownloadOptions chatOptions = MainWindow.pageChatDownload.GetOptions(null);
@@ -387,7 +429,21 @@ private void btnQueue_Click(object sender, RoutedEventArgs e)
                     string folderPath = textFolder.Text;
                     if (!Directory.Exists(folderPath))
                     {
-                        TwitchHelper.CreateDirectory(folderPath);
+                        try
+                        {
+                            TwitchHelper.CreateDirectory(folderPath);
+                        }
+                        catch (Exception ex)
+                        {
+                            MessageBox.Show(this, Translations.Strings.InvalidFolderPathMessage, Translations.Strings.InvalidFolderPath, MessageBoxButton.OK, MessageBoxImage.Error);
+
+                            if (Settings.Default.VerboseErrors)
+                            {
+                                MessageBox.Show(this, ex.ToString(), Translations.Strings.VerboseErrorOutput, MessageBoxButton.OK, MessageBoxImage.Error);
+                            }
+
+                            return;
+                        }
                     }
 
                     ChatUpdateOptions chatOptions = MainWindow.pageChatUpdate.GetOptions(null);
@@ -423,7 +479,21 @@ private void btnQueue_Click(object sender, RoutedEventArgs e)
                     {
                         if (!Directory.Exists(folderPath))
                         {
-                            TwitchHelper.CreateDirectory(folderPath);
+                            try
+                            {
+                                TwitchHelper.CreateDirectory(folderPath);
+                            }
+                            catch (Exception ex)
+                            {
+                                MessageBox.Show(this, Translations.Strings.InvalidFolderPathMessage, Translations.Strings.InvalidFolderPath, MessageBoxButton.OK, MessageBoxImage.Error);
+
+                                if (Settings.Default.VerboseErrors)
+                                {
+                                    MessageBox.Show(this, ex.ToString(), Translations.Strings.VerboseErrorOutput, MessageBoxButton.OK, MessageBoxImage.Error);
+                                }
+
+                                return;
+                            }
                         }
 
                         string fileFormat = chatRenderPage.comboFormat.SelectedItem.ToString()!;
@@ -466,7 +536,21 @@ private void EnqueueDataList()
             string folderPath = textFolder.Text;
             if (!Directory.Exists(folderPath))
             {
-                TwitchHelper.CreateDirectory(folderPath);
+                try
+                {
+                    TwitchHelper.CreateDirectory(folderPath);
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show(this, Translations.Strings.InvalidFolderPathMessage, Translations.Strings.InvalidFolderPath, MessageBoxButton.OK, MessageBoxImage.Error);
+
+                    if (Settings.Default.VerboseErrors)
+                    {
+                        MessageBox.Show(this, ex.ToString(), Translations.Strings.VerboseErrorOutput, MessageBoxButton.OK, MessageBoxImage.Error);
+                    }
+
+                    return;
+                }
             }
 
             foreach (var taskData in _dataList)
@@ -624,11 +708,18 @@ private void btnFolder_Click(object sender, RoutedEventArgs e)
             if (dialog.ShowDialog(this).GetValueOrDefault())
             {
                 textFolder.Text = dialog.SelectedPath;
-                Settings.Default.QueueFolder = textFolder.Text;
-                Settings.Default.Save();
             }
         }
 
+        private void TextFolder_OnTextChanged(object sender, TextChangedEventArgs e)
+        {
+            if (!IsInitialized)
+                return;
+
+            Settings.Default.QueueFolder = textFolder.Text;
+            Settings.Default.Save();
+        }
+
         private void checkChat_Checked(object sender, RoutedEventArgs e)
         {
             checkRender.IsEnabled = true;
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
             }
+            /// <inheritdoc cref="Directory.CreateDirectory"/>
             public static DirectoryInfo CreateDirectory(string path)
             {
                 DirectoryInfo directoryInfo = Directory.CreateDirectory(path);
@@ Expand Down @@