UpdateSputnik // Use shared instance; Fix wrong key name.

This commit is contained in:
ShikiSuen 2022-10-12 14:11:12 +08:00
parent 794cca4e98
commit 70f47407f9
4 changed files with 7 additions and 12 deletions

View File

@ -9,11 +9,12 @@
import Cocoa
public class UpdateSputnik {
public static var shared: UpdateSputnik = .init()
public var varkUpdateInfoPageURLKey: String = "UpdateInfoSite"
public var varkUpdateCheckDateKeyPrevious: String = "PreviousUpdateCheckDate"
public var varkUpdateCheckDateKeyNext: String = "NextUpdateCheckDate"
public var varkUpdateCheckInterval: TimeInterval = 114_514
public var varCheckUpdateAutomatically = "ChecvarkUpdateAutomatically"
public var varCheckUpdateAutomatically = "CheckUpdateAutomatically"
public init() {}

View File

@ -21,7 +21,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
}
}
public let updateSputnik = UpdateSputnik()
public var folderMonitor = FolderMonitor(
url: URL(fileURLWithPath: LMMgr.dataFolderPath(isDefaultFolder: false))
)
@ -56,16 +55,9 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDele
PrefMgr.shared.fixOddPreferences()
//
updateSputnik.varkUpdateInfoPageURLKey = "UpdateInfoSite"
updateSputnik.varkUpdateCheckDateKeyPrevious = "PreviousUpdateCheckDate"
updateSputnik.varkUpdateCheckDateKeyNext = "NextUpdateCheckDate"
updateSputnik.varkUpdateCheckInterval = 114_514
updateSputnik.varCheckUpdateAutomatically = "ChecvarkUpdateAutomatically"
// 使
if PrefMgr.shared.checkUpdateAutomatically {
updateSputnik.checkForUpdate(forced: false, url: kUpdateInfoSourceURL)
UpdateSputnik.shared.checkForUpdate(forced: false, url: kUpdateInfoSourceURL)
}
}

View File

@ -13,6 +13,7 @@ import PopupCompositionBuffer
import Shared
import ShiftKeyUpChecker
import TooltipUI
import UpdateSputnik
///
///
@ -202,7 +203,7 @@ extension SessionCtl {
}
DispatchQueue.main.async {
(NSApp.delegate as? AppDelegate)?.updateSputnik.checkForUpdate(forced: false, url: kUpdateInfoSourceURL)
UpdateSputnik.shared.checkForUpdate(forced: false, url: kUpdateInfoSourceURL)
}
handle(state: IMEState.ofEmpty())

View File

@ -8,6 +8,7 @@
import NotifierUI
import Preferences
import UpdateSputnik
extension Bool {
fileprivate var state: NSControl.StateValue {
@ -316,7 +317,7 @@ extension SessionCtl {
}
@objc public func checkForUpdate(_: Any?) {
(NSApp.delegate as? AppDelegate)?.updateSputnik.checkForUpdate(forced: true, url: kUpdateInfoSourceURL)
UpdateSputnik.shared.checkForUpdate(forced: true, url: kUpdateInfoSourceURL)
}
@objc public func openUserDataFolder(_: Any?) {