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

feat: moved to the custom Repeater plugin

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2022-06-30 20:39:03 +02:00
parent 3e2e13e051
commit ea71cb6abc
5 changed files with 83 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Kit/module/reader.swift
View File

@@ -10,7 +10,6 @@
//
import Cocoa
import Repeat
public protocol value_t {
var widgetValue: Double { get }
@@ -138,9 +137,9 @@ open class Reader<T>: NSObject, ReaderInternal_p {
debug("Set up update interval: \(Int(interval)) sec", log: self.log)
}
self.repeatTask = Repeater.init(interval: .seconds(interval), observer: { _ in
self.read()
})
self.repeatTask = Repeater.init(seconds: Int(interval)) { [weak self] in
self?.read()
}
}
if !self.initlizalized {
@@ -159,7 +158,7 @@ open class Reader<T>: NSObject, ReaderInternal_p {
}
open func stop() {
self.repeatTask?.removeAllObservers(thenStop: true)
self.repeatTask?.pause()
self.repeatTask = nil
self.active = false
self.initlizalized = false
@@ -168,7 +167,7 @@ open class Reader<T>: NSObject, ReaderInternal_p {
public func setInterval(_ value: Int) {
debug("Set update interval: \(Int(value)) sec", log: self.log)
self.interval = Double(value)
self.repeatTask?.reset(.seconds(Double(value)), restart: true)
self.repeatTask?.reset(seconds: value, restart: true)
}
}

72
Kit/plugins/Repeater.swift Normal file
View File

@@ -0,0 +1,72 @@
//
// Repeater.swift
// Kit
//
// Created by Serhiy Mytrovtsiy on 27/06/2022.
// Using Swift 5.0.
// Running on macOS 10.15.
//
// Copyright © 2022 Serhiy Mytrovtsiy. All rights reserved.
//
import Foundation
public enum State {
case paused
case running
}
public class Repeater {
private var callback: (() -> Void)
private var state: State = .paused
private var timer: DispatchSourceTimer = DispatchSource.makeTimerSource(queue: DispatchQueue(label: "eu.exelban.Stats"))
public init(seconds: Int, callback: @escaping (() -> Void)) {
self.callback = callback
self.setupTimer(seconds)
}
deinit {
self.timer.cancel()
self.start()
}
private func setupTimer(_ interval: Int) {
timer.schedule(
deadline: DispatchTime.now() + Double(interval),
repeating: .seconds(interval),
leeway: .seconds(0)
)
timer.setEventHandler { [weak self] in
self?.callback()
}
}
public func start() {
guard self.state == .paused else { return }
self.timer.resume()
self.state = .running
}
public func pause() {
guard self.state == .running else { return }
self.timer.suspend()
self.state = .paused
}
public func reset(seconds: Int, restart: Bool = false) {
if self.state == .running {
self.pause()
}
self.setupTimer(seconds)
if restart {
self.callback()
self.start()
}
}
}

29
Stats.xcodeproj/project.pbxproj
View File

@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 52;
objectVersion = 50;
objects = {
/* Begin PBXBuildFile section */
@@ -31,7 +31,6 @@
9A28477B2666AA5000EC1F6D /* popup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A2847762666AA5000EC1F6D /* popup.swift */; };
9A28477C2666AA5000EC1F6D /* reader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A2847772666AA5000EC1F6D /* reader.swift */; };
9A28477D2666AA5000EC1F6D /* widget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A2847782666AA5000EC1F6D /* widget.swift */; };
9A2847AB2666AA7B00EC1F6D /* Repeat in Frameworks */ = {isa = PBXBuildFile; productRef = 9A2847AA2666AA7B00EC1F6D /* Repeat */; };
9A2847C22666AA8700EC1F6D /* Kit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A2846F72666A9CC00EC1F6D /* Kit.framework */; };
9A2847C72666AA8C00EC1F6D /* Kit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A2846F72666A9CC00EC1F6D /* Kit.framework */; };
9A2847CC2666AA9100EC1F6D /* Kit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A2846F72666A9CC00EC1F6D /* Kit.framework */; };
@@ -49,6 +48,7 @@
9A2848202666AB3600EC1F6D /* types.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A28481C2666AB3500EC1F6D /* types.swift */; };
9A2848212666AB3600EC1F6D /* helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A28481D2666AB3600EC1F6D /* helpers.swift */; };
9A2848892666AC0100EC1F6D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9A2848882666AC0100EC1F6D /* Assets.xcassets */; };
9A302614286A2A3B00B41D57 /* Repeater.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A302613286A2A3B00B41D57 /* Repeater.swift */; };
9A34353B243E278D006B19F9 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A34353A243E278D006B19F9 /* main.swift */; };
9A34353C243E27E8006B19F9 /* LaunchAtLogin.app in Copy Files */ = {isa = PBXBuildFile; fileRef = 9A343527243E26A0006B19F9 /* LaunchAtLogin.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
9A3E17D3247A94AF00449CD1 /* Net.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A3E17CC247A94AF00449CD1 /* Net.framework */; };
@@ -360,6 +360,7 @@
9A28481D2666AB3600EC1F6D /* helpers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = helpers.swift; sourceTree = "<group>"; };
9A2848882666AC0100EC1F6D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
9A28493E2666AD2A00EC1F6D /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
9A302613286A2A3B00B41D57 /* Repeater.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Repeater.swift; sourceTree = "<group>"; };
9A343527243E26A0006B19F9 /* LaunchAtLogin.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LaunchAtLogin.app; sourceTree = BUILT_PRODUCTS_DIR; };
9A343535243E26A0006B19F9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
9A343536243E26A0006B19F9 /* LaunchAtLogin.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = LaunchAtLogin.entitlements; sourceTree = "<group>"; };
@@ -485,7 +486,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
9A2847AB2666AA7B00EC1F6D /* Repeat in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -796,6 +796,7 @@
9A2848072666AB3000EC1F6D /* Updater.swift */,
9A6EEBBD2685259500897371 /* Logger.swift */,
9A5A8446271895B700BC40A4 /* Reachability.swift */,
9A302613286A2A3B00B41D57 /* Repeater.swift */,
);
path = plugins;
sourceTree = "<group>";
@@ -1011,7 +1012,6 @@
);
name = Kit;
packageProductDependencies = (
9A2847AA2666AA7B00EC1F6D /* Repeat */,
);
productName = Kit;
productReference = 9A2846F72666A9CC00EC1F6D /* Kit.framework */;
@@ -1314,7 +1314,6 @@
);
mainGroup = 9A1410EC229E721100D29793;
packageReferences = (
9A27D4D72538A38A001BB651 /* XCRemoteSwiftPackageReference "Repeat" */,
);
productRefGroup = 9A1410F6229E721100D29793 /* Products */;
projectDirPath = "";
@@ -1499,6 +1498,7 @@
9A2848212666AB3600EC1F6D /* helpers.swift in Sources */,
9A28477A2666AA5000EC1F6D /* settings.swift in Sources */,
9A28475F2666AA2700EC1F6D /* LineChart.swift in Sources */,
9A302614286A2A3B00B41D57 /* Repeater.swift in Sources */,
9A28480E2666AB3000EC1F6D /* Updater.swift in Sources */,
9A5A8447271895B700BC40A4 /* Reachability.swift in Sources */,
9A2847622666AA2700EC1F6D /* Label.swift in Sources */,
@@ -2784,25 +2784,6 @@
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
/* Begin XCRemoteSwiftPackageReference section */
9A27D4D72538A38A001BB651 /* XCRemoteSwiftPackageReference "Repeat" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/malcommac/Repeat";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 0.6.0;
};
};
/* End XCRemoteSwiftPackageReference section */
/* Begin XCSwiftPackageProductDependency section */
9A2847AA2666AA7B00EC1F6D /* Repeat */ = {
isa = XCSwiftPackageProductDependency;
package = 9A27D4D72538A38A001BB651 /* XCRemoteSwiftPackageReference "Repeat" */;
productName = Repeat;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = 9A1410ED229E721100D29793 /* Project object */;
}

16
Stats.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View File

@@ -1,16 +0,0 @@
{
"object": {
"pins": [
{
"package": "Repeat",
"repositoryURL": "https://github.com/malcommac/Repeat",
"state": {
"branch": null,
"revision": "9df757d0936c15dfd9d01067766fab87e927f838",
"version": "0.6.0"
}
}
]
},
"version": 1
}

2
Stats/Supporting Files/Info.plist
View File

@@ -17,7 +17,7 @@
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>371</string>
<string>372</string>
<key>Description</key>
<string>Simple macOS system monitor in your menu bar</string>
<key>LSApplicationCategoryType</key>