From c725be287403c8a779694b4e97045a1884fbae62 Mon Sep 17 00:00:00 2001 From: Stuart Breckenridge Date: Thu, 19 Jan 2023 11:34:25 +0800 Subject: [PATCH 1/2] Ignores files in __MACOSX folder --- Shared/ArticleStyles/ArticleThemeDownloader.swift | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Shared/ArticleStyles/ArticleThemeDownloader.swift b/Shared/ArticleStyles/ArticleThemeDownloader.swift index 703db2ef5..dbc6d9ca9 100644 --- a/Shared/ArticleStyles/ArticleThemeDownloader.swift +++ b/Shared/ArticleStyles/ArticleThemeDownloader.swift @@ -77,6 +77,10 @@ public class ArticleThemeDownloader: Logging { private func findThemeFile(in searchPath: String) -> String? { if let directoryContents = FileManager.default.enumerator(atPath: searchPath) { while let file = directoryContents.nextObject() as? String { + if file.localizedCaseInsensitiveContains("__MACOSX") { + logger.debug("Ignoring theme file in __MACOSX folder.") + continue + } if file.hasSuffix(".nnwtheme") { return file } From 2f6584ffb1dda6d2c14d1818d77d6a16a1aebfd3 Mon Sep 17 00:00:00 2001 From: Stuart Breckenridge Date: Thu, 19 Jan 2023 12:04:43 +0800 Subject: [PATCH 2/2] changes to checking for the prefix --- Shared/ArticleStyles/ArticleThemeDownloader.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Shared/ArticleStyles/ArticleThemeDownloader.swift b/Shared/ArticleStyles/ArticleThemeDownloader.swift index dbc6d9ca9..978fe0cae 100644 --- a/Shared/ArticleStyles/ArticleThemeDownloader.swift +++ b/Shared/ArticleStyles/ArticleThemeDownloader.swift @@ -77,7 +77,7 @@ public class ArticleThemeDownloader: Logging { private func findThemeFile(in searchPath: String) -> String? { if let directoryContents = FileManager.default.enumerator(atPath: searchPath) { while let file = directoryContents.nextObject() as? String { - if file.localizedCaseInsensitiveContains("__MACOSX") { + if file.hasPrefix("__MACOSX/") { logger.debug("Ignoring theme file in __MACOSX folder.") continue }