Update icon previews

.github/clean.py

@@ -8,6 +8,7 @@
 
 from defs import THEME_DIR, from_src
 from schema import config_schema
+from generate_icons import ensure_has_icon_preview
 
 UNWANTED_FOLDERS = ["__MACOSX", "skin_640_480"]
 UNWANTED_FILES = ["Thumbs.db", ".DS_Store"]
@@ -155,6 +156,9 @@ def clean_configs(theme_dir):
         if not os.path.exists(config_path):
             continue
 
+        icons_path = os.path.join(os.path.dirname(root), "icons")
+        ensure_has_icon_preview(icons_path)
+
         with open(config_path, "r", encoding="utf-8") as fp:
             config = json.load(fp)
 

.github/data/icons_blacklist.txt

@@ -27,3 +27,6 @@ Power Onions OS by LeonardoDaPinchy
 Pokemon Mystery Dungeon by Sheezie
 Milk Black by Segich + Nemi
 PocketFighterMini by nGlory
+Lifestream by Inheritor
+Hello Miyoo by tenlevels
+Silky Remix SUPER GAME BOY by MLOPEZMAD

.github/defs.py

@@ -8,6 +8,7 @@ def rel_path(path: str, from_path: str) -> str:
 
 THEME_DIR = from_src("../themes")
 RELEASE_DIR = from_src("../release")
+RELEASE_ICONS_DIR = from_src("../release/icons")
 PAGES_DIR = from_src("../generated")
 TEMP_DIR = from_src("temp")
 

.github/generate_icons.py

@@ -113,18 +113,27 @@ def generate_preview_image(output_path: str, icon_paths: list[str], cols: int =
     output.save(output_path)
 
 
-def ensure_has_icon_preview(icons_dir: str):
+def ensure_has_icon_preview(icons_dir: str, force_mode: bool = False):
     if not os.path.isdir(icons_dir):
         return
 
     preview_path = os.path.join(icons_dir, f"preview.png")
 
-    if not os.path.isfile(preview_path):
+    if not os.path.isfile(preview_path) or force_mode:
         print(f"Generating icon pack preview: {preview_path}")
-        icon_paths = [os.path.join(icons_dir, f"{icon}.png") for icon in PREVIEW_ICONS]
-        icon_paths_exist = [p for p in icon_paths if os.path.isfile(p)]
+        icon_paths = [find_icon(icons_dir, icon, try_selected=i == 2) for i, icon in enumerate(PREVIEW_ICONS)]
+        icon_paths_exist = [p for p in icon_paths if p]
 
         if len(icon_paths_exist) == 0:
             return
 
         generate_preview_image(preview_path, icon_paths_exist)
+
+
+def find_icon(icons_dir: str, icon: str, try_selected: bool):
+    if try_selected:
+        path = os.path.join(icons_dir, "sel", f"{icon}.png")
+        if os.path.isfile(path):
+            return path
+    path = os.path.join(icons_dir, f"{icon}.png")
+    return path if os.path.isfile(path) else None

.github/release.py

@@ -23,8 +23,8 @@ def main():
 
     themes = get_subdirs(THEME_DIR)
 
-    if not os.path.exists(RELEASE_DIR):
-        os.makedirs(RELEASE_DIR)
+    if not os.path.exists(RELEASE_ICONS_DIR):
+        os.makedirs(RELEASE_ICONS_DIR)
 
     featured = get_lines(FEATURED_ORDERING)
     remixed = get_lines(REMIXED_ORDERING)
@@ -67,7 +67,7 @@ def build_release(theme: str, custom: list[str], all_existing: list[str]):
     if theme not in all_existing:
         custom.append(theme)
 
-    ensure_has_icon_preview(os.path.join(src_path, "icons"))
+    ensure_has_icon_preview(os.path.join(src_path, "icons"), force_mode=True)
 
     rel_index = len(src_path if has_subdirs else os.path.dirname(src_path)) + 1
 
@@ -88,7 +88,7 @@ def build_release(theme: str, custom: list[str], all_existing: list[str]):
 
 def build_icon_pack(icon_pack, all_icons) -> bool:
     src_path = os.path.join("icons", icon_pack)
-    zip_path = os.path.join("release/icons", f"{icon_pack}.zip")
+    zip_path = os.path.join(RELEASE_ICONS_DIR, f"{icon_pack}.zip")
 
     if icon_pack not in all_icons:
         all_icons.append(icon_pack)
@@ -97,7 +97,7 @@ def build_icon_pack(icon_pack, all_icons) -> bool:
         return False
 
     clean_unwanted_files(src_path)
-    ensure_has_icon_preview(src_path)
+    ensure_has_icon_preview(src_path, force_mode=True)
 
     rel_index = len(os.path.dirname(src_path)) + 1