pi-image-tools 1.3.0 → 1.4.0

package/src/recent-images.ts

@@ -37,6 +37,17 @@ interface RecentImageSource {
   filterScreenshotNames: boolean;
 }
 
+function source(
+  homeDirectory: string,
+  segments: readonly string[],
+  filterScreenshotNames: boolean,
+): RecentImageSource {
+  return {
+    path: join(homeDirectory, ...segments),
+    filterScreenshotNames,
+  };
+}
+
 export interface RecentImageCandidate {
   path: string;
   name: string;
@@ -106,64 +117,27 @@ function parseConfiguredSources(environment: NodeJS.ProcessEnv, homeDirectory: s
     .filter((value) => value.length > 0);
 }
 
-function getDefaultWindowsSources(homeDirectory: string): RecentImageSource[] {
-  return [
-    {
-      path: join(homeDirectory, "Pictures", "Screenshots"),
-      filterScreenshotNames: false,
-    },
-    {
-      path: join(homeDirectory, "OneDrive", "Pictures", "Screenshots"),
-      filterScreenshotNames: false,
-    },
-    {
-      path: join(homeDirectory, "Desktop"),
-      filterScreenshotNames: true,
-    },
-  ];
-}
-
-function getDefaultLinuxSources(homeDirectory: string): RecentImageSource[] {
-  return [
-    {
-      path: join(homeDirectory, "Pictures", "Screenshots"),
-      filterScreenshotNames: false,
-    },
-    {
-      path: join(homeDirectory, "Pictures"),
-      filterScreenshotNames: true,
-    },
-    {
-      path: join(homeDirectory, "Downloads"),
-      filterScreenshotNames: true,
-    },
-    {
-      path: join(homeDirectory, "Desktop"),
-      filterScreenshotNames: true,
-    },
-  ];
-}
-
-function getDefaultMacSources(homeDirectory: string): RecentImageSource[] {
-  return [
-    {
-      path: join(homeDirectory, "Desktop"),
-      filterScreenshotNames: true,
-    },
-    {
-      path: join(homeDirectory, "Downloads"),
-      filterScreenshotNames: true,
-    },
-    {
-      path: join(homeDirectory, "Pictures", "Screenshots"),
-      filterScreenshotNames: false,
-    },
-    {
-      path: join(homeDirectory, "Pictures"),
-      filterScreenshotNames: true,
-    },
-  ];
-}
+type DefaultSourceSpec = readonly [segments: readonly string[], filterScreenshotNames: boolean];
+
+const DEFAULT_PLATFORM_SOURCES: Readonly<Partial<Record<NodeJS.Platform, readonly DefaultSourceSpec[]>>> = {
+  win32: [
+    [["Pictures", "Screenshots"], false],
+    [["OneDrive", "Pictures", "Screenshots"], false],
+    [["Desktop"], true],
+  ],
+  linux: [
+    [["Pictures", "Screenshots"], false],
+    [["Pictures"], true],
+    [["Downloads"], true],
+    [["Desktop"], true],
+  ],
+  darwin: [
+    [["Desktop"], true],
+    [["Downloads"], true],
+    [["Pictures", "Screenshots"], false],
+    [["Pictures"], true],
+  ],
+};
 
 function dedupeSources(
   sources: readonly RecentImageSource[],
@@ -219,24 +193,22 @@ function listRecentImagesFromSource(source: RecentImageSource): RecentImageCandi
 
     const fullPath = join(source.path, name);
 
-    let stat;
     try {
-      stat = statSync(fullPath);
-    } catch {
-      continue;
-    }
+      const stat = statSync(fullPath);
+      if (!stat.isFile()) {
+        continue;
+      }
 
-    if (!stat.isFile()) {
+      candidates.push({
+        path: fullPath,
+        name,
+        mimeType,
+        modifiedAtMs: stat.mtimeMs,
+        sizeBytes: stat.size,
+      });
+    } catch {
       continue;
     }
-
-    candidates.push({
-      path: fullPath,
-      name,
-      mimeType,
-      modifiedAtMs: stat.mtimeMs,
-      sizeBytes: stat.size,
-    });
   }
 
   return candidates;
@@ -246,16 +218,14 @@ function getPlatformDefaultSources(
   platform: NodeJS.Platform,
   homeDirectory: string,
 ): RecentImageSource[] {
-  switch (platform) {
-    case "win32":
-      return getDefaultWindowsSources(homeDirectory);
-    case "linux":
-      return getDefaultLinuxSources(homeDirectory);
-    case "darwin":
-      return getDefaultMacSources(homeDirectory);
-    default:
-      return [];
+  const specs = DEFAULT_PLATFORM_SOURCES[platform];
+  if (!specs) {
+    return [];
   }
+
+  return specs.map(([segments, filterScreenshotNames]) =>
+    source(homeDirectory, segments, filterScreenshotNames),
+  );
 }
 
 function buildSources(options: DiscoverRecentImagesOptions): RecentImageSource[] {
@@ -368,8 +338,9 @@ function pruneCacheDirectory(cacheDirectory: string, maxCacheFiles: number): voi
   for (const staleFile of imageFiles.slice(maxCacheFiles)) {
     try {
       unlinkSync(staleFile.fullPath);
-    } catch {
-      // Intentionally ignore cache cleanup failures.
+    } catch (error) {
+      // Cache cleanup is best-effort; a stale file is retried on the next prune.
+      void error;
     }
   }
 }
@@ -462,6 +433,7 @@ export function loadRecentImage(
 ): ClipboardImage {
   assertImageWithinByteLimit(candidate.sizeBytes, `Recent image ${candidate.name}`, environment);
   const raw = readFileSync(candidate.path);
+  assertImageWithinByteLimit(raw.length, `Recent image ${candidate.name}`, environment);
   if (raw.length === 0) {
     throw new Error(`File is empty: ${candidate.path}`);
   }

package/src/shell-environment.ts

@@ -1,75 +1,75 @@
-import { spawnSync } from "node:child_process";
-
-export interface ShellCommandContext {
-  platform: NodeJS.Platform;
-  environment: NodeJS.ProcessEnv;
-}
-
-export type CommandExists = (command: string, context: ShellCommandContext) => boolean;
-
-export interface WrappedCommand {
-  command: string;
-  args: string[];
-  wrapped: boolean;
-}
-
-const COMMAND_EXISTS_TIMEOUT_MS = 1000;
-const COMMAND_EXISTS_MAX_BUFFER_BYTES = 1024 * 1024;
-const commandExistsCache = new Map<string, boolean>();
-
-export function hasGraphicalSession(platform: NodeJS.Platform, environment: NodeJS.ProcessEnv): boolean {
-  return platform !== "linux" || Boolean(environment.DISPLAY || environment.WAYLAND_DISPLAY);
-}
-
-export function isWaylandSession(environment: NodeJS.ProcessEnv): boolean {
-  return Boolean(environment.WAYLAND_DISPLAY) || environment.XDG_SESSION_TYPE === "wayland";
-}
-
-export function isTmuxSession(environment: NodeJS.ProcessEnv): boolean {
-  return Boolean(environment.TMUX);
-}
-
-export const defaultCommandExists: CommandExists = (command, context) => {
-  const lookupCommand = context.platform === "win32" ? "where" : "which";
-  const cacheKey = `${context.platform}:${lookupCommand}:${command}:${context.environment.PATH ?? ""}`;
-  const cached = commandExistsCache.get(cacheKey);
-  if (cached !== undefined) {
-    return cached;
-  }
-
-  const result = spawnSync(lookupCommand, [command], {
-    env: context.environment,
-    maxBuffer: COMMAND_EXISTS_MAX_BUFFER_BYTES,
-    stdio: ["ignore", "pipe", "pipe"],
-    timeout: COMMAND_EXISTS_TIMEOUT_MS,
-    windowsHide: true,
-  });
-  const exists = !result.error && result.status === 0;
-  commandExistsCache.set(cacheKey, exists);
-  return exists;
-};
-
-export function buildNamespaceWrappedCommand(
-  command: string,
-  args: readonly string[],
-  context: ShellCommandContext,
-  commandExists: CommandExists = defaultCommandExists,
-): WrappedCommand {
-  try {
-    if (
-      context.platform !== "darwin" ||
-      !isTmuxSession(context.environment) ||
-      !commandExists("reattach-to-user-namespace", context)
-    ) {
-      return { command, args: [...args], wrapped: false };
-    }
-
-    return {
-      command: "reattach-to-user-namespace",
-      args: [command, ...args],
-      wrapped: true,
-    };
-  } catch {
-    return { command, args: [...args], wrapped: false };
-  }
-}
+import { spawnSync } from "node:child_process";
+
+export interface ShellCommandContext {
+  platform: NodeJS.Platform;
+  environment: NodeJS.ProcessEnv;
+}
+
+export type CommandExists = (command: string, context: ShellCommandContext) => boolean;
+
+export interface WrappedCommand {
+  command: string;
+  args: string[];
+  wrapped: boolean;
+}
+
+const COMMAND_EXISTS_TIMEOUT_MS = 1000;
+const COMMAND_EXISTS_MAX_BUFFER_BYTES = 1024 * 1024;
+const commandExistsCache = new Map<string, boolean>();
+
+export function hasGraphicalSession(platform: NodeJS.Platform, environment: NodeJS.ProcessEnv): boolean {
+  return platform !== "linux" || Boolean(environment.DISPLAY || environment.WAYLAND_DISPLAY);
+}
+
+export function isWaylandSession(environment: NodeJS.ProcessEnv): boolean {
+  return Boolean(environment.WAYLAND_DISPLAY) || environment.XDG_SESSION_TYPE === "wayland";
+}
+
+export function isTmuxSession(environment: NodeJS.ProcessEnv): boolean {
+  return Boolean(environment.TMUX);
+}
+
+export const defaultCommandExists: CommandExists = (command, context) => {
+  const lookupCommand = context.platform === "win32" ? "where" : "which";
+  const cacheKey = `${context.platform}:${lookupCommand}:${command}:${context.environment.PATH ?? ""}`;
+  const cached = commandExistsCache.get(cacheKey);
+  if (cached !== undefined) {
+    return cached;
+  }
+
+  const result = spawnSync(lookupCommand, [command], {
+    env: context.environment,
+    maxBuffer: COMMAND_EXISTS_MAX_BUFFER_BYTES,
+    stdio: ["ignore", "pipe", "pipe"],
+    timeout: COMMAND_EXISTS_TIMEOUT_MS,
+    windowsHide: true,
+  });
+  const exists = !result.error && result.status === 0;
+  commandExistsCache.set(cacheKey, exists);
+  return exists;
+};
+
+export function buildNamespaceWrappedCommand(
+  command: string,
+  args: readonly string[],
+  context: ShellCommandContext,
+  commandExists: CommandExists = defaultCommandExists,
+): WrappedCommand {
+  try {
+    if (
+      context.platform !== "darwin" ||
+      !isTmuxSession(context.environment) ||
+      !commandExists("reattach-to-user-namespace", context)
+    ) {
+      return { command, args: [...args], wrapped: false };
+    }
+
+    return {
+      command: "reattach-to-user-namespace",
+      args: [command, ...args],
+      wrapped: true,
+    };
+  } catch {
+    return { command, args: [...args], wrapped: false };
+  }
+}