Skip to content

armgit / mimik

Public Imported from GitHub
0

🎬 A browser extension and desktop app that turns your clicks into step-by-step guides with annotated screenshots πŸ“–

fix(desktop): resume a held capture after any relaunch, not only our own

Luis Ortiz293550d47817
diff --git a/apps/desktop/src/main/index.ts b/apps/desktop/src/main/index.ts
index 03fd4af..bbe95a4 100644
--- a/apps/desktop/src/main/index.ts
+++ b/apps/desktop/src/main/index.ts
@@ -11,7 +11,7 @@ import { registerScreenshotProtocol, SCREENSHOT_SCHEME, sweepScreenshots } from
import { type CaptureMode, type CaptureSettings, loadSettings, saveSettings } from './capture/settings';
import { mainI18n } from './i18n';
import { CaptureOverlay, type OverlayAiFailure, type OverlayCommand, type OverlayStep } from './overlay';
-import { type PermissionKind, readPermissions, requestPermission } from './permissions';
+import { captureWasHeld, holdCapture, type PermissionKind, readPermissions, requestPermission } from './permissions';
import { bindShortcuts, type ShortcutName, shortcutMap, unbindShortcuts } from './shortcuts';
import { checkForUpdates } from './updater';
@@ -25,8 +25,7 @@ let describing = true;
let captureSettings: CaptureSettings | null = null;
let steps: OverlayStep[] = [];
-const OPEN_CAPTURE_FLAG = '--open-capture';
-let pendingStart: (() => void) | null = process.argv.includes(OPEN_CAPTURE_FLAG)
+let pendingStart: (() => void) | null = captureWasHeld()
? () => mainWindow?.webContents.send('mimik:capture:openSheet')
: null;
@@ -62,6 +61,7 @@ function whenPermitted(start: () => void): void {
return;
}
pendingStart = start;
+ holdCapture(true);
showWindow();
mainWindow?.webContents.send('mimik:permissions:show');
}
@@ -498,20 +498,24 @@ if (!app.requestSingleInstanceLock()) {
overlay?.arm();
});
});
- ipcMain.handle('mimik:permissions:get', () => ({ ...readPermissions(), pending: pendingStart !== null }));
+ ipcMain.handle('mimik:permissions:get', () => {
+ if (pendingStart) holdCapture(true);
+ return { ...readPermissions(), pending: pendingStart !== null };
+ });
ipcMain.handle('mimik:permissions:request', (_event, kind: PermissionKind) => requestPermission(kind));
ipcMain.on('mimik:permissions:continue', () => {
const start = pendingStart;
pendingStart = null;
+ holdCapture(false);
warmScreenCapture();
start?.();
});
ipcMain.on('mimik:permissions:cancel', () => {
pendingStart = null;
+ holdCapture(false);
});
ipcMain.on('mimik:permissions:restart', () => {
- const args = process.argv.slice(1).filter((arg) => arg !== OPEN_CAPTURE_FLAG);
- app.relaunch({ args: [...args, OPEN_CAPTURE_FLAG] });
+ app.relaunch();
quit();
});
diff --git a/apps/desktop/src/main/permissions.ts b/apps/desktop/src/main/permissions.ts
index dea3baa..f7ec307 100644
--- a/apps/desktop/src/main/permissions.ts
+++ b/apps/desktop/src/main/permissions.ts
@@ -1,4 +1,4 @@
-import { readFileSync, writeFileSync } from 'node:fs';
+import { readFileSync, rmSync, writeFileSync } from 'node:fs';
import { join } from 'node:path';
import { app, desktopCapturer, shell, systemPreferences } from 'electron';
@@ -15,6 +15,8 @@ const SETTINGS_PANE: Record<PermissionKind, string> = {
};
const PROMPTED_FILE = 'permission-prompts.json';
+const HELD_FILE = 'held-capture.json';
+const HELD_FOR_MS = 10 * 60 * 1000;
export function readPermissions(): CapturePermissions {
if (process.platform !== 'darwin') return { accessibility: true, screen: true };
@@ -24,6 +26,21 @@ export function readPermissions(): CapturePermissions {
};
}
+export function holdCapture(held: boolean): void {
+ const file = join(app.getPath('userData'), HELD_FILE);
+ if (held) writeFileSync(file, JSON.stringify({ at: Date.now() }));
+ else rmSync(file, { force: true });
+}
+
+export function captureWasHeld(): boolean {
+ try {
+ const { at } = JSON.parse(readFileSync(join(app.getPath('userData'), HELD_FILE), 'utf8'));
+ return Date.now() - at < HELD_FOR_MS;
+ } catch {
+ return false;
+ }
+}
+
function prompted(): PermissionKind[] {
try {
return JSON.parse(readFileSync(join(app.getPath('userData'), PROMPTED_FILE), 'utf8'));