Merge pull request #95 from cparish312/robust_screenshot_loop

retryScreenshot for more Robust screenshot loop
jasonjmcghee · May 8, 2024 · 9e6730d · 9e6730d
2 parents b36aa1b + 6f9fa7e
commit 9e6730d
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 6 deletions.
diff --git a/rem/DB.swift b/rem/DB.swift
@@ -59,6 +59,9 @@ class DatabaseManager {
             db = try! Connection("db.sqlite3")
         }
 
+        try! db.run("PRAGMA journal_mode = WAL")
+        try! db.run("PRAGMA synchronous = NORMAL")
+
         createTables()
         currentChunkId = getCurrentChunkId()
         lastFrameId = getLastFrameId()

diff --git a/rem/remApp.swift b/rem/remApp.swift
@@ -90,6 +90,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     private var lastImageData: Data? = nil
     private var lastActiveApplication: String? = nil
     private var lastDisplayID: UInt32? = nil
+    private var screenshotRetries: Int = 0
 
 
     private var imageResizer = ImageResizer(
@@ -347,11 +348,23 @@ func drawStatusBarIcon(rect: CGRect) -> Bool {
         }
         return false
     }
+
+    private func retryScreenshot(shareableContent: SCShareableContent) {
+        if screenshotRetries < 3 {
+            screenshotRetries += 1
+            screenshotQueue.asyncAfter(deadline: .now() + 2) { [weak self] in
+                self?.scheduleScreenshot(shareableContent: shareableContent)
+            }
+        } else {
+            disableRecording()
+            screenshotRetries = 0
+        }
+    }
 
     private func scheduleScreenshot(shareableContent: SCShareableContent) {
         Task {
             do {
-                guard isCapturing == .recording else { 
+                guard isCapturing == .recording else {
                     logger.debug("Stopped Recording")
                     return }
 
@@ -372,14 +385,18 @@ func drawStatusBarIcon(rect: CGRect) -> Bool {
                         logger.debug("Active Display ID: \(displayID ?? 999)")
                     }
                 }
-
-                guard displayID != nil else { 
+                
+                guard displayID != nil else {
                     logger.debug("DisplayID is nil")
-                    return }
+                    retryScreenshot(shareableContent: shareableContent)
+                    return
+                }
 
-                guard let display = shareableContent.displays.first(where: { $0.displayID == displayID }) else { 
+                guard let display = shareableContent.displays.first(where: { $0.displayID == displayID }) else {
                     logger.debug("Display could not be retrieved")
-                    return }
+                    retryScreenshot(shareableContent: shareableContent)
+                    return
+                }
 
                 let activeApplicationName = NSWorkspace.shared.frontmostApplication?.localizedName
 
@@ -435,6 +452,7 @@ func drawStatusBarIcon(rect: CGRect) -> Bool {
                 logger.error("Error taking screenshot: \(error)")
             }
 
+            screenshotRetries = 0
             screenshotQueue.asyncAfter(deadline: .now() + 2) { [weak self] in
                 self?.scheduleScreenshot(shareableContent: shareableContent)
             }