renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Drop local properties and folder calculations for image downloaders.

Browse Source
This commit is contained in:
Brent Simmons
2024-06-26 23:15:13 -07:00
parent ed5a11b4c0
commit 83edb628ae
1 changed files with 6 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Mac/AppDelegate.swift
View File

@@ -28,7 +28,7 @@ protocol SPUUpdaterDelegate {}
import Sparkle
#endif
@MainActor var appDelegate: AppDelegate!
//@MainActor var appDelegate: AppDelegate!
@NSApplicationMain
@MainActor final class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations, UNUserNotificationCenterDelegate, UnreadCountProvider, SPUStandardUserDriverDelegate, SPUUpdaterDelegate {
@@ -38,10 +38,6 @@ import Sparkle
}
var userNotificationManager: UserNotificationManager!
var faviconDownloader: FaviconDownloader!
var imageDownloader: ImageDownloader!
var authorAvatarDownloader: AuthorAvatarDownloader!
var feedIconDownloader: FeedIconDownloader!
var extensionContainersFile: ExtensionContainersFile!
var extensionFeedAddRequestFile: ExtensionFeedAddRequestFile!
@@ -74,7 +70,7 @@ import Sparkle
didSet {
if unreadCount != oldValue {
queueUpdateDockBadge()
NotificationCenter.default.post(name: .appUnreadCountDidChange, object: self, userInfo: nil)
AppNotification.postAppUnreadCountDidChange(from: self, unreadCount: unreadCount)
postUnreadCountDidChangeNotification()
}
}
@@ -169,21 +165,8 @@ import Sparkle
cacheFolder = (NSTemporaryDirectory() as NSString).appendingPathComponent(bundleIdentifier)
}
let faviconsFolder = (cacheFolder as NSString).appendingPathComponent("Favicons")
let faviconsFolderURL = URL(fileURLWithPath: faviconsFolder)
try! FileManager.default.createDirectory(at: faviconsFolderURL, withIntermediateDirectories: true, attributes: nil)
faviconDownloader = FaviconDownloader(folder: faviconsFolder)
faviconDownloader.delegate = self
let imagesFolder = (cacheFolder as NSString).appendingPathComponent("Images")
let imagesFolderURL = URL(fileURLWithPath: imagesFolder)
try! FileManager.default.createDirectory(at: imagesFolderURL, withIntermediateDirectories: true, attributes: nil)
imageDownloader = ImageDownloader(folder: imagesFolder)
authorAvatarDownloader = AuthorAvatarDownloader(imageDownloader: imageDownloader)
feedIconDownloader = FeedIconDownloader(imageDownloader: imageDownloader, folder: cacheFolder)
feedIconDownloader.delegate = self
FaviconDownloader.shared.delegate = self
FeedIconDownloader.shared.delegate = self
appName = (Bundle.main.infoDictionary!["CFBundleExecutable"]! as! String)
}
@@ -381,7 +364,7 @@ import Sparkle
return
}
if key == Feed.FeedSettingKey.homePageURL || key == Feed.FeedSettingKey.faviconURL {
let _ = faviconDownloader.favicon(for: feed)
let _ = FaviconDownloader.shared.favicon(for: feed)
}
}
@@ -1000,7 +983,7 @@ extension AppDelegate: NSWindowRestoration {
var mainWindow: NSWindow? = nil
if identifier.rawValue == WindowRestorationIdentifiers.mainWindow {
mainWindow = appDelegate.createAndShowMainWindow().window
mainWindow = NSApp.delegate.createAndShowMainWindow().window
}
return mainWindow!
}