device-shots 0.6.1 → 0.7.0

package/dist/index.js

@@ -139,13 +139,49 @@ function getIosScreenSize(width, height) {
   const h = Math.max(width, height);
   return IOS_RESOLUTION_MAP[`${w}x${h}`] ?? `${w}x${h}`;
 }
+var ANDROID_RESOLUTION_MAP = {
+  // Phones — Pixel series
+  "1080x2400": "phone",
+  // Pixel 9, 8, 7, 6
+  "1344x2992": "phone",
+  // Pixel 8 Pro, Pixel 9 Pro XL
+  "1280x2856": "phone",
+  // Pixel 9 Pro
+  "1440x3120": "phone",
+  // Pixel 7 Pro, 6 Pro, Samsung Galaxy S24 Ultra
+  "1080x2340": "phone",
+  // Pixel 5, Samsung Galaxy S24, S23
+  "1080x2310": "phone",
+  // Pixel 4a, 5a
+  "1080x2280": "phone",
+  // Pixel 4
+  "1080x1920": "phone",
+  // Pixel (1st gen), Nexus 5X, many older phones
+  // Phones — Samsung Galaxy series
+  "1440x3200": "phone",
+  // Samsung Galaxy S22 Ultra, S21 Ultra
+  "1440x2960": "phone",
+  // Samsung Galaxy S9, S8
+  // 7" tablets
+  "1200x1920": "tablet-7",
+  // Nexus 7 (2013), Android Studio "Medium Tablet" AVD
+  "800x1280": "tablet-7",
+  // Nexus 7 (2012)
+  // 10" tablets
+  "1600x2560": "tablet-10",
+  // Pixel Tablet, Samsung Galaxy Tab S series
+  "1200x2000": "tablet-10"
+  // Samsung Galaxy Tab A8
+};
 function getAndroidScreenSize(width, height) {
-  const shorter = Math.min(width, height);
-  const longer = Math.max(width, height);
-  const ratio = longer / shorter;
+  const w = Math.min(width, height);
+  const h = Math.max(width, height);
+  const mapped = ANDROID_RESOLUTION_MAP[`${w}x${h}`];
+  if (mapped) return mapped;
+  const ratio = h / w;
   if (ratio >= 1.7) return "phone";
-  if (shorter >= 1500) return "tablet-10";
-  if (shorter >= 1200) return "tablet-7";
+  if (w >= 1500) return "tablet-10";
+  if (w >= 1200) return "tablet-7";
   return "phone";
 }
 
@@ -376,7 +412,7 @@ async function discoverDevices(bundleId, platform = "both") {
 }
 
 // src/framing/frame.ts
-import { existsSync as existsSync3, readdirSync } from "fs";
+import { existsSync as existsSync3, readdirSync, statSync } from "fs";
 import { join as join3, dirname } from "path";
 import { fileURLToPath } from "url";
 
@@ -408,6 +444,11 @@ async function ensureVenv() {
 }
 
 // src/framing/frame.ts
+var RESULT_PREFIX = "__DEVICE_SHOTS_RESULT__";
+function needsFraming(inputPath, outputPath, force) {
+  if (force || !existsSync3(outputPath)) return true;
+  return statSync(inputPath).mtimeMs > statSync(outputPath).mtimeMs;
+}
 function getFramePyPath() {
   const thisDir = dirname(fileURLToPath(import.meta.url));
   const candidates = [
@@ -430,12 +471,18 @@ async function frameScreenshots(inputDir, outputDir, force = false) {
     args.push("--force");
   }
   const output = await runOrFail(python, args);
-  if (output) {
-    process.stdout.write(output + "\n");
+  const lines = (output ?? "").split("\n");
+  const human = lines.filter((l) => !l.startsWith(RESULT_PREFIX)).join("\n").trimEnd();
+  if (human) {
+    process.stdout.write(human + "\n");
+  }
+  const resultLine = lines.find((l) => l.startsWith(RESULT_PREFIX));
+  if (!resultLine) {
+    throw new Error(
+      "frame.py finished without reporting a result. The vendored frame.py may be out of date."
+    );
   }
-  const framedFiles = existsSync3(outputDir) ? readdirSync(outputDir).filter((f) => f.endsWith(".png")).length : 0;
-  const rawFiles = existsSync3(inputDir) ? readdirSync(inputDir).filter((f) => f.endsWith(".png")).length : 0;
-  return { framed: framedFiles, skipped: rawFiles - framedFiles };
+  return JSON.parse(resultLine.slice(RESULT_PREFIX.length));
 }
 async function frameAndroidScreenshot(inputPath, outputPath) {
   if (!await commandExists("magick")) {
@@ -547,7 +594,7 @@ async function frameAllAndroidScreenshots(screenshotsDir, force = false) {
     for (const file of rawFiles) {
       const inputPath = join3(dirPath, file);
       const outputPath = join3(dirPath, file.replace(".png", "_framed.png"));
-      if (!force && existsSync3(outputPath)) continue;
+      if (!needsFraming(inputPath, outputPath, force)) continue;
       const success = await frameAndroidScreenshot(inputPath, outputPath);
       if (success) totalFramed++;
     }
@@ -805,7 +852,7 @@ async function frameCommand(dir, options) {
 var program = new Command();
 program.name("device-shots").description(
   "Capture and frame mobile app screenshots from iOS simulators and Android emulators"
-).version("0.6.1");
+).version("0.7.0");
 program.command("capture").description("Capture screenshots from running devices").argument("[name]", "Screenshot name").option("-b, --bundle-id <id>", "App bundle ID").option("-o, --output <dir>", "Output directory").option("-p, --platform <platform>", "ios, android, or both").option("--no-frame", "Skip framing after capture").option("--time <time>", "Status bar time", "9:41").action(async (name, opts) => {
   await captureCommand({ name, ...opts });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "device-shots",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "description": "Capture and frame mobile app screenshots from iOS simulators and Android emulators",
   "type": "module",
   "bin": {
@@ -14,7 +14,8 @@
   "scripts": {
     "build": "tsup",
     "dev": "tsup --watch",
-    "typecheck": "tsc --noEmit"
+    "typecheck": "tsc --noEmit",
+    "prepublishOnly": "tsup"
   },
   "keywords": [
     "screenshot",

package/vendor/frame.py

@@ -10,6 +10,7 @@ Requirements:
     pip install device-frames-core Pillow
 """
 
+import json
 import sys
 from pathlib import Path
 
@@ -18,6 +19,9 @@ from device_frames_core import apply_frame, list_devices
 VARIATION_PREFERENCE = ["space-black", "black", "space-grey", "silver"]
 IOS_CATEGORIES = {"apple-iphone", "apple-ipad"}
 
+# Machine-readable summary line, parsed by src/framing/frame.ts.
+RESULT_PREFIX = "__DEVICE_SHOTS_RESULT__"
+
 
 def build_resolution_map():
     """Map (width, height) -> best matching iOS device info."""
@@ -46,6 +50,28 @@ def get_image_size(path):
         return img.size
 
 
+def is_framed_output(path):
+    """True if path is one of our own framed outputs rather than a raw capture."""
+    return path.stem.endswith("_framed")
+
+
+def needs_framing(raw_path, framed_path, force):
+    """True if raw_path has no current framed output.
+
+    Existence alone is not enough: `capture` overwrites a raw screenshot in
+    place, leaving a stale framed output next to it.
+    """
+    if force or not framed_path.exists():
+        return True
+    return raw_path.stat().st_mtime > framed_path.stat().st_mtime
+
+
+def emit_result(framed, skipped, failed):
+    """Report counts to the Node caller, which owns user-facing totals."""
+    payload = {"framed": framed, "skipped": skipped, "failed": failed}
+    print(f"{RESULT_PREFIX} {json.dumps(payload)}")
+
+
 def frame_screenshot(input_path, output_path, res_map):
     """Frame a single screenshot, auto-detecting the device."""
     width, height = get_image_size(input_path)
@@ -82,25 +108,28 @@ def main():
     framed_dir = Path(args[1])
     framed_dir.mkdir(parents=True, exist_ok=True)
 
-    res_map = build_resolution_map()
-
-    screenshots = sorted(raw_dir.glob("*.png"))
+    # raw_dir and framed_dir are usually the same directory, so our own
+    # framed outputs would otherwise be picked up as inputs to re-frame.
+    screenshots = sorted(f for f in raw_dir.glob("*.png") if not is_framed_output(f))
     if not screenshots:
         print("No screenshots found.")
-        sys.exit(1)
+        emit_result(0, 0, 0)
+        return
+
+    res_map = build_resolution_map()
 
     skipped = 0
     to_frame = []
 
     for f in screenshots:
-        framed_name = f"{f.stem}_framed.png"
-        if not force and (framed_dir / framed_name).exists():
-            skipped += 1
-        else:
+        if needs_framing(f, framed_dir / f"{f.stem}_framed.png", force):
             to_frame.append(f)
+        else:
+            skipped += 1
 
     if not to_frame:
         print(f"All {skipped} screenshots already framed. Nothing to do.")
+        emit_result(0, skipped, 0)
         return
 
     if skipped:
@@ -114,6 +143,7 @@ def main():
             success += 1
 
     print(f"Done! Framed {success}/{len(to_frame)} screenshots.")
+    emit_result(success, skipped, len(to_frame) - success)
 
 
 if __name__ == "__main__":