[dist] Improve logo ledgibility at small sizes

Author: Breakthrough

dist/generate_ico.py

@@ -13,22 +13,67 @@
 
 from PIL import Image, ImageFilter
 
-# Different raster sizes to include in the ICO file.
-SIZES = [16, 24, 32, 48, 64, 128, 256]
+# Colors matching the SVG design
+BG = (224, 232, 240, 255)  # #e0e8f0
+FG = (42, 53, 69, 255)  # #2a3545
+
+RASTER_SIZES = [16, 24, 32, 48, 64, 128, 256]
 
-# Sharpen smaller sizes to improve ledgibility.
 SHARPEN_AMOUNT = {
-    16: 200,
-    24: 200,
-    32: 100,
-    48: 50,
-    64: 50,
+    24: 75,
+    32: 75,
+    48: 75,
+    64: 100,
+    128: 150,
+    256: 150,
 }
 
+SHARPEN_RADIUS = 0.5
+
 DIST_DIR = Path(__file__).resolve().parent
-SVG_PATH = DIST_DIR / "pyscenedetect.svg"
+LOGO_DIR = DIST_DIR / "logo"
 ICO_PATH = DIST_DIR / "pyscenedetect.ico"
 
+SVG_FOR_SIZE: dict[int, Path] = {
+    24: LOGO_DIR / "pyscenedetect-24-48.svg",
+    32: LOGO_DIR / "pyscenedetect-32.svg",
+    48: LOGO_DIR / "pyscenedetect-24-48.svg",
+    64: LOGO_DIR / "pyscenedetect-64+.svg",
+    128: LOGO_DIR / "pyscenedetect-64+.svg",
+    256: LOGO_DIR / "pyscenedetect-64+.svg",
+}
+
+
+def make_icon_16() -> Image.Image:
+    """Create a hand-crafted 16x16 clapperboard icon."""
+    img = Image.new("RGBA", (16, 16), FG)
+    px = img.load()
+
+    # Clear 1px padding on all sides
+    for i in range(16):
+        px[0, i] = BG
+        px[15, i] = BG
+        px[i, 0] = BG
+        px[i, 15] = BG
+
+    # Arm stripe gaps (rows 2–4): clear pixels not part of a complete stripe.
+    # A stripe x+y=s spans all 3 arm rows only when 5 <= s <= 16.
+    for y in range(2, 5):
+        for x in range(1, 15):
+            if y < 4 and x < 3:
+                continue
+            if y > 2 and x > 12:
+                continue
+            if not ((x + y) % 4 < 2 and 5 <= (x + y) <= 16):
+                px[x, y] = BG
+
+    # Slate interior (rows 8–12, cols 3–12)
+    for y in range(8, 13):
+        for x in range(3, 13):
+            px[x, y] = BG
+
+    return img
+
 
 def find_inkscape() -> str:
     """Find the Inkscape executable."""
@@ -55,15 +100,21 @@ def render_svg(inkscape: str, svg: Path, output: Path, size: int):
 def render_all_sizes(inkscape: str, work_dir: Path) -> list[Image.Image]:
     """Render the SVG at all icon sizes, applying sharpening where configured."""
     images = []
-    for size in SIZES:
+    for size in RASTER_SIZES:
         png_path = work_dir / f"icon_{size}.png"
-        print(f"  Rendering {size}x{size}...")
-        render_svg(inkscape, SVG_PATH, png_path, size)
-        img = Image.open(png_path).copy()
-        if size in SHARPEN_AMOUNT:
-            img = img.filter(ImageFilter.UnsharpMask(radius=0.5, percent=SHARPEN_AMOUNT[size], threshold=0))
-            print(f"    Sharpened {size}x{size} (USM {SHARPEN_AMOUNT[size]}%)")
+        if size == 16:
+            print(f"  Using hand-crafted {size}x{size} icon...")
+            img = make_icon_16()
             img.save(png_path)
+        else:
+            svg_path = SVG_FOR_SIZE[size]
+            print(f"  Rendering {size}x{size} using {svg_path.name}...")
+            render_svg(inkscape, svg_path, png_path, size)
+            img = Image.open(png_path).copy()
+            if size in SHARPEN_AMOUNT:
+                img = img.filter(ImageFilter.UnsharpMask(radius=SHARPEN_RADIUS, percent=SHARPEN_AMOUNT[size], threshold=0))
+                print(f"    Sharpened {size}x{size} (USM {SHARPEN_AMOUNT[size]}%)")
+                img.save(png_path)
         images.append(img)
     return images
 
@@ -76,7 +127,7 @@ def main():
 
     inkscape = find_inkscape()
     print(f"Using Inkscape: {inkscape}")
-    print(f"Input SVG: {SVG_PATH}")
+    print(f"Logo directory: {LOGO_DIR}")
 
     ctx = contextlib.nullcontext(str(persist_dir)) if persist_dir else tempfile.TemporaryDirectory()
     with ctx as work: