X-Git-Url: https://git.r.bdr.sh/rbdr/captura/blobdiff_plain/153f3309127a4f9d898310224a467d11eef0f2ff..9be247c36cb15153de2cbafe7e1c53209182f29e:/Captura/CapturaApp.swift

diff --git a/Captura/CapturaApp.swift b/Captura/CapturaApp.swift
index d954b9f..e49ef6d 100644
--- a/Captura/CapturaApp.swift
+++ b/Captura/CapturaApp.swift
@@ -1,8 +1,8 @@
 import SwiftUI
-import SwiftData
 import Cocoa
 import Combine
 import AVFoundation
+import Sparkle
 
 @main
 struct CapturaApp: App {
@@ -39,6 +39,10 @@ struct CapturaApp: App {
   var remoteFiles: [CapturaRemoteFile] = []
   var captureSessionConfiguration: CaptureSessionConfiguration = CaptureSessionConfiguration()
   
+  // Sparkle Configuration
+  @IBOutlet var checkForUpdatesMenuItem: NSMenuItem!
+  let updaterController: SPUStandardUpdaterController = SPUStandardUpdaterController(startingUpdater: true, updaterDelegate: nil, userDriverDelegate: nil)
+  
   @objc dynamic var scriptedPreferences: ScriptedPreferences = ScriptedPreferences()
   
   func applicationDidFinishLaunching(_ notification: Notification) {
@@ -59,7 +63,7 @@ struct CapturaApp: App {
     statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
     
     if let button = statusItem.button {
-      button.image = NSImage(systemSymbolName: "rectangle.dashed.badge.record", accessibilityDescription: "Captura")
+      button.image = NSImage(named: "Idle")
     }
     
     statusItem.isVisible = true
@@ -90,6 +94,11 @@ struct CapturaApp: App {
     statusItem.menu?.addItem(NSMenuItem.separator())
     statusItem.menu?.addItem(NSMenuItem(title: "Open Local Folder", action: #selector(CapturaAppDelegate.onOpenFolder), keyEquivalent: ""))
     statusItem.menu?.addItem(NSMenuItem.separator())
+    
+    checkForUpdatesMenuItem = NSMenuItem(title: "Check for Updates", action: #selector(SPUStandardUpdaterController.checkForUpdates(_:)), keyEquivalent: "")
+    checkForUpdatesMenuItem.target = updaterController
+    statusItem.menu?.addItem(checkForUpdatesMenuItem)
+    
     statusItem.menu?.addItem(NSMenuItem(title: "Preferences", action: #selector(CapturaAppDelegate.onOpenPreferences), keyEquivalent: ""))
     statusItem.menu?.addItem(NSMenuItem(title: "Quit", action: #selector(CapturaAppDelegate.onQuit), keyEquivalent: ""))
   }
@@ -108,7 +117,9 @@ struct CapturaApp: App {
         if let action = CapturaURLDecoder.decodeParams(url: url) {
           switch action {
             case let .configure(config):
-              CapturaSettings.apply(config)
+            NotificationCenter.default.post(name: .setConfiguration, object: nil, userInfo: [
+              "config": config
+            ])
             case let .record(config):
             NotificationCenter.default.post(name: .setCaptureSessionConfiguration, object: nil, userInfo: [
               "config": config
@@ -131,9 +142,14 @@ struct CapturaApp: App {
   
   func menuWillOpen(_ menu: NSMenu) {
     if captureState != .idle {
-      menu.cancelTracking()
+      menu.cancelTrackingWithoutAnimation()
+      if captureState == .selectingArea {
+        NotificationCenter.default.post(name: .startRecording, object: nil, userInfo: nil)
+        return
+      }
       if captureState == .recording {
         NotificationCenter.default.post(name: .stopRecording, object: nil, userInfo: nil)
+        return
       }
     }
   }
@@ -200,8 +216,16 @@ struct CapturaApp: App {
       if let frame = notification.userInfo?["frame"] {
         receivedFrame(frame as! CVImageBuffer)
       }
+    case .setConfiguration:
+      DispatchQueue.main.async {
+        if let userInfo = notification.userInfo {
+          if let config = userInfo["config"] as? ConfigureAction {
+            self.setConfiguration(config)
+          }
+        }
+      }
     case .reloadConfiguration:
-      reloadConfiguration()
+        reloadConfiguration()
     case .setCaptureSessionConfiguration:
       if let userInfo = notification.userInfo {
         if let config = userInfo["config"] as? RecordAction {
@@ -223,6 +247,7 @@ struct CapturaApp: App {
     helpShown = false
     if captureState != .selectingArea {
       captureState = .selectingArea
+      updateImage()
       if let button = statusItem.button {
         let rectInWindow = button.convert(button.bounds, to: nil)
         let rectInScreen = button.window?.convertToScreen(rectInWindow)
@@ -317,7 +342,10 @@ struct CapturaApp: App {
     if now - gifCallbackTimer > .nanoseconds(1_000_000_000 / UInt64(captureSessionConfiguration.frameRate)) {
       gifCallbackTimer = now
       DispatchQueue.main.async {
-        if let cgImage = frame.cgImage?.resize(by: self.pixelDensity) {
+        if var cgImage = frame.cgImage {
+          if self.pixelDensity > 1 {
+            cgImage = cgImage.resize(by: self.pixelDensity) ?? cgImage
+          }
           self.images.append(cgImage)
         }
       }
@@ -336,6 +364,10 @@ struct CapturaApp: App {
     }
   }
   
+  func setConfiguration(_ config: ConfigureAction) {
+    CapturaSettings.apply(config)
+  }
+  
   func reloadConfiguration() {
     self.captureSessionConfiguration = CaptureSessionConfiguration()
   }
@@ -380,19 +412,23 @@ struct CapturaApp: App {
     if let button = statusItem.button {
       let image: String = switch captureState {
       case .idle:
-        "rectangle.dashed.badge.record"
+        "Idle"
       case .selectingArea:
-        "circle.rectangle.dashed"
+        if recordingWindow?.recordingContentView.box != nil {
+          "Ready to Record"
+        } else {
+          "Selecting"
+        }
       case .recording:
-        "checkmark.rectangle"
+        "Stop Frame 1"
       case .uploading:
-        "dock.arrow.up.rectangle"
+        "Upload Frame 1"
       case .uploaded:
-        "checkmark.rectangle.fill"
+        "OK"
       case .error:
-        "xmark.rectangle.fill"
+        "ERR"
       }
-      button.image = NSImage(systemSymbolName: image, accessibilityDescription: "Captura")
+      button.image = NSImage(named: image)
     }
   }