.frame(width: 650, height: 450)
}
.handlesExternalEvents(matching: Set(arrayLiteral: "PreferencesScreen"))
- .modelContainer(for: CapturaRemoteFile.self)
+ //.modelContainer(for: CapturaRemoteFile.self)
}
}
var fps = CapturaSettings.frameRate
var pixelDensity: CGFloat = 1.0
var stopTimer: DispatchWorkItem?
+ var remoteFiles: [CapturaRemoteFile] = []
func applicationDidFinishLaunching(_ notification: Notification) {
- setupMenu()
+ setupStatusBar()
NotificationCenter.default.addObserver(
self,
selector: #selector(self.didReceiveNotification(_:)),
name: nil,
object: nil)
closeWindow()
+ fetchRemoteItems()
}
// MARK: - Setup Functions
- private func setupMenu() {
+ private func setupStatusBar() {
statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
if let button = statusItem.button {
popover?.contentViewController = HelpPopoverViewController()
popover?.behavior = .transient
+ setupMenu()
+ }
+
+ private func setupMenu() {
- let recordItem = NSMenuItem(title: "Record", action: #selector(CapturaAppDelegate.onClickStartRecording), keyEquivalent: "6")
- recordItem.keyEquivalentModifierMask = [.command, .shift]
- statusItem.menu?.addItem(recordItem)
- statusItem.menu?.addItem(NSMenuItem.separator())
-
- let preferencesItem = NSMenuItem(title: "Preferences", action: #selector(CapturaAppDelegate.onOpenPreferences), keyEquivalent: "")
- statusItem.menu?.addItem(preferencesItem)
+ statusItem.menu?.removeAllItems()
- let quitItem = NSMenuItem(title: "Quit", action: #selector(CapturaAppDelegate.onQuit), keyEquivalent: "")
- statusItem.menu?.addItem(quitItem)
+ statusItem.menu?.addItem(NSMenuItem(title: "Record", action: #selector(CapturaAppDelegate.onClickStartRecording), keyEquivalent: ""))
+ if (remoteFiles.count > 0) {
+ statusItem.menu?.addItem(NSMenuItem.separator())
+ for remoteFile in remoteFiles {
+ let remoteFileItem = NSMenuItem(title: remoteFile.name, action: #selector(CapturaAppDelegate.onClickRemoteFile), keyEquivalent: "")
+ remoteFileItem.representedObject = remoteFile
+ statusItem.menu?.addItem(remoteFileItem)
+ }
+ }
+ statusItem.menu?.addItem(NSMenuItem.separator())
+ statusItem.menu?.addItem(NSMenuItem(title: "Open Local Folder", action: #selector(CapturaAppDelegate.onOpenFolder), keyEquivalent: ""))
+ statusItem.menu?.addItem(NSMenuItem.separator())
+ statusItem.menu?.addItem(NSMenuItem(title: "Preferences", action: #selector(CapturaAppDelegate.onOpenPreferences), keyEquivalent: ""))
+ statusItem.menu?.addItem(NSMenuItem(title: "Quit", action: #selector(CapturaAppDelegate.onQuit), keyEquivalent: ""))
}
private func closeWindow() {
preferencesWindow = PreferencesWindow()
} else {
preferencesWindow?.makeKeyAndOrderFront(nil)
+ preferencesWindow?.orderFrontRegardless()
+ }
+ }
+
+ @objc private func onOpenFolder() {
+ if let directory = FileManager.default.urls(for: .picturesDirectory, in: .userDomainMask).first?.appendingPathComponent("captura") {
+ NSWorkspace.shared.open(directory)
+ }
+ }
+
+ @objc private func onClickRemoteFile(_ sender: NSMenuItem) {
+ if let remoteFile = sender.representedObject as? CapturaRemoteFile {
+ if let urlString = remoteFile.url {
+ if let url = URL(string: urlString) {
+ NSWorkspace.shared.open(url)
+ }
+ }
}
}
case .reset:
reset()
case .failedToStart:
- failedToStart()
+ DispatchQueue.main.async {
+ self.failed(true)
+ }
+ case .failedtoUpload:
+ DispatchQueue.main.async {
+ self.failed()
+ }
case .receivedFrame:
if let frame = notification.userInfo?["frame"] {
receivedFrame(frame as! CVImageBuffer)
}
+ case .NSManagedObjectContextObjectsDidChange:
+ DispatchQueue.main.async {
+ self.fetchRemoteItems()
+ self.setupMenu()
+ }
default:
return
}
func startAreaSelection() {
helpShown = false
- NSApp.activate(ignoringOtherApps: true)
if captureState != .selectingArea {
captureState = .selectingArea
if let button = statusItem.button {
let rectInWindow = button.convert(button.bounds, to: nil)
let rectInScreen = button.window?.convertToScreen(rectInWindow)
+ NSApp.activate(ignoringOtherApps: true)
recordingWindow = RecordingWindow(rectInScreen)
+ recordingWindow?.makeKeyAndOrderFront(nil)
+ recordingWindow?.orderFrontRegardless()
boxListener = recordingWindow?.recordingContentView.$box
.debounce(for: .seconds(0.3), scheduler: RunLoop.main)
.sink { newValue in
updateImage()
stop()
- if !CapturaSettings.shouldSaveMp4 {
- NotificationCenter.default.post(name: .finalizeRecording, object: nil, userInfo: nil)
- return
- }
-
Task.detached {
- if let outputFile = self.outputFile {
- await GifRenderer.render(self.images, at: self.fps, to: outputFile.gifURL)
+ if CapturaSettings.shouldSaveGif {
+ if let outputFile = self.outputFile {
+ await GifRenderer.render(self.images, at: self.fps, to: outputFile.gifURL)
+ }
+ }
+ let wasSuccessful = await self.uploadOrCopy()
+ if wasSuccessful {
NotificationCenter.default.post(name: .finalizeRecording, object: nil, userInfo: nil)
+ } else {
+ NotificationCenter.default.post(name: .failedtoUpload, object: nil, userInfo: nil)
}
}
}
func finalizeRecording() {
captureState = .uploaded
- copyToClipboard()
updateImage()
DispatchQueue.main.asyncAfter(deadline: .now() + 2.0) {
NotificationCenter.default.post(name: .reset, object: nil, userInfo: nil)
}
}
- func failedToStart() {
+ func failed(_ requestPermission: Bool = false) {
captureState = .error
updateImage()
- requestPermissionToRecord()
+ if requestPermission {
+ requestPermissionToRecord()
+ }
stop()
DispatchQueue.main.asyncAfter(deadline: .now() + 2.0) {
NotificationCenter.default.post(name: .reset, object: nil, userInfo: nil)
}
}
+ // MARK: - CoreData
+
+ private func fetchRemoteItems() {
+ let viewContext = PersistenceController.shared.container.viewContext
+ let fetchRequest = NSFetchRequest<CapturaRemoteFile>(entityName: "CapturaRemoteFile")
+ fetchRequest.fetchLimit = 5
+ fetchRequest.sortDescriptors = [NSSortDescriptor(key: "timestamp", ascending: false)]
+
+ let results = try? viewContext.fetch(fetchRequest)
+ remoteFiles = results ?? []
+ }
+
// MARK: - Presentation Helpers
recordingWindow = nil
}
- private func copyToClipboard() {
+ private func uploadOrCopy() async -> Bool {
+ if CapturaSettings.shouldUseBackend {
+ let result = await uploadToBackend()
+ if result && !CapturaSettings.shouldKeepLocalFiles {
+ deleteLocalFiles()
+ }
+ return result
+ } else {
+ copyLocalToClipboard()
+ return true
+ }
+ }
+
+ private func copyLocalToClipboard() {
let fileType: NSPasteboard.PasteboardType = .init(rawValue: CapturaSettings.shouldSaveGif ? "com.compuserve.gif" : "public.mpeg-4")
if let url = CapturaSettings.shouldSaveGif ? outputFile?.gifURL : outputFile?.mp4URL {
if let data = try? Data(contentsOf: url) {
}
}
}
+
+ private func uploadToBackend() async -> Bool {
+ let contentType = CapturaSettings.shouldUploadGif ? "image/gif" : "video/mp4"
+ if let url = CapturaSettings.shouldUploadGif ? outputFile?.gifURL : outputFile?.mp4URL {
+ if let data = try? Data(contentsOf: url) {
+ if let remoteUrl = CapturaSettings.backend {
+ var request = URLRequest(url: remoteUrl)
+ request.httpMethod = "POST"
+ request.httpBody = data
+ request.setValue(contentType, forHTTPHeaderField: "Content-Type")
+ request.setValue("Captura/1.0", forHTTPHeaderField: "User-Agent")
+
+ do {
+ let (data, response) = try await URLSession.shared.data(for: request)
+
+ if let httpResponse = response as? HTTPURLResponse {
+ if httpResponse.statusCode == 201 {
+ let answer = try JSONDecoder().decode(BackendResponse.self, from: data)
+ createRemoteFile(answer.url)
+ return true
+ }
+ }
+ } catch {}
+ }
+ }
+ }
+ return false
+ }
+
+ private func createRemoteFile(_ url: URL) {
+ let viewContext = PersistenceController.shared.container.viewContext
+ let remoteFile = CapturaRemoteFile(context: viewContext)
+ remoteFile.url = url.absoluteString
+ remoteFile.timestamp = Date()
+ try? viewContext.save()
+ let pasteboard = NSPasteboard.general
+ pasteboard.declareTypes([.URL], owner: nil)
+ pasteboard.setString(url.absoluteString, forType: .string)
+ }
+
+ private func deleteLocalFiles() {
+ if CapturaSettings.shouldSaveGif {
+ if let url = outputFile?.gifURL {
+ try? FileManager.default.removeItem(at: url)
+ }
+ }
+ if CapturaSettings.shouldSaveMp4 {
+ if let url = outputFile?.mp4URL {
+ try? FileManager.default.removeItem(at: url)
+ }
+ }
+ }
}
git.r.bdr.sh / rbdr / captura / blobdiff