Ignore image in __MACOSX & .DS_Store folders inside archive.

maforget · Apr 19, 2024 · 93017d4 · frcooper · Apr 19, 2024 · maforget
1 parent 77f7431
commit 93017d4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/ComicRack.Engine/IO/Provider/Readers/ComicProvider.cs b/ComicRack.Engine/IO/Provider/Readers/ComicProvider.cs
@@ -87,9 +87,18 @@ protected virtual bool OnStoreInfo(ComicInfo comicInfo)
 		}
 
 		protected virtual bool IsSupportedImage(string file)
-		{
-			string fileExt = Path.GetExtension(FileUtility.MakeValidFilename(file));
-			return supportedTypes.Any((string ext) => string.Equals(fileExt, "." + ext, StringComparison.OrdinalIgnoreCase));
-		}
-	}
+        {
+            if(ShouldIgnoreFile(file)) 
+				return false;
+
+            string fileExt = Path.GetExtension(FileUtility.MakeValidFilename(file));
+            return supportedTypes.Any((string ext) => string.Equals(fileExt, "." + ext, StringComparison.OrdinalIgnoreCase));
+        }
+
+        private static bool ShouldIgnoreFile(string file)
+        {
+            string[] ignore = { ".DS_Store\\", "__MACOSX\\" };
+            return ignore.Any(item => file.Contains(item));
+        }
+    }
 }
diff --git a/ComicRack/Changes.txt b/ComicRack/Changes.txt
@@ -14,6 +14,7 @@ Community Edition Build 0.9.180:
 * NEW: Quick Search (using Mode All) will now search Scan Information & Custom Fields.
 * NEW: Added the Web field to smart list, so no more need to use expressions. (Again backup your DB, this could result in a corrupted database if going back to an older version)
 * NEW: Added an "Is Missing" smart list entry. (Again backup your DB, this could result in a corrupted database if going back to an older version)
+* NEW: "__MACOSX" & ".DS_Store" folders will be ignored inside archives.
 
 * CHANGE: Updated to .NET Framework v4.8.
 * CHANGE: Updated the Splash Screen and Renamed the Program to Community Edition, this means that a new config folder will be used %appdata%\cYo\ComicRack Community Edition.