Merge pull request #195 from DineshSolanki/192-support-for-nested-sub…

…folder-such-as-moviesstarwars-collectionstar-wars-1 Feature - support for nested folders closes #192
DineshSolanki · Mar 21, 2024 · ab9545c · ab9545c
2 parents 8723c60 + 02fc842
commit ab9545c
Show file tree

Hide file tree

Showing 13 changed files with 217 additions and 109 deletions.
diff --git a/FoliCon/Models/Constants/GlobalVariables.cs b/FoliCon/Models/Constants/GlobalVariables.cs
@@ -5,8 +5,7 @@ namespace FoliCon.Models.Constants;
 
 internal static class GlobalVariables
 {
-    public static bool SkipAll;
-
+
     public static IconOverlay IconOverlayType()
     {
         return new PosterIconConfigViewModel().IconOverlay switch

diff --git a/FoliCon/Modules/utils/FileUtils.cs b/FoliCon/Modules/utils/FileUtils.cs
@@ -101,6 +101,10 @@ public static List<string> GetFolderNames(string folderPath)
         return folderNames;
     }
 
+    public static string[] GetAllSubFolders(string folderPath)
+    {
+        return Directory.GetDirectories(folderPath);
+    }
     /// <summary>
     /// Get List of file in given folder.
     /// </summary>

diff --git a/FoliCon/Modules/utils/IconUtils.cs b/FoliCon/Modules/utils/IconUtils.cs
@@ -32,9 +32,13 @@ public static int MakeIco(string iconMode, string selectedFolder, List<PickedLis
 
         foreach (var item in pickedListDataTable)
         {
+            var parent = Directory.GetParent(item.Folder);
+            var parentFolder = parent != null
+                ? parent.FullName
+                : selectedFolder;
             var folderName = item.FolderName;
-            var targetFile = $@"{selectedFolder}\{folderName}\{ImageName}.ico";
-            var pngFilePath = $@"{selectedFolder}\{folderName}\{ImageName}.png";
+            var targetFile = $@"{parentFolder}\{folderName}\{ImageName}.ico";
+            var pngFilePath = $@"{parentFolder}\{folderName}\{ImageName}.png";
             if (File.Exists(pngFilePath) && !File.Exists(targetFile))
             {
                 var rating = item.Rating;
@@ -51,7 +55,7 @@ public static int MakeIco(string iconMode, string selectedFolder, List<PickedLis
             }
             if (!File.Exists(targetFile)) continue;
             FileUtils.HideFile(targetFile);
-            FileUtils.SetFolderIcon($"{ImageName}.ico", $@"{selectedFolder}\{folderName}");
+            FileUtils.SetFolderIcon($"{ImageName}.ico", $@"{parentFolder}\{folderName}");
         }
 
         FileUtils.ApplyChanges(selectedFolder);

diff --git a/FoliCon/Properties/Langs/Lang.Designer.cs b/FoliCon/Properties/Langs/Lang.Designer.cs
diff --git a/FoliCon/Properties/Langs/Lang.ar.resx b/FoliCon/Properties/Langs/Lang.ar.resx
@@ -612,4 +612,7 @@
   <data name="WebView2DownloadConfirmationHeader" xml:space="preserve">
     <value>تثبيت بيئة تشغيل WebView2</value>
   </data>
+  <data name="SkipThisPlaceholderParent" xml:space="preserve">
+    <value>تخطي هذا وكل العناوين المتبقية لـ {0}</value>
+  </data>
 </root>
diff --git a/FoliCon/Properties/Langs/Lang.es.resx b/FoliCon/Properties/Langs/Lang.es.resx
@@ -612,4 +612,7 @@ Esto ayuda a folicon a identificar los medios sin tener que elegir entre título
   <data name="WebView2DownloadConfirmationHeader" xml:space="preserve">
     <value>Instalar Runtime de WebView2</value>
   </data>
+  <data name="SkipThisPlaceholderParent" xml:space="preserve">
+    <value>Omitir este y todos los títulos restantes de {0}</value>
+  </data>
 </root>
diff --git a/FoliCon/Properties/Langs/Lang.hi.resx b/FoliCon/Properties/Langs/Lang.hi.resx
@@ -612,4 +612,7 @@
   <data name="WebView2DownloadConfirmationHeader" xml:space="preserve">
     <value>WebView2 Runtime इंस्टॉल करें</value>
   </data>
+  <data name="SkipThisPlaceholderParent" xml:space="preserve">
+    <value>इसे और {0} के बाकी मीडिया को छोड़ दे</value>
+  </data>
 </root>
diff --git a/FoliCon/Properties/Langs/Lang.pt.resx b/FoliCon/Properties/Langs/Lang.pt.resx
@@ -611,4 +611,7 @@ e renovar o cache dos Ícones?</value>
   <data name="WebView2DownloadConfirmationHeader" xml:space="preserve">
     <value>Instalar Runtime do WebView2</value>
   </data>
+  <data name="SkipThisPlaceholderParent" xml:space="preserve">
+    <value>Ignorar este e todos os títulos restantes de {0}</value>
+  </data>
 </root>
diff --git a/FoliCon/Properties/Langs/Lang.resx b/FoliCon/Properties/Langs/Lang.resx
@@ -616,4 +616,7 @@ and refresh Icon Cache?</value>
     <data name="WebView2DownloadConfirmationHeader" xml:space="preserve">
       <value>Install WebView2 Runtime</value>
     </data>
+    <data name="SkipThisPlaceholderParent" xml:space="preserve">
+      <value>Skip this and all remaining titles of {0}</value>
+    </data>
 </root>
diff --git a/FoliCon/Properties/Langs/Lang.ru.resx b/FoliCon/Properties/Langs/Lang.ru.resx
@@ -615,4 +615,7 @@
   <data name="WebView2DownloadConfirmationHeader" xml:space="preserve">
     <value>Установить исполняющую среду WebView2</value>
   </data>
+  <data name="SkipThisPlaceholderParent" xml:space="preserve">
+    <value>Пропустить этот и все оставшиеся заголовки {0}</value>
+  </data>
 </root>