Add UI for subfolder template and allow absolute paths

eltos · eltos · commit 174bca700c2d · 2024-10-25T23:47:40.000+02:00
closes #56
diff --git a/PasteIntoFile/Dialog.Designer.cs b/PasteIntoFile/Dialog.Designer.cs
diff --git a/PasteIntoFile/Dialog.cs b/PasteIntoFile/Dialog.cs
@@ -97,7 +97,10 @@ public Dialog(
 
             updateFilename(filename);
 
-            if (saveIntoSubdir) location += @"\" + formatFilenameTemplate(Settings.Default.subdirTemplate);
+            if (saveIntoSubdir) {
+                var subdir = formatFilenameTemplate(Settings.Default.subdirTemplate);
+                location = Path.IsPathRooted(subdir) ? subdir : Path.Combine(location, subdir);
+            }
             txtCurrentLocation.Text = location;
 
             chkAppend.Checked = append;  // non-persistent setting
@@ -571,12 +574,18 @@ private void comExt_Update(object sender, EventArgs e) {
         }
 
         private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) {
-            var dialog = new TemplateEdit();
+            var dialog = new TemplateEdit(Template.FILENAME);
             dialog.TopMost = TopMost; // https://github.com/dotnet/winforms/issues/6190
             dialog.FormClosed += DialogOnFormClosed;
             dialog.ShowDialog(this);
         }
 
+        private void editSubfolder_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) {
+            var dialog = new TemplateEdit(Template.SUBFOLDER);
+            dialog.TopMost = TopMost; // https://github.com/dotnet/winforms/issues/6190
+            dialog.ShowDialog(this);
+        }
+
         private void DialogOnFormClosed(object sender, FormClosedEventArgs e) {
             updateFilename();
         }
diff --git a/PasteIntoFile/Properties/Resources.Designer.cs b/PasteIntoFile/Properties/Resources.Designer.cs
diff --git a/PasteIntoFile/Properties/Resources.de.resx b/PasteIntoFile/Properties/Resources.de.resx
@@ -171,7 +171,7 @@ Tooltip</comment>
     <value>Abbrechen</value>
   </data>
   <data name="str_template_edit_info" xml:space="preserve">
-    <value>Die Vorlage wird zum Formatieren des Standarddateinamens verwendet. Folgende Variablen stehen zur Verfügung:
+      <value>Folgende Variablen stehen zur Verfügung:
   	{0}  	Datum und Zeit
   	{1}  	Zahl gespeicherter Dateien (Stapelverarbeitung)
   	{2}  	Text in der Zwischenablage
@@ -300,4 +300,13 @@ Allows to keep application window always on top (in foreground of other windows)
   <data name="str_append" xml:space="preserve">
     <value>Anfügen</value>
   </data>
+  <data name="str_template_edit_filename_info" xml:space="preserve">
+      <value>Die Dateinamen-Vorlage wird zum Formatieren des Standarddateinamens verwendet.</value>
+  </data>
+  <data name="str_subfolder_template" xml:space="preserve">
+      <value>Unterordner-Vorlage</value>
+  </data>
+  <data name="str_template_edit_subfolder_info" xml:space="preserve">
+      <value>Die Unterordner-Vorlage wird bei gedrückter STRG Taste an den Zielordner angefügt. Absolute Pfade sind auch möglich und ersetzten den Zielordner.</value>
+  </data>
 </root>
diff --git a/PasteIntoFile/Properties/Resources.it.resx b/PasteIntoFile/Properties/Resources.it.resx
@@ -172,7 +172,7 @@ Vuoi sovrascriverlo?</value>
     <value>Annulla</value>
   </data>
   <data name="str_template_edit_info" xml:space="preserve">
-    <value>Il modello viene utilizzato per formattare il nome del file. Sono supportate le seguenti variabili:
+      <value>Sono supportate le seguenti variabili:
   	{0}  	Data e ora
   	{1}  	Salva conteggio in modalità batch
   	{2}  	Testo appunti
@@ -301,4 +301,7 @@ Allows to keep application window always on top (in foreground of other windows)
   <data name="str_append" xml:space="preserve">
     <value>Aggiungi</value>
   </data>
+  <data name="str_template_edit_filename_info" xml:space="preserve">
+      <value>Il modello viene utilizzato per formattare il nome del file.</value>
+  </data>
 </root>
diff --git a/PasteIntoFile/Properties/Resources.ko.resx b/PasteIntoFile/Properties/Resources.ko.resx
@@ -171,7 +171,7 @@ Tooltip</comment>
     <value>취소</value>
   </data>
   <data name="str_template_edit_info" xml:space="preserve">
-    <value>템플릿을 설정하여 파일명 지정 규칙을 세울 수 있습니다.  지원되는 변수는 다음과 같습니다:
+      <value>지원되는 변수는 다음과 같습니다:
   	{0}  	날짜 및 시간
   	{1}  	저장 횟수 (배치 모드)
   	{2}  	Clipboard text
@@ -299,4 +299,7 @@ Allows to keep application window always on top (in foreground of other windows)
   <data name="str_append" xml:space="preserve">
     <value>덧붙이기</value>
   </data>
+  <data name="str_template_edit_filename_info" xml:space="preserve">
+      <value>템플릿을 설정하여 파일명 지정 규칙을 세울 수 있습니다.</value>
+  </data>
 </root>
diff --git a/PasteIntoFile/Properties/Resources.pt-BR.resx b/PasteIntoFile/Properties/Resources.pt-BR.resx
@@ -172,7 +172,7 @@ Você quer substituí-lo?</value>
     <value>Cancelar</value>
   </data>
   <data name="str_template_edit_info" xml:space="preserve">
-    <value>O modelo é usado para formatar o nome do arquivo. Os variáveis a seguir são suportados:
+      <value>Os variáveis a seguir são suportados:
   	{0}  	Data e hora
   	{1}  	Salvar contagem em modo lote
   	{2}  	Texto da área de transferência
@@ -301,4 +301,7 @@ Allows to keep application window always on top (in foreground of other windows)
   <data name="str_append" xml:space="preserve">
     <value>Acrescentar</value>
   </data>
+  <data name="str_template_edit_filename_info" xml:space="preserve">
+      <value>O modelo é usado para formatar o nome do arquivo.</value>
+  </data>
 </root>
diff --git a/PasteIntoFile/Properties/Resources.pt-PT.resx b/PasteIntoFile/Properties/Resources.pt-PT.resx
@@ -172,7 +172,7 @@ Quer lo sobrescrever?</value>
     <value>Cancelar</value>
   </data>
   <data name="str_template_edit_info" xml:space="preserve">
-    <value>O modelo é usado para formatar o nome do ficheiro. Os seguintes variáveis são suportados:
+      <value>Os seguintes variáveis são suportados:
   	{0}  	Data e hora
   	{1}  	Guardar contagem no modo batch
   	{2}  	Texto de área de transferência
@@ -301,4 +301,7 @@ Allows to keep application window always on top (in foreground of other windows)
   <data name="str_append" xml:space="preserve">
     <value>Acrescentar</value>
   </data>
+  <data name="str_template_edit_filename_info" xml:space="preserve">
+      <value>O modelo é usado para formatar o nome do ficheiro.</value>
+  </data>
 </root>
diff --git a/PasteIntoFile/Properties/Resources.resx b/PasteIntoFile/Properties/Resources.resx
@@ -180,7 +180,7 @@ Do you want to overwrite it?</value>
     <value>Cancel</value>
   </data>
   <data name="str_template_edit_info" xml:space="preserve">
-    <value>The template is used to format the filename. The following variables are supported:
+      <value>The following variables are supported:
   	{0}  	Date and time
   	{1}  	Save count in batch mode
   	{2}  	Clipboard text
@@ -312,4 +312,13 @@ Allows to keep application window always on top (in foreground of other windows)
   <data name="str_append" xml:space="preserve">
     <value>Append</value>
   </data>
+  <data name="str_template_edit_subfolder_info" xml:space="preserve">
+      <value>The subfolder template is appended to the folder path when executing Paste Into File with pressed CTRL key. Absolute paths are also supported and will replace the folder.</value>
+  </data>
+  <data name="str_template_edit_filename_info" xml:space="preserve">
+      <value>The filename template is used to format the filename. </value>
+  </data>
+  <data name="str_subfolder_template" xml:space="preserve">
+      <value>Subfolder template</value>
+  </data>
 </root>
diff --git a/PasteIntoFile/Properties/Resources.uk-UA.resx b/PasteIntoFile/Properties/Resources.uk-UA.resx
@@ -138,7 +138,7 @@ Tooltip</comment>
     <value>Закрити</value>
   </data>
   <data name="str_template_edit_info" xml:space="preserve">
-    <value>Шаблон використовується для форматування імені файлу. Підтримуються наступні змінні:
+      <value>Підтримуються наступні змінні:
   	{0}  	дата і час
   	{1}  	Збереження кількості у пакетному режимі
   	{2}  	Clipboard text
@@ -204,4 +204,7 @@ Allows to keep application window always on top (in foreground of other windows)
   <data name="str_append_to_file" xml:space="preserve">
     <value>Додати до файлу</value>
   </data>
+  <data name="str_template_edit_filename_info" xml:space="preserve">
+      <value>Шаблон використовується для форматування імені файлу.</value>
+  </data>
 </root>
diff --git a/PasteIntoFile/TemplateEdit.cs b/PasteIntoFile/TemplateEdit.cs
@@ -7,13 +7,36 @@
 using PasteIntoFile.Properties;
 
 namespace PasteIntoFile {
+
+    public enum Template {
+        FILENAME,
+        SUBFOLDER,
+    }
+
     public sealed partial class TemplateEdit : MasterForm {
+        public readonly Template template;
 
-        public TemplateEdit() {
+        public TemplateEdit(Template template) {
+            this.template = template;
             InitializeComponent();
 
+
             Icon = Resources.app_icon;
-            Text = Resources.str_edit_template;
+            var preset = "";
+            switch (this.template) {
+                case Template.FILENAME:
+                    Text = Resources.str_edit_template;
+                    labelInfo.Text = Resources.str_template_edit_filename_info + @" " + Resources.str_template_edit_info;
+                    labelTemplate.Text = Resources.str_filename_template;
+                    preset = Settings.Default.filenameTemplate;
+                    break;
+                case Template.SUBFOLDER:
+                    Text = Resources.str_subfolder_template;
+                    labelInfo.Text = Resources.str_template_edit_subfolder_info + @" " + Resources.str_template_edit_info;
+                    labelTemplate.Text = Resources.str_subfolder_template;
+                    preset = Settings.Default.subdirTemplate;
+                    break;
+            }
 
             // setup link in info text
             var linkStart = labelInfo.Text.IndexOf(@"<a>", StringComparison.Ordinal);
@@ -25,15 +48,15 @@ public TemplateEdit() {
 
             // setup predefined templates
             textTemplate.Items.AddRange(new object[]{
-                Settings.Default.filenameTemplate,
+                preset,
                 "{0:yyyy-MM-dd HH-mm-ss}",
                 "{0:yyyyMMdd_HHmmss}",
                 "{0:yyyy-jjj}_{1:000}",
                 "PasteIntoFile_{1:000}_{0:fffffff}",
                 "{0:yyyy-ww}/{0:ddd HHᵸmm´ss´´}",
                 "{2:10}",
             });
-            textTemplate.Text = Settings.Default.filenameTemplate;
+            textTemplate.Text = preset;
 
             // Dark theme
             if (RegistryUtil.IsDarkMode()) {
@@ -44,7 +67,14 @@ public TemplateEdit() {
 
 
         private void buttonAccept_Click(object sender, EventArgs e) {
-            Settings.Default.filenameTemplate = textTemplate.Text;
+            switch (template) {
+                case Template.FILENAME:
+                    Settings.Default.filenameTemplate = textTemplate.Text;
+                    break;
+                case Template.SUBFOLDER:
+                    Settings.Default.subdirTemplate = textTemplate.Text;
+                    break;
+            }
             Settings.Default.Save();
             Close();
         }
@@ -59,7 +89,16 @@ private void textTemplate_Update(object sender = null, EventArgs e = null) {
                 labelPreview.ForeColor = TextColor;
                 buttonAccept.Enabled = true;
 
-                var i = labelPreview.Text?.IndexOfAny(Path.GetInvalidFileNameChars().Except(new[] { '\\', '/' }).ToArray());
+                var invalidChars = Array.Empty<char>();
+                switch (template) {
+                    case Template.FILENAME:
+                        invalidChars = Path.GetInvalidFileNameChars().Except(new[] { '\\', '/' }).ToArray();
+                        break;
+                    case Template.SUBFOLDER:
+                        invalidChars = Path.GetInvalidFileNameChars().Except(new[] { '\\', '/', ':' }).ToArray();
+                        break;
+                }
+                var i = labelPreview.Text?.IndexOfAny(invalidChars);
                 if (i is int j && j >= 0)
                     throw new FormatException(string.Format(Resources.str_invalid_character, labelPreview.Text[j]));
             } catch (FormatException ex) {
