mirror of
https://github.com/carey314/mio-plugin-worker.git
synced 2026-08-10 07:04:32 +00:00
Core change: both timers stop lying when the Mac sleeps or the user walks away. Old code measured wallclock from a stored "start" timestamp, so 4 hours of lid-closed showed up as 4 hours of "sitting" and a 25-minute focus could quietly stretch across multiple hours because Timer.scheduledTimer pauses during sleep. What changed: - Sit timer now reads CGEventSource HID idle to count only seconds with real input activity. New Sources/engine/SystemIdle.swift iterates the user-input event types and takes the min. Idle ≥ 5 min resets the accumulator (counts as a real break). Tick-gap > 30 s flags a sleep/wake and clears too — covers the case where the user unlocks and idle resets to ~0 instantly. - Pomodoro switched from "decrement counter every second" to a wallclock end-time. Persisted to UserDefaults so quit/relaunch recovers correctly: still-running phases keep counting; phases whose end-time has already passed get caught up (one focus credited if missed) and the timer returns to idle. - Auto-loop with classic 4-pack rhythm: focus → short break → focus → … on the 4th focus a long break (default 15 min) replaces the short break, then the cycle resets. Default ON; toggle pill in the settings row turns it off when the user wants manual restarts. - New cycle-progress dot row (●●○○) next to the phase badge so the user can see where they are in the 4-pack at a glance. - SitView tip text rewritten to reflect the new semantics: "只统计 你真正在键盘前的时间。离开 5 分钟以上自动归零,午休/会议不会被 算进去。" User-facing wins: - Closing the lid for lunch no longer fakes 90 minutes of sitting. - A 25-min focus that survives a sleep cycle ends accurately. - Start a focus once, the rhythm runs all morning.
37 lines
1.3 KiB
Swift
37 lines
1.3 KiB
Swift
//
|
|
// SystemIdle.swift
|
|
// 摸鱼侠 plugin
|
|
//
|
|
// Returns "seconds since the user last touched any input device". This
|
|
// is the ground truth for "is a human at the keys right now." Unlike
|
|
// Date()-since-startTimestamp, it survives sleep/lid-close/lock cleanly:
|
|
// while no input arrives, the counter grows; the moment the user taps
|
|
// a key it drops to ~0. The sit-timer uses it to distinguish "sat at
|
|
// the desk for 45 minutes" from "left for lunch with the lid open."
|
|
//
|
|
|
|
import CoreGraphics
|
|
import Foundation
|
|
|
|
enum SystemIdle {
|
|
/// Seconds since the last user input event of any kind.
|
|
/// CGEventType is an enum and Swift doesn't expose the C-level
|
|
/// kCGAnyInputEventType wildcard, so we iterate the events that
|
|
/// matter for "is the user active" and take the minimum.
|
|
static var seconds: TimeInterval {
|
|
let types: [CGEventType] = [
|
|
.mouseMoved,
|
|
.leftMouseDown, .rightMouseDown, .otherMouseDown,
|
|
.leftMouseDragged, .rightMouseDragged,
|
|
.keyDown,
|
|
.scrollWheel
|
|
]
|
|
var minVal = Double.greatestFiniteMagnitude
|
|
for t in types {
|
|
let v = CGEventSource.secondsSinceLastEventType(.combinedSessionState, eventType: t)
|
|
if v < minVal { minVal = v }
|
|
}
|
|
return minVal == .greatestFiniteMagnitude ? 0 : minVal
|
|
}
|
|
}
|