Add Option to mirror folder structure in batch mode

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

Hide file tree

Showing 11 changed files with 48 additions and 2 deletions.
diff --git a/NotEnoughAV1Encodes/MainWindow.xaml.cs b/NotEnoughAV1Encodes/MainWindow.xaml.cs
@@ -237,11 +237,13 @@ private void ButtonOpenSource_Click(object sender, RoutedEventArgs e)
                     if (batchFolderDialog.Quit)
                     {
                         List<string> files =  batchFolderDialog.Files;
+                        string inputPath = batchFolderDialog.Input;
                         string preset = batchFolderDialog.Preset;
                         string output = batchFolderDialog.Output;
                         int container = batchFolderDialog.Container;
                         bool presetBitdepth = batchFolderDialog.PresetBitdepth;
                         bool activatesubtitles = batchFolderDialog.ActivateSubtitles;
+                        bool mirrorFolderStructure = batchFolderDialog.MirrorFolderStructure;
 
                         string outputContainer = "";
                         if (container == 0) outputContainer = ".mkv";
@@ -273,7 +275,14 @@ private void ButtonOpenSource_Click(object sender, RoutedEventArgs e)
                                 string outname = PresetSettings.PresetBatchName;
                                 outname = outname.Replace("{filename}", Path.GetFileNameWithoutExtension(file));
                                 outname = outname.Replace("{presetname}", preset);
+
                                 videoDB.OutputPath = Path.Combine(output, outname + outputContainer);
+                                if (mirrorFolderStructure)
+                                {
+                                    string relativePath = Path.GetRelativePath(inputPath, Path.GetDirectoryName(file));
+                                    videoDB.OutputPath = Path.Combine(output, relativePath, outname + outputContainer);
+                                }
+
                                 videoDB.OutputFileName = Path.GetFileName(videoDB.OutputPath);
                                 videoDB.ParseMediaInfo(PresetSettings);
 

diff --git a/NotEnoughAV1Encodes/Views/BatchFolderDialog.xaml b/NotEnoughAV1Encodes/Views/BatchFolderDialog.xaml
@@ -10,7 +10,7 @@
         lex:LocalizeDictionary.DesignCulture="en"
         lex:ResxLocalizationProvider.DefaultAssembly="NotEnoughAV1Encodes"
         lex:ResxLocalizationProvider.DefaultDictionary="Strings"
-        Title="NEAV1E" Height="500" Width="800" ResizeMode="NoResize">
+        Title="NEAV1E" Height="550" Width="800" ResizeMode="NoResize">
     <Grid>
         <GroupBox Header="{lex:Loc LabelSource}" Margin="10,10,10,0" mah:ControlsHelper.ContentCharacterCasing="Normal" Height="236" VerticalAlignment="Top">
             <Grid>
@@ -67,5 +67,6 @@
         </GroupBox>
         <mah:ToggleSwitch x:Name="ToggleSwitchUsePresetBitDepth" Height="62" Header="{lex:Loc}" Margin="10,411,0,0" Width="241" VerticalAlignment="Top"/>
         <mah:ToggleSwitch x:Name="ToggleSwitchActivateSubtitles" Height="62" Header="{lex:Loc}" Margin="254,409,0,0" Width="241" VerticalAlignment="Top" IsOn="True"/>
+        <mah:ToggleSwitch x:Name="ToggleSwitchMirrorFolderStructure" Height="62" Header="{lex:Loc}" Margin="10,466,0,0" Width="241" VerticalAlignment="Top"/>
     </Grid>
 </mah:MetroWindow>
diff --git a/NotEnoughAV1Encodes/Views/BatchFolderDialog.xaml.cs b/NotEnoughAV1Encodes/Views/BatchFolderDialog.xaml.cs
@@ -1,4 +1,5 @@
-using ControlzEx.Theming;
+using ControlzEx.Standard;
+using ControlzEx.Theming;
 using MahApps.Metro.Controls;
 using System.Collections.Generic;
 using System.IO;
@@ -12,6 +13,8 @@ public partial class BatchFolderDialog : MetroWindow
         public bool Quit { get; set; }
         public bool PresetBitdepth { get; set; }
         public bool ActivateSubtitles { get; set; } = true;
+        public bool MirrorFolderStructure { get; set; }
+        public string Input { get; set; }
         public string Preset { get; set; }
         public string Output { get; set; }
         public int Container { get; set; }
@@ -25,6 +28,8 @@ public BatchFolderDialog(string theme, string folderPath, bool subfolders)
             InitializeComponent();
             try { ThemeManager.Current.ChangeTheme(this, theme); } catch { }
 
+            Input = folderPath;
+
             SearchOption searchOption = SearchOption.TopDirectoryOnly;
             if (subfolders)
             {
@@ -111,6 +116,7 @@ private void ButtonAddToQueue_Click(object sender, RoutedEventArgs e)
                 Output = TextBoxDestination.Text;
                 PresetBitdepth = ToggleSwitchUsePresetBitDepth.IsOn;
                 ActivateSubtitles = ToggleSwitchActivateSubtitles.IsOn;
+                MirrorFolderStructure = ToggleSwitchMirrorFolderStructure.IsOn;
                 Quit = true;
                 Close();
             }

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
@@ -566,4 +566,7 @@ Please download and extract 7-zip to the following path:
   <data name="ToggleSwitchBatchSubFolders" xml:space="preserve">
     <value>Unterordner im Batch einbeziehen</value>
   </data>
+  <data name="ToggleSwitchMirrorFolderStructure" xml:space="preserve">
+    <value>Ordnerstruktur spiegeln</value>
+  </data>
 </root>
diff --git a/NotEnoughAV1Encodes/resources/lang/Strings.fr-FR.resx b/NotEnoughAV1Encodes/resources/lang/Strings.fr-FR.resx
@@ -566,4 +566,7 @@ Please download and extract 7-zip to the following path:
   <data name="ToggleSwitchBatchSubFolders" xml:space="preserve">
     <value>Inclure les sous-dossiers en batch</value>
   </data>
+  <data name="ToggleSwitchMirrorFolderStructure" xml:space="preserve">
+    <value>Copier la structure des dossiers</value>
+  </data>
 </root>
diff --git a/NotEnoughAV1Encodes/resources/lang/Strings.it-IT.resx b/NotEnoughAV1Encodes/resources/lang/Strings.it-IT.resx
@@ -521,4 +521,7 @@ Please download and extract 7-zip to the following path:
   <data name="ToggleSwitchBatchSubFolders" xml:space="preserve">
     <value>Includere le sottocartelle in Batch</value>
   </data>
+  <data name="ToggleSwitchMirrorFolderStructure" xml:space="preserve">
+    <value>Copiare la struttura delle cartelle</value>
+  </data>
 </root>
diff --git a/NotEnoughAV1Encodes/resources/lang/Strings.ja-JP.resx b/NotEnoughAV1Encodes/resources/lang/Strings.ja-JP.resx
@@ -530,4 +530,7 @@ Please download and extract 7-zip to the following path:
   <data name="ToggleSwitchBatchSubFolders" xml:space="preserve">
     <value>サブフォルダを一括で取り込む</value>
   </data>
+  <data name="ToggleSwitchMirrorFolderStructure" xml:space="preserve">
+    <value>コピーフォルダ構造</value>
+  </data>
 </root>
diff --git a/NotEnoughAV1Encodes/resources/lang/Strings.resx b/NotEnoughAV1Encodes/resources/lang/Strings.resx
@@ -572,4 +572,7 @@ Please download and extract 7-zip to the following path:
   <data name="ToggleSwitchBatchSubFolders" xml:space="preserve">
     <value>Include Subfolders in Batch Mode</value>
   </data>
+  <data name="ToggleSwitchMirrorFolderStructure" xml:space="preserve">
+    <value>Mirror Folder Structure</value>
+  </data>
 </root>
diff --git a/NotEnoughAV1Encodes/resources/lang/Strings.ru-RU.resx b/NotEnoughAV1Encodes/resources/lang/Strings.ru-RU.resx
@@ -514,4 +514,7 @@ Please download and extract 7-zip to the following path:
   <data name="ToggleSwitchBatchSubFolders" xml:space="preserve">
     <value>Включение вложенных папок в пакетном режиме</value>
   </data>
+  <data name="ToggleSwitchMirrorFolderStructure" 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
@@ -563,4 +563,7 @@
   <data name="ToggleSwitchBatchSubFolders" xml:space="preserve">
     <value>在批处理模式中包括子文件夹</value>
   </data>
+  <data name="ToggleSwitchMirrorFolderStructure" xml:space="preserve">
+    <value>复制文件夹结构</value>
+  </data>
 </root>