mirror of
https://github.com/leonboe1/QuickDrop.git
synced 2026-11-19 21:06:10 +00:00
Automatically launch main app if not running and extension run
This commit is contained in:
1 parent
5ee4689893
commit
da4dd4cc79
1 file changed
+47
-22
@@ -109,29 +109,34 @@ class ShareViewController: NSViewController, ShareExtensionDelegate{
|
|||||||
|
|
||||||
override func viewDidLoad(){
|
override func viewDidLoad(){
|
||||||
super.viewDidLoad()
|
super.viewDidLoad()
|
||||||
NearbyConnectionManager.shared.startDeviceDiscovery()
|
|
||||||
isDiscovering = true
|
launchMainApp()
|
||||||
|
|
||||||
|
DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
|
||||||
|
NearbyConnectionManager.shared.startDeviceDiscovery()
|
||||||
|
self.isDiscovering = true
|
||||||
|
}
|
||||||
|
|
||||||
NearbyConnectionManager.shared.addShareExtensionDelegate(self)
|
NearbyConnectionManager.shared.addShareExtensionDelegate(self)
|
||||||
|
|
||||||
let refreshInterval = 7.0
|
// let refreshInterval = 7.0
|
||||||
|
//
|
||||||
refreshTimer = Timer.scheduledTimer(withTimeInterval: refreshInterval, repeats: true, block: { _ in
|
// refreshTimer = Timer.scheduledTimer(withTimeInterval: refreshInterval, repeats: true, block: { _ in
|
||||||
|
//
|
||||||
// Restart device discovery if no devices are found
|
// // Restart device discovery if no devices are found
|
||||||
if self.isDiscovering && self.foundDevices.isEmpty {
|
// if self.isDiscovering && self.foundDevices.isEmpty {
|
||||||
|
//
|
||||||
log("Refreshing device list")
|
// log("Refreshing device list")
|
||||||
|
//
|
||||||
NearbyConnectionManager.shared.stopDeviceDiscovery()
|
// NearbyConnectionManager.shared.stopDeviceDiscovery()
|
||||||
|
//
|
||||||
DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
|
// DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
|
||||||
if self.isDiscovering {
|
// if self.isDiscovering {
|
||||||
NearbyConnectionManager.shared.startDeviceDiscovery()
|
// NearbyConnectionManager.shared.startDeviceDiscovery()
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
})
|
// })
|
||||||
}
|
}
|
||||||
|
|
||||||
override func viewWillDisappear() {
|
override func viewWillDisappear() {
|
||||||
@@ -139,9 +144,9 @@ class ShareViewController: NSViewController, ShareExtensionDelegate{
|
|||||||
self.qrWindow?.close()
|
self.qrWindow?.close()
|
||||||
|
|
||||||
if chosenDevice==nil{
|
if chosenDevice==nil{
|
||||||
NearbyConnectionManager.shared.stopDeviceDiscovery()
|
|
||||||
isDiscovering = false
|
isDiscovering = false
|
||||||
refreshTimer?.invalidate()
|
refreshTimer?.invalidate()
|
||||||
|
NearbyConnectionManager.shared.stopDeviceDiscovery()
|
||||||
}
|
}
|
||||||
NearbyConnectionManager.shared.removeShareExtensionDelegate(self)
|
NearbyConnectionManager.shared.removeShareExtensionDelegate(self)
|
||||||
}
|
}
|
||||||
@@ -310,9 +315,9 @@ class ShareViewController: NSViewController, ShareExtensionDelegate{
|
|||||||
|
|
||||||
self.qrWindow?.close()
|
self.qrWindow?.close()
|
||||||
|
|
||||||
NearbyConnectionManager.shared.stopDeviceDiscovery()
|
|
||||||
isDiscovering = false
|
isDiscovering = false
|
||||||
refreshTimer?.invalidate()
|
refreshTimer?.invalidate()
|
||||||
|
NearbyConnectionManager.shared.stopDeviceDiscovery()
|
||||||
|
|
||||||
listViewWrapper?.animator().isHidden=true
|
listViewWrapper?.animator().isHidden=true
|
||||||
progressView?.animator().isHidden=false
|
progressView?.animator().isHidden=false
|
||||||
@@ -377,3 +382,23 @@ extension ShareViewController:NSCollectionViewDataSource{
|
|||||||
return device.name
|
return device.name
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
func launchMainApp() {
|
||||||
|
let bundleIdentifier = "com.leonboettger.neardrop"
|
||||||
|
let runningApps = NSWorkspace.shared.runningApplications
|
||||||
|
|
||||||
|
// Check if the app is already running
|
||||||
|
let isRunning = runningApps.contains { $0.bundleIdentifier == bundleIdentifier }
|
||||||
|
|
||||||
|
if !isRunning {
|
||||||
|
log("Launching main app")
|
||||||
|
NSWorkspace.shared.launchApplication(withBundleIdentifier: bundleIdentifier,
|
||||||
|
options: [.default],
|
||||||
|
additionalEventParamDescriptor: nil,
|
||||||
|
launchIdentifier: nil)
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
log("Main app is already running")
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in new issue
Block a user