morgan/macos-stats
1
0
Fork 0
mirror of https://github.com/morgan9e/macos-stats synced 2026-04-15 00:34:08 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix: prevent update loop by the TS when was the last check and the last installation (#957)

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2022-06-06 20:52:16 +02:00
parent 6890ccc7d4
commit 5b79e8df30
1 changed files with 37 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
Kit/plugins/Updater.swift
View File

@@ -41,9 +41,25 @@ public class Updater {
private let appName: String = Bundle.main.object(forInfoDictionaryKey: "CFBundleName") as! String
private let currentVersion: String = "v\(Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as! String)"
private var teamID: String? = nil
private var observation: NSKeyValueObservation?
private var lastCheckTS: Int {
get {
return Store.shared.int(key: "updater_check_ts", defaultValue: -1)
}
set {
Store.shared.set(key: "updater_check_ts", value: newValue)
}
}
private var lastInstallTS: Int {
get {
return Store.shared.int(key: "updater_install_ts", defaultValue: -1)
}
set {
Store.shared.set(key: "updater_install_ts", value: newValue)
}
}
public init(github: String, url: String) {
self.github = URL(string: "https://api.github.com/repos/\(github)/releases/latest")!
self.server = URL(string: url)!
@@ -54,11 +70,21 @@ public class Updater {
}
public func check(completion: @escaping (_ result: version_s?, _ error: Error?) -> Void) {
let diff = (Int(Date().timeIntervalSince1970) - self.lastCheckTS) / 60
if diff <= 10 {
completion(nil, "last check was \(diff) minutes ago, stopping...")
return
}
if !isConnectedToNetwork() {
completion(nil, "No internet connection")
return
}
defer {
self.lastCheckTS = Int(Date().timeIntervalSince1970)
}
self.fetchRelease(uri: self.server) { (result, err) in
guard let result = result, err == nil else {
self.fetchRelease(uri: self.github) { (result, err) in
@@ -140,6 +166,16 @@ public class Updater {
}
public func install(path: String) {
let diff = (Int(Date().timeIntervalSince1970) - self.lastInstallTS) / 60
if diff <= 3 {
print("last install was \(diff) minutes ago, stopping...")
return
}
defer {
self.lastInstallTS = Int(Date().timeIntervalSince1970)
}
print("Started new version installation...")
_ = syncShell("mkdir /tmp/Stats") // make sure that directory exist
@@ -170,21 +206,6 @@ public class Updater {
exit(0)
}
public func isSignatureOK(path: String) -> Bool {
let line = syncShell("codesign -dv \(path) 2>&1 | grep TeamIdentifier")
let arr = line.split(separator: "=")
guard arr.count == 2 else {
return true
}
let teamID = arr[1]
guard let externalTeamID = self.teamID else {
return true
}
return externalTeamID == teamID
}
private func copyFile(from: URL, to: URL, completionHandler: @escaping (_ path: String, _ error: Error?) -> Void) {
var toPath = to
let fileName = (URL(fileURLWithPath: to.absoluteString)).lastPathComponent