pi-image-tools 1.3.1 → 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;
     }
   }
 }