Add Option to include Subfolders in Batch Mode

Alkl58 · Feb 22, 2023 · ad160ec · ad160ec
1 parent d5e0ebc
commit ad160ec
Show file tree

Hide file tree

Showing 13 changed files with 44 additions and 3 deletions.
diff --git a/NotEnoughAV1Encodes/MainWindow.xaml.cs b/NotEnoughAV1Encodes/MainWindow.xaml.cs
@@ -232,7 +232,7 @@ private void ButtonOpenSource_Click(object sender, RoutedEventArgs e)
                     }
 
                     // Batch Folder Input
-                    Views.BatchFolderDialog batchFolderDialog = new(settingsDB.Theme, openSource.Path);
+                    Views.BatchFolderDialog batchFolderDialog = new(settingsDB.Theme, openSource.Path, settingsDB.SubfolderBatch);
                     batchFolderDialog.ShowDialog();
                     if (batchFolderDialog.Quit)
                     {

diff --git a/NotEnoughAV1Encodes/Views/BatchFolderDialog.xaml.cs b/NotEnoughAV1Encodes/Views/BatchFolderDialog.xaml.cs
@@ -20,13 +20,19 @@ public partial class BatchFolderDialog : MetroWindow
 
         private bool OutputSelected = false;
 
-        public BatchFolderDialog(string theme, string folderPath)
+        public BatchFolderDialog(string theme, string folderPath, bool subfolders)
         {
             InitializeComponent();
             try { ThemeManager.Current.ChangeTheme(this, theme); } catch { }
 
+            SearchOption searchOption = SearchOption.TopDirectoryOnly;
+            if (subfolders)
+            {
+                searchOption = SearchOption.AllDirectories;
+            }
+
             // "Video Files|*.mp4;*.mkv;*.webm;*.flv;*.avi;*.mov;*.wmv;
-            var files = Directory.EnumerateFiles(folderPath, "*.*", SearchOption.TopDirectoryOnly)
+            var files = Directory.EnumerateFiles(folderPath, "*.*", searchOption)
                         .Where(s => s.ToLower().EndsWith(".mp4")  || 
                                     s.ToLower().EndsWith(".mkv")  || 
                                     s.ToLower().EndsWith(".webm") || 

diff --git a/NotEnoughAV1Encodes/Views/ProgramSettings.xaml b/NotEnoughAV1Encodes/Views/ProgramSettings.xaml
@@ -38,6 +38,7 @@
                             <mah:ToggleSwitch Grid.Row="4" Grid.Column="0" x:Name="ToggleSwitchClearQueue" Header="{lex:Loc}" Height="53" Width="224" HorizontalAlignment="Center"/>
                             <mah:ToggleSwitch Grid.Row="0" Grid.Column="1" x:Name="ToggleSwitchAutoPauseResume" Header="{lex:Loc}" Height="53" Width="224" ToolTip="{lex:Loc ToggleSwitchAutoPauseResumeTooltip}" HorizontalAlignment="Center"/>
                             <mah:ToggleSwitch Grid.Row="1" Grid.Column="1" x:Name="ToggleSwitchInputSeeking" Header="{lex:Loc}" Height="53" Width="224" ToolTip="Faster PySceneDetect Seeking - chance of frame loss" HorizontalAlignment="Center"/>
+                            <mah:ToggleSwitch Grid.Row="2" Grid.Column="1" x:Name="ToggleSwitchBatchSubFolders" Header="{lex:Loc}" Height="53" Width="224" HorizontalAlignment="Center"/>
                         </Grid>
                     </GroupBox>
                     <GroupBox Margin="511,10,10,0" Height="80" VerticalAlignment="Top">

diff --git a/NotEnoughAV1Encodes/Views/ProgramSettings.xaml.cs b/NotEnoughAV1Encodes/Views/ProgramSettings.xaml.cs
@@ -25,6 +25,7 @@ public ProgramSettings(Settings settingsDB)
             ToggleSwitchShutdown.IsOn = settingsDB.ShutdownAfterEncode;
             ToggleSwitchLogging.IsOn = settingsDB.Logging;
             ToggleSwitchClearQueue.IsOn = settingsDB.AutoClearQueue;
+            ToggleSwitchBatchSubFolders.IsOn = settingsDB.SubfolderBatch;
             ComboBoxAccentTheme.SelectedIndex = settingsDB.AccentTheme;
             ComboBoxBaseTheme.SelectedIndex = settingsDB.BaseTheme;
             TextBoxTempPath.Text = settingsDB.TempPath;
@@ -120,6 +121,7 @@ private void MetroWindow_Closing(object sender, System.ComponentModel.CancelEven
             settingsDBTemp.ShutdownAfterEncode = ToggleSwitchShutdown.IsOn;
             settingsDBTemp.Logging = ToggleSwitchLogging.IsOn;
             settingsDBTemp.AutoClearQueue = ToggleSwitchClearQueue.IsOn;
+            settingsDBTemp.SubfolderBatch = ToggleSwitchBatchSubFolders.IsOn;
             settingsDBTemp.BaseTheme = ComboBoxBaseTheme.SelectedIndex;
             settingsDBTemp.AccentTheme = ComboBoxAccentTheme.SelectedIndex;
             settingsDBTemp.Theme = ComboBoxBaseTheme.Text + "." + ComboBoxAccentTheme.Text;

diff --git a/NotEnoughAV1Encodes/resources/Settings.cs b/NotEnoughAV1Encodes/resources/Settings.cs
@@ -53,5 +53,7 @@ public class Settings
         public bool UseInputSeeking { get; set; }
         /// <summary>Sort Queue By...</summary>
         public int SortQueueBy { get; set; }
+        /// <summary>Include Subfolders when opening a Batch Folder</summary>
+        public bool SubfolderBatch { get; set; }
     }
 }
diff --git a/NotEnoughAV1Encodes/resources/lang/Strings.Designer.cs b/NotEnoughAV1Encodes/resources/lang/Strings.Designer.cs
diff --git a/NotEnoughAV1Encodes/resources/lang/Strings.de.resx b/NotEnoughAV1Encodes/resources/lang/Strings.de.resx
@@ -563,4 +563,7 @@ Please download and extract 7-zip to the following path:
   <data name="SortByOutNameDesc" xml:space="preserve">
     <value>Sortieren nach Ausgabe Name (absteigend)</value>
   </data>
+  <data name="ToggleSwitchBatchSubFolders" xml:space="preserve">
+    <value>Unterordner im Batch einbeziehen</value>
+  </data>
 </root>
diff --git a/NotEnoughAV1Encodes/resources/lang/Strings.fr-FR.resx b/NotEnoughAV1Encodes/resources/lang/Strings.fr-FR.resx
@@ -563,4 +563,7 @@ Please download and extract 7-zip to the following path:
   <data name="SortByOutNameDesc" xml:space="preserve">
     <value>Trier par nom de sortie (desc)</value>
   </data>
+  <data name="ToggleSwitchBatchSubFolders" xml:space="preserve">
+    <value>Inclure les sous-dossiers en batch</value>
+  </data>
 </root>
diff --git a/NotEnoughAV1Encodes/resources/lang/Strings.it-IT.resx b/NotEnoughAV1Encodes/resources/lang/Strings.it-IT.resx
@@ -518,4 +518,7 @@ Please download and extract 7-zip to the following path:
   <data name="SortByOutNameDesc" xml:space="preserve">
     <value>Ordinamento per nome dell'uscita (discendente)</value>
   </data>
+  <data name="ToggleSwitchBatchSubFolders" xml:space="preserve">
+    <value>Includere le sottocartelle in Batch</value>
+  </data>
 </root>
diff --git a/NotEnoughAV1Encodes/resources/lang/Strings.ja-JP.resx b/NotEnoughAV1Encodes/resources/lang/Strings.ja-JP.resx
@@ -527,4 +527,7 @@ Please download and extract 7-zip to the following path:
   <data name="SortByOutNameDesc" xml:space="preserve">
     <value>アウトネームで並び替え（降順）</value>
   </data>
+  <data name="ToggleSwitchBatchSubFolders" xml:space="preserve">
+    <value>サブフォルダを一括で取り込む</value>
+  </data>
 </root>
diff --git a/NotEnoughAV1Encodes/resources/lang/Strings.resx b/NotEnoughAV1Encodes/resources/lang/Strings.resx
@@ -569,4 +569,7 @@ Please download and extract 7-zip to the following path:
   <data name="SortByOutNameDesc" xml:space="preserve">
     <value>Sort by Out Name (desc)</value>
   </data>
+  <data name="ToggleSwitchBatchSubFolders" xml:space="preserve">
+    <value>Include Subfolders in Batch Mode</value>
+  </data>
 </root>
diff --git a/NotEnoughAV1Encodes/resources/lang/Strings.ru-RU.resx b/NotEnoughAV1Encodes/resources/lang/Strings.ru-RU.resx
@@ -511,4 +511,7 @@ Please download and extract 7-zip to the following path:
   <data name="SortByOutNameDesc" xml:space="preserve">
     <value>Сортировать по названию (по убыванию)</value>
   </data>
+  <data name="ToggleSwitchBatchSubFolders" xml:space="preserve">
+    <value>Включение вложенных папок в пакетном режиме</value>
+  </data>
 </root>
diff --git a/NotEnoughAV1Encodes/resources/lang/Strings.zh-CN.resx b/NotEnoughAV1Encodes/resources/lang/Strings.zh-CN.resx
@@ -560,4 +560,7 @@
   <data name="SortByOutNameDesc" xml:space="preserve">
     <value>按名称排序（降）。</value>
   </data>
+  <data name="ToggleSwitchBatchSubFolders" xml:space="preserve">
+    <value>在批处理模式中包括子文件夹</value>
+  </data>
 </root>