feat: observe mouse move to update app

Innei · Innei · commit 75de33ce2334 · 2024-03-22T12:58:58.000+08:00
diff --git a/ProcessReporter.xcodeproj/project.pbxproj b/ProcessReporter.xcodeproj/project.pbxproj
@@ -33,6 +33,7 @@
 		1F6FE2DE2A46F5CA00D646CE /* Reporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F6FE2DD2A46F5CA00D646CE /* Reporter.swift */; };
 		1FAAEC482A66702100C086FF /* Application.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FAAEC472A66702100C086FF /* Application.swift */; };
 		1FBAFA042A815AA200425224 /* RelativeTimeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FBAFA032A815AA200425224 /* RelativeTimeView.swift */; };
+		1FD1ADC12BAD41B0001904BB /* MouseMove.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FD1ADC02BAD41B0001904BB /* MouseMove.swift */; };
 		1FF3ED2B2A8692A900EEF21D /* IntergrationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FF3ED2A2A8692A900EEF21D /* IntergrationView.swift */; };
 		1FF3ED2E2A8732AA00EEF21D /* ApiIntegrationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FF3ED2D2A8732AA00EEF21D /* ApiIntegrationView.swift */; };
 		1FF3ED302A8732C600EEF21D /* SlackIntegrationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FF3ED2F2A8732C600EEF21D /* SlackIntegrationView.swift */; };
@@ -73,6 +74,7 @@
 		1FAAEC462A666ED800C086FF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		1FAAEC472A66702100C086FF /* Application.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Application.swift; sourceTree = "<group>"; };
 		1FBAFA032A815AA200425224 /* RelativeTimeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RelativeTimeView.swift; sourceTree = "<group>"; };
+		1FD1ADC02BAD41B0001904BB /* MouseMove.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MouseMove.swift; sourceTree = "<group>"; };
 		1FF3ED2A2A8692A900EEF21D /* IntergrationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IntergrationView.swift; sourceTree = "<group>"; };
 		1FF3ED2D2A8732AA00EEF21D /* ApiIntegrationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApiIntegrationView.swift; sourceTree = "<group>"; };
 		1FF3ED2F2A8732C600EEF21D /* SlackIntegrationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SlackIntegrationView.swift; sourceTree = "<group>"; };
@@ -110,6 +112,7 @@
 				1FAAEC472A66702100C086FF /* Application.swift */,
 				1F1DA6BD2A875EDE0076B77F /* NotificationManager.swift */,
 				1FFC0FC42A5AE4FE00F67585 /* ActiveApplicationObserver.swift */,
+				1FD1ADC02BAD41B0001904BB /* MouseMove.swift */,
 				1F3BE35E2A62F13D0059A818 /* Agent.swift */,
 				1F3BE36E2A63B3220059A818 /* Request.swift */,
 				1F6FE2D72A469A8300D646CE /* Store.swift */,
@@ -354,6 +357,7 @@
 				1FFC0FC52A5AE4FE00F67585 /* ActiveApplicationObserver.swift in Sources */,
 				1F3BE35F2A62F13D0059A818 /* Agent.swift in Sources */,
 				1F3BE3692A62FB220059A818 /* Persisted+Modifier.swift in Sources */,
+				1FD1ADC12BAD41B0001904BB /* MouseMove.swift in Sources */,
 				1F04C2262A63CBED002FE62F /* ReportInfoView.swift in Sources */,
 				1F04C21C2A63C068002FE62F /* Atoms.swift in Sources */,
 				1F6FE2DA2A469B7500D646CE /* SettingView.swift in Sources */,
diff --git a/ProcessReporter/ProcessReporterApp.swift b/ProcessReporter/ProcessReporterApp.swift
@@ -33,13 +33,15 @@ struct swiftui_menu_barApp: App {
 
         if JotaiStore.shared.get(Atoms.isReportingAtom) {
             reporter.startReporting()
+      
         } else {
             Application.openSetting()
         }
 
         ActiveApplicationObserver.shared.observe { name in
             JotaiStore.shared.set(Atoms.currentFrontAppAtom, value: name)
         }
+        monitorMouseMove()
     }
 
     var menuIcon: String {
diff --git a/ProcessReporter/Utils/ActiveApplicationObserver.swift b/ProcessReporter/Utils/ActiveApplicationObserver.swift
@@ -64,6 +64,10 @@ class ActiveApplicationObserver {
     }
 }
 
-struct ActiveApplicationInfo {
+struct ActiveApplicationInfo: Equatable {
     var title: String?
+    
+    static  func ==(lhs: ActiveApplicationInfo, rhs: ActiveApplicationInfo) -> Bool {
+        return lhs.title == rhs.title
+    }
 }
diff --git a/ProcessReporter/Utils/MouseMove.swift b/ProcessReporter/Utils/MouseMove.swift
@@ -5,4 +5,37 @@
 //  Created by Innei on 2024/3/22.
 //
 
-import Foundation
+import Cocoa
+import AppKit
+import Accessibility
+
+func monitorMouseMove() {
+    
+ 
+    var lastSelectedText = ""
+    var info : ActiveApplicationInfo = ActiveApplicationObserver.shared.getActiveApplicationInfo()
+    NSEvent.addGlobalMonitorForEvents(matching:
+                                        [.leftMouseUp, .keyDown]
+    ) { (event) in
+        
+        switch event.type {
+        case .leftMouseUp, .keyDown:
+        
+            var currentInfo = ActiveApplicationObserver.shared.getActiveApplicationInfo()
+          
+            if currentInfo != info {
+                
+                DispatchQueue.main.async {
+                    Reporter.shared.report()
+                }
+            }
+            info = currentInfo
+            break
+            
+        default:
+            break
+        }
+     
+    }
+    
+}
diff --git a/ProcessReporter/Utils/Reporter/Reporter.swift b/ProcessReporter/Utils/Reporter/Reporter.swift
@@ -174,7 +174,7 @@ class Reporter {
         timer = nil
     }
 
-    private func report() {
+    public func report() {
         let shouldReport = JotaiStore.shared.get(Atoms.isReportingAtom)
         if !shouldReport {
             debugPrint("Report is disabled.")

Original file line number	Diff line number	Diff line change
`@@ -33,13 +33,15 @@ struct swiftui_menu_barApp: App {`
`33`	`33`
`34`	`34`	`if JotaiStore.shared.get(Atoms.isReportingAtom) {`
`35`	`35`	`reporter.startReporting()`
	`36`	`+`
`36`	`37`	`} else {`
`37`	`38`	`Application.openSetting()`
`38`	`39`	`}`
`39`	`40`
`40`	`41`	`ActiveApplicationObserver.shared.observe { name in`
`41`	`42`	`JotaiStore.shared.set(Atoms.currentFrontAppAtom, value: name)`
`42`	`43`	`}`
	`44`	`+ monitorMouseMove()`
`43`	`45`	`}`
`44`	`46`
`45`	`47`	`var menuIcon: String {`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,10 @@ class ActiveApplicationObserver {`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
`67`		`-struct ActiveApplicationInfo {`
	`67`	`+struct ActiveApplicationInfo: Equatable {`
`68`	`68`	`var title: String?`
	`69`	`+`
	`70`	`+ static func ==(lhs: ActiveApplicationInfo, rhs: ActiveApplicationInfo) -> Bool {`
	`71`	`+ return lhs.title == rhs.title`
	`72`	`+ }`
`69`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ class Reporter {`
`174`	`174`	`timer = nil`
`175`	`175`	`}`
`176`	`176`
`177`		`- private func report() {`
	`177`	`+ public func report() {`
`178`	`178`	`let shouldReport = JotaiStore.shared.get(Atoms.isReportingAtom)`
`179`	`179`	`if !shouldReport {`
`180`	`180`	`debugPrint("Report is disabled.")`