FreshRSS/NetNewsWire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/Ranchero-Software/NetNewsWire

Browse Source
This commit is contained in:
Maurice Parker 2021-09-22 11:34:18 -05:00
commit c5388b8d0d
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Shared/ArticleStyles/ArticleThemeDownloader.swift
View File

@ -58,7 +58,7 @@ public class ArticleThemeDownloader {
let unzipDirectory = URL(fileURLWithPath: location.path.replacingOccurrences(of: ".zip", with: "")) let unzipDirectory = URL(fileURLWithPath: location.path.replacingOccurrences(of: ".zip", with: ""))
try Zip.unzipFile(location, destination: unzipDirectory, overwrite: true, password: nil, progress: nil, fileOutputHandler: nil) // Unzips to folder in Application Support/NetNewsWire/Downloads try Zip.unzipFile(location, destination: unzipDirectory, overwrite: true, password: nil, progress: nil, fileOutputHandler: nil) // Unzips to folder in Application Support/NetNewsWire/Downloads
try FileManager.default.removeItem(at: location) // Delete zip in Cache try FileManager.default.removeItem(at: location) // Delete zip in Cache
let themeFilePath = FileManager.default.filenames(inFolder: unzipDirectory.path)?.first(where: { $0.contains(".nnwtheme") }) let themeFilePath = findThemeFile(in: unzipDirectory.path)
if themeFilePath == nil { if themeFilePath == nil {
throw ArticleThemeDownloaderError.noThemeFile throw ArticleThemeDownloaderError.noThemeFile
} }
@ -69,6 +69,22 @@ public class ArticleThemeDownloader {
} }
} }
/// Performs a deep search of the unzipped direcotry to find the theme file.
/// - Parameter searchPath: directory to search
/// - Returns: optional `String`
private func findThemeFile(in searchPath: String) -> String? {
if let directoryContents = FileManager.default.enumerator(atPath: searchPath) {
while let file = directoryContents.nextObject() as? String {
if file.hasSuffix(".nnwtheme") {
return file
}
}
}
return nil
}
/// The download directory used by the theme downloader: `Application Suppport/NetNewsWire/Downloads` /// The download directory used by the theme downloader: `Application Suppport/NetNewsWire/Downloads`
/// - Returns: `URL` /// - Returns: `URL`
private func downloadDirectory() -> URL { private func downloadDirectory() -> URL {