Merge pull request #191 from DineshSolanki/fix-icon-name-for-unicode-…

…characters Use "folicon.ico" instead of folder name for icons
DineshSolanki · Feb 14, 2024 · 1920e54 · 1920e54
2 parents 2961930 + 2ca1d64
commit 1920e54
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/FoliCon/Modules/IGDB/IgdbDataTransformer.cs b/FoliCon/Modules/IGDB/IgdbDataTransformer.cs
@@ -45,7 +45,7 @@ public void ResultPicked(Game game, string fullFolderPath, string rating = "")
     {
         ValidateGamePoster(game);
         var folderName = Path.GetFileName(fullFolderPath);
-        var localPosterPath = $@"{fullFolderPath}\{folderName}.png";
+        var localPosterPath = $@"{fullFolderPath}\{IconUtils.GetImageName()}.png";
         HandleGamePosterPath(game, fullFolderPath, localPosterPath, rating, folderName);
     }
 

diff --git a/FoliCon/Modules/TMDB/TmdbDataTransformer.cs b/FoliCon/Modules/TMDB/TmdbDataTransformer.cs
@@ -203,7 +203,7 @@ public void ResultPicked(dynamic result, string resultType, string fullFolderPat
         }
 
         var folderName = Path.GetFileName(fullFolderPath);
-        var localPosterPath = fullFolderPath + @"\" + folderName + ".png";
+        var localPosterPath = $@"{fullFolderPath}\{IconUtils.GetImageName()}.png";
 
         string posterUrl = string.Concat(PosterBase, result.PosterPath.Replace("http://image.tmdb.org/t/p/w500",""));
 

diff --git a/FoliCon/Modules/utils/FileUtils.cs b/FoliCon/Modules/utils/FileUtils.cs
@@ -49,8 +49,8 @@ public static void DeleteIconsFromSubfolders(string folderPath)
     public static void DeleteIconsFromFolder(string folderPath)
     {
         Logger.Debug("Deleting Icons from: {FolderPath}", folderPath);
-        var folderName = Path.GetFileName(folderPath);
-        var icoFile = Path.Combine(folderPath, $"{folderName}.ico");
+
+        var icoFile = Path.Combine(folderPath, $"{IconUtils.GetImageName()}.ico");
         var iniFile = Path.Combine(folderPath, "desktop.ini");
         try
         {
@@ -94,7 +94,7 @@ public static List<string> GetFolderNames(string folderPath)
         if (!string.IsNullOrEmpty(folderPath))
         {
             folderNames.AddRange(from folder in Directory.GetDirectories(folderPath)
-                where !File.Exists(folder + @"\" + Path.GetFileName(folder) + ".ico")
+                where !File.Exists($@"{folder}\{IconUtils.GetImageName()}.ico")
                 select Path.GetFileName(folder));
         }
 

diff --git a/FoliCon/Modules/utils/IconUtils.cs b/FoliCon/Modules/utils/IconUtils.cs
@@ -10,7 +10,12 @@ namespace FoliCon.Modules.utils;
 public static class IconUtils
 {
     private static readonly NLog.Logger Logger = LogManager.GetCurrentClassLogger();
-
+    private const string ImageName = "folicon";
+
+    public static string GetImageName()
+    {
+        return ImageName;
+    }
     /// <summary>
     /// Creates Icons from PNG
     /// </summary>
@@ -28,8 +33,8 @@ public static int MakeIco(string iconMode, string selectedFolder, List<PickedLis
         foreach (var item in pickedListDataTable)
         {
             var folderName = item.FolderName;
-            var targetFile = $@"{selectedFolder}\{folderName}\{folderName}.ico";
-            var pngFilePath = $@"{selectedFolder}\{folderName}\{folderName}.png";
+            var targetFile = $@"{selectedFolder}\{folderName}\{ImageName}.ico";
+            var pngFilePath = $@"{selectedFolder}\{folderName}\{ImageName}.png";
             if (File.Exists(pngFilePath) && !File.Exists(targetFile))
             {
                 var rating = item.Rating;
@@ -46,7 +51,7 @@ public static int MakeIco(string iconMode, string selectedFolder, List<PickedLis
             }
             if (!File.Exists(targetFile)) continue;
             FileUtils.HideFile(targetFile);
-            FileUtils.SetFolderIcon($"{folderName}.ico", $@"{selectedFolder}\{folderName}");
+            FileUtils.SetFolderIcon($"{ImageName}.ico", $@"{selectedFolder}\{folderName}");
         }
 
         FileUtils.ApplyChanges(selectedFolder);

diff --git a/FoliCon/ViewModels/ProSearchResultViewModel.cs b/FoliCon/ViewModels/ProSearchResultViewModel.cs
@@ -167,7 +167,7 @@ private void PickMethod(object parameter)
         var currentPath = $@"{_folderPath}\{Fnames[_i]}";
         var tempImage = new ImageToDownload
         {
-            LocalPath = $"{currentPath}\\{Fnames[_i]}.png",
+            LocalPath = $"{currentPath}\\{IconUtils.GetImageName()}.png",
             RemotePath = new Uri(link)
         };
         Logger.Debug("Adding Image to Download List {@Image}", tempImage);