Add PyInstaller spec and Gitea Actions CI for Linux/Windows binaries

- run.py: top-level entry point for PyInstaller (relative imports need it)
- psp-preserve.spec: onedir build bundling DATs, loader, cover bundles, icons
- requirements-build.txt: pinned build deps (PySide6 6.8.3 for Windows ICU fix)
- .gitea/workflows/build.yml: builds linux + windows artifacts on tags/manual
- gitignore build/ dist/

.env.example

@@ -0,0 +1,12 @@
+# Copy this file to `.env` and fill in your values. `.env` is git-ignored.
+
+# Static LAN IP for the API container on Unraid's macvlan bridge (br0).
+PSP_LAN_IP=192.168.10.100
+
+# Host paths mounted into the container (Unraid shares).
+PSP_STORE_HOST=/mnt/user/downloads/Sony - PlayStation Portable
+PSP_UMD_GAMES_HOST=/mnt/user/psp/umd_games
+PSP_UMD_VIDEOS_HOST=/mnt/user/psp/umd_videos
+
+# Secret token the desktop app sends as `Authorization: Bearer <token>`.
+PSP_API_TOKEN=

.gitea/workflows/build.yml

@@ -0,0 +1,60 @@
+name: build
+
+on:
+  push:
+    tags: ["v*"]
+  workflow_dispatch:
+
+jobs:
+  linux:
+    name: Linux x86_64
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
+      - name: Install build dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements-build.txt
+
+      - name: Build
+        run: pyinstaller --clean --noconfirm psp-preserve.spec
+
+      - name: Package tarball
+        run: tar -czf psp-preserve-linux-x86_64.tar.gz -C dist psp-preserve
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: psp-preserve-linux-x86_64
+          path: psp-preserve-linux-x86_64.tar.gz
+
+  windows:
+    name: Windows x64
+    runs-on: windows
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
+      - name: Install build dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements-build.txt
+
+      - name: Build
+        run: pyinstaller --clean --noconfirm psp-preserve.spec
+
+      - name: Package zip
+        shell: pwsh
+        run: Compress-Archive -Path dist\psp-preserve -DestinationPath psp-preserve-windows-x64.zip
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: psp-preserve-windows-x64
+          path: psp-preserve-windows-x64.zip

.gitignore

@@ -10,3 +10,17 @@ session-transcript-2026-09-01.md
 # Copyrighted PSN EBOOTs (base.pbp) used only for local PS1 conversion testing
 data/*.PBP
 data/*.pbp
+
+# User-supplied PS1 Classics art templates (extracted from copyrighted PSN
+# EBOOTs) — kept local only; the app falls back to drawn art when absent.
+data/ps1_templates/
+
+# nps tsv files
+data/nps/*.tsv
+
+# Local environment overrides (LAN paths, secrets). See .env.example
+.env
+
+# PyInstaller output
+build/
+dist/

README.md

@@ -1,25 +1,27 @@
 # PSP Preservation Tool
+the name is terrible, i know.
 
 ![AI Generated](https://raw.githubusercontent.com/dotnetdave/ai-usage-badges/refs/heads/main/badges/png/1x/ai-generated.png)
 
-Native Linux GUI (PySide6) for preserving PSP UMD **games** and **videos** as
+A cross-platform (Linux + Windows) desktop GUI — PySide6 — for preserving PSP
-`.iso` files. It scans your discs, verifies them against the full Redump catalog
+UMD **games** and **videos** as `.iso` files. It scans your discs, verifies them
-(Redump DATs), reports what's missing, and retags/renames discs to a canonical
+against the Redump/No-Intro catalogs, reports what's missing, and retags/renames
-scheme. It also fetches cover art and metadata, syncs discs and save-data with a
+discs to a canonical scheme. It fetches cover art and metadata, syncs discs and
-real PSP, can pull missing discs from your own Redump 7z archive collection, and
+save-data with a real PSP, can pull missing discs from a Redump 7z archive
-converts PlayStation 1 ISO/CUE/BIN rips into PSP `EBOOT.PBP` homebrew.
+collection, downloads PSN content from NoPayStation, and converts PlayStation 1
+ISO/CUE/BIN rips into PSP `EBOOT.PBP` homebrew.
 
 ![PSP Preservation Tool](img/qt-gui.png)
-* Use default app theme for Qt.
+* Dark theme with a blue accent — the Library tab in cover view. *
 
 ## Features
 
 - **Library** — scan folders of `.iso` discs, verify against the DAT catalog,
   browse with cover art, search/filter, see per-game details (developer,
   publisher, genre, release date, synopsis, trailer), and launch discs in PPSSPP.
-- **Store** — browse and download discs from three sources: a local 7z folder,
+- **Store** — browse and download discs from four sources: a local 7z folder,
-  your own HTTP store server, or an archive.org item (see
+  your own HTTP store server, an archive.org item, or NoPayStation (PSP/PS1
-  [Store](#store--archiveorg-and-local-folder)).
+  PSN `.pkg` content) (see [Store](#store--archiveorg-and-local-folder)).
 - **Queue** — background transfers with progress, cancel, per-row delete, etc.
 - **PSP Sync** — detect a connected PSP (USB) or a mounted UMD, inventory what's
   installed (games / UMD videos / homebrew / PKG), copy discs to the PSP, delete
@@ -34,11 +36,15 @@ converts PlayStation 1 ISO/CUE/BIN rips into PSP `EBOOT.PBP` homebrew.
 
 ## Requirements
 
-- Linux + Python 3
+- Python 3.10+ on Linux or Windows
-- `PySide6` — the only Python dependency (`pip install -r requirements.txt`)
+- `PySide6`, `curl_cffi`, `pycryptodome` (`pip install -r requirements.txt`)
-- `7z` (p7zip) — used to peek/extract disc images from store archives
+- `7z` (p7zip / 7-Zip) — used to peek/extract disc images from store archives
 - PPSSPP (optional) — to launch discs from the details panel
 
+NoPayStation `.pkg` files are decrypted by the bundled **pure-Python
+decryptor** (`app/pkg.py`) — no Wine or `pkg2zip` required
+(see [NoPayStation](#4-nopaystation)).
+
 ## Install
 
 ```bash
@@ -53,6 +59,57 @@ pip install -r requirements.txt
 python3 -m app.main
 ```
 
+## Building binaries
+
+The GUI is packaged with PyInstaller into a self-contained folder. Build
+requirements are pinned in `requirements-build.txt` (PySide6 6.8.3 on purpose —
+see the note inside).
+
+```bash
+python3 -m venv .venv-build
+. .venv-build/bin/activate
+pip install -r requirements-build.txt
+pyinstaller --clean --noconfirm psp-preserve.spec
+# output: dist/psp-preserve/  → run dist/psp-preserve/psp-preserve
+```
+
+Notes:
+
+- The build bundles the DATs, PS1 loader, and the offline cover bundles. The
+  cover zips are large (~850 MB), so builds are slow and the output is big.
+- `7z` (p7zip-full on Linux, 7-Zip on Windows) is a **runtime** dependency for
+  reading store archives — it is not bundled.
+- User data (credentials, manual covers, PS1 templates, NPS cache, library DB,
+  cover cache) lives in the OS state dir, never next to the binary.
+
+### CI (Gitea Actions)
+
+`.gitea/workflows/build.yml` builds Linux and Windows artifacts on version-tag
+pushes (`v*`) or on manual trigger (**Actions → build → Run workflow**).
+Artifacts appear on the Actions run page and can be attached to a release.
+
+Each job needs a [Gitea Actions runner](https://docs.gitea.com/usage/actions/act-runner)
+registered with the matching label:
+
+```bash
+# Linux runner (Docker mode, run on your server)
+./act_runner register \
+  --instance https://git.ceaf.dev \
+  --token <registration-token> \
+  --name linux-builder \
+  --labels ubuntu-latest:docker://node:20-bookworm
+
+# Windows runner (host mode, run on a Windows machine)
+act_runner.exe register \
+  --instance https://git.ceaf.dev \
+  --token <registration-token> \
+  --name win-builder \
+  --labels windows:host
+```
+
+The registration token is generated in Gitea under
+**Site Administration → Actions → Runners → Create new runner**.
+
 ## First-time setup
 
 1. Put your DAT files in `data/dats/`:
@@ -61,14 +118,15 @@ python3 -m app.main
      Redump lacks — keeps serial-based matching working).
    - videos: No-Intro `Sony - PlayStation Portable (UMD Video)` (Redump has
      no UMD Video DAT).
-2. Ingest them into the local SQLite library:
+2. Start the app — any DATs missing from the library are ingested automatically
+   at startup (no manual step). You can also re-ingest on demand:
 
    ```bash
    python3 -m app.ingest
    ```
 
-3. Open the GUI and point **Settings → General → Games/Videos directory** at
+3. Point **Settings → General → Games/Videos directory** at your disc folders
-   your disc folders (or set `PSP_GAMES_ROOTS` / `PSP_VIDEO_ROOTS`).
+   (or set `PSP_GAMES_ROOTS` / `PSP_VIDEO_ROOTS`).
 4. (Optional) PS1 conversion — copy any PSN PS1 classic `EBOOT.PBP` to
    `data/base.PBP` (it supplies Sony's encrypted loader). Then set the **PS1
    directory**, **PS1 output directory** and **PS1 base.pbp** in
@@ -97,13 +155,21 @@ Discs are matched by hash first (most precise), then serial, then filename.
   + a base `PARAM.SFO`/icon for PS1 conversion (git-ignored, copyrighted).
 - `data/loader/DATA.PSP` + `data/loader/KEYS.BIN` — bundled plain-ELF POPS
   loader and NPDRM version key (from iPoPS, MIT).
-- State dir (`~/.local/state/psp-preserve/` by default, or `$XDG_STATE_HOME/psp-preserve`):
+- `data/ps1_templates/` — optional PS1 Classics art templates
+  (`ICON0.PNG` case frame, `PIC1.PNG` launch background); the app falls back
+  to drawn art when they're absent.
+- `data/nps/` — NoPayStation TSV lists (cached here on first store scan in dev;
+  a packaged build stores them under the state dir instead).
+- State dir (`~/.local/state/psp-preserve/` on Linux, `%LOCALAPPDATA%\PSPPreserve`
+  on Windows, or `$PSP_STATE_DIR`):
   - `library.sqlite` — the catalog + library database.
   - `covers/` — downloaded cover cache.
+  - `data/` — user-writable data in packaged builds (credentials, manual
+    covers, PS1 templates, NPS TSV cache).
 
 SQLite is kept on a local disk because SQLite locking is unreliable over
-network filesystems; the DATs, manual covers and credentials stay in `data/`
+network filesystems. Read-only resources (DATs, the POPS loader, icons) are
-(which may be a network share).
+bundled with the app; user-writable data lives in the state dir.
 
 ## Configuration
 
@@ -122,14 +188,17 @@ QSettings under `PSPPreserve`) taking precedence where noted.
 | `PSP_PS1_ROOTS` | `/data/ps1` | comma-separated PS1 disc roots |
 | `PSP_PS1_OUTPUT_DIR` | `/data/ps1_converted` | converted EBOOT.PBP output folder |
 | `PSP_SCAN_WORKERS` | `1` | parallel hashing workers |
-| `PSP_STORE_DIR` | `/media/downloads/Sony - PlayStation Portable` | local 7z store folder |
+| `PSP_STORE_DIR` | `/data/store` | local 7z store folder |
 | `PSP_STORE_SERVER` | `https://psp.example.com` | store server base URL |
 | `PSP_STORE_TOKEN` | *(empty)* | store server bearer token |
 | `PSP_ARCHIVE_ITEM` | `psp-redump-roms321.com` | archive.org item identifier |
 | `PSP_ARCHIVE_LOGGED_IN_SIG` | *(empty)* | archive.org `logged-in-sig` cookie |
 | `PSP_ARCHIVE_LOGGED_IN_USER` | *(empty)* | archive.org `logged-in-user` cookie |
+| `PSP_NPS_DIR` | `<state>/nps` | NoPayStation output folder |
+| `PSP_NPS_TSV_BASE` | `https://nopaystation.com/tsv/` | NoPayStation TSV base URL |
 | `PSP_API_TOKEN` | *(empty)* | server API bearer token (unset = open) |
-| `PSP_CREDENTIALS` | `$PSP_DATA_DIR/credentials.json` | credentials file |
+| `PSP_USER_DATA_DIR` | `<state>/data` (packaged) / `./data` (dev) | user-writable data (credentials, manual covers, PS1 templates, NPS cache) |
+| `PSP_CREDENTIALS` | `$PSP_USER_DATA_DIR/credentials.json` | credentials file |
 | `PSP_LIBRETRO_COVERS_URL` | *(empty)* | direct URL for `libretro-covers.zip` (else derived from store server) |
 | `PSP_OVGDB_COVERS_URL` | *(empty)* | direct URL for `openvgdb-covers.zip` (else derived from store server) |
 
@@ -202,12 +271,23 @@ PS1 discs (pending) and converted EBOOTs also show up in the **Library** tab
   compressed PSAR) plus a `KEYS.BIN` (NPDRM version key used to decrypt the
   `STARTDAT` PGD), ready to copy to `<PSP>/PSP/GAME/<Game ID>/`. Compatible
   with CFW POPS (ARK-4/ARK-5).
+- **Artwork** — the converter fetches the game's real cover art (libretro /
+  ScreenScraper / IGDB / Wikipedia, reusing the local cover cache) and builds
+  official-style PS1 Classics art:
+  - `ICON0` (80×80) — the cover composited into the bundled case frame
+    (`data/ps1_templates/ICON0.PNG`) with the PlayStation logo + wordmark;
+  - `PIC0` (310×180) — a PSN-style info board with the game title, a
+    description from IGDB, an ESRB rating badge and PS3/PSP platform badges;
+  - `PIC1` (480×272) — the bundled launch background
+    (`data/ps1_templates/PIC1.PNG`).
+  If the template images are missing the app falls back to drawn art, and to
+  the base icon when no cover is found.
 
 Configure the folders in **Settings → General** (or `PSP_PS1_ROOTS` /
 `PSP_PS1_OUTPUT_DIR`). Current limits: single-disc games only (no multi-disc
 PBP); disc data is DEFLATE-compressed (level 1 by default, `--complevel 0-9`).
 
-## Store — archive.org and local folder
+## Store — four sources
 
 The **Store** tab downloads missing discs from a Redump 7z archive collection
 (`Name (Region) (tags).7z`, containing the `.iso`/`.cso` inside). It has three
@@ -243,6 +323,48 @@ If the item's files are marked **private** (login required), set the
 from a logged-in archive.org browser session). Without them, private files are
 skipped — and you'll get a clear error if *everything* in the item is private.
 
+### 4. NoPayStation
+
+The **NoPayStation** source lists PSN content from
+[NoPayStation](https://nopaystation.com/), selectable from the content-type
+dropdown next to the source selector:
+
+- **PSP Games** (`PSP_GAMES.tsv`) — includes **minis** (also listed separately
+  in the `Type` column), PC Engine and NeoGeo releases.
+- **PS1 Classics** (`PSX_GAMES.tsv`)
+- **PSP Themes** (`PSP_THEMES.tsv`)
+- **PSP DLC** (`PSP_DLCS.tsv`)
+
+Requirements & behaviour:
+
+1. `.pkg` files are decrypted by the built-in **pure-Python decryptor**
+   (`app/pkg.py`, powered by `pycryptodome` for speed) — no Wine and no
+   `pkg2zip` needed.
+2. Set **NoPayStation output dir** in **Settings → Store** (default
+   `$PSP_STATE_DIR/nps`).
+3. Downloads land in the NPS folder and appear in the **Library**:
+   - PSP game → `PSP/<TITLE_ID>/EBOOT.PBP` (`psp_kind="eboot"`).
+   - PS1 Classic → `PSX/<TITLE_ID>/EBOOT.PBP` (+ `DOCUMENT.DAT`, `KEYS.BIN`).
+   - Theme → `THEME/<TITLE_ID>/<content_id>.ptf` (the packaged PTF is
+     EDAT-unwrapped to a raw theme file).
+   - DLC → `DLC/<GAME_ID>/<content_id>.edat` (installed as-is into the owning
+     game's folder).
+4. Copying to the PSP puts games/PS1 under `/PSP/GAME/` (optionally nested in
+   a Category Lite folder), themes under `/PSP/THEME/`, and DLC under
+   `/PSP/GAME/<GAME_ID>/`.
+5. The TSV lists are cached in `data/nps/` and refreshed on each store scan
+   (drop the `.tsv` files there manually to work offline).
+
+> **DRM note:** NPS content is PSN-DRM'd. To *run* it on the PSP you need the
+> [`npdrm_free`](https://github.com/qwikrazor87/npdrm_free) plugin (ARK and most
+> CFW already ship it). The desktop app only downloads and decrypts; it doesn't
+> strip DRM.
+>
+> **Covers/metadata:** themes and DLC have no cover art or game metadata of
+> their own — the app scrapes them like games (IGDB/libretro/etc.), which can
+> return unrelated results. Downloaded themes keep their embedded preview as
+> the primary cover (used instead of a scraped image when available).
+
 ## Server setup
 
 The catalog + store API is a single-file, stdlib-only HTTP server
@@ -283,13 +405,14 @@ Token protection: set `PSP_API_TOKEN`; the client sends
 macvlan bridge so it gets its own LAN IP (e.g. `192.168.1.100`, plain HTTP on 8000):
 
 ```bash
-# in /path/to/psp-preserve/ — adjust the volume paths for your shares
+# in /path/to/psp-preserve/
-printf 'PSP_API_TOKEN=<long-random-secret>\n' > .env
+cp .env.example .env   # then edit: LAN IP, share paths, API token
 docker compose up -d --build
 ```
 
-The compose file mounts your Unraid shares into `/data/store`, `/data/umd_games`
+The compose file reads the LAN IP and Unraid share paths from `.env` and
-and `/data/umd_videos` (the store is mounted read-only).
+mounts them into `/data/store`, `/data/umd_games` and `/data/umd_videos`
+(the store is mounted read-only).
 
 ### TLS (optional)
 
@@ -309,12 +432,14 @@ token**, then pick **Server** in the Store tab's source selector. Use
 
 Connect a PSP over USB (or mount a UMD) and the **PSP Sync** tab detects it:
 
-- **Games / UMD Videos / Homebrew-PSN / PKG** — tables of what's installed, with
+- **Games / UMD Videos / Homebrew-PSN / Themes / DLC / PKG** — tables of what's
-  delete-from-PSP (checkboxes and right-click).
+  installed, with delete-from-PSP (checkboxes and right-click).
 - **UMD** — reads `PARAM.SFO` from a mounted UMD, shows the title/serial, and
   can dump the disc image into your library.
 - **Sync from Library** — copy discs from your library onto the PSP, optionally
   into a Category Lite category (set in **Settings → PSP → ISO category**).
+  NoPayStation PSP games install under `/PSP/GAME`, optionally nested in the
+  **PSP game category**; PS1 Classics use the **PS1 category**.
 
 ## Saves sync
 

app/config.py

@@ -1,8 +1,20 @@
 """Central configuration, driven by environment variables."""
 import os
+import sys
 from pathlib import Path
 
-PROJECT_ROOT = Path(__file__).resolve().parent.parent
+# PyInstaller sets ``sys.frozen`` and unpacks bundled files to ``sys._MEIPASS``.
+# Read-only resources (DATs, loader, icons) then live in the bundle; otherwise
+# they live in the project checkout.
+IS_FROZEN = getattr(sys, "frozen", False)
+_BUNDLE_DIR = getattr(sys, "_MEIPASS", None)
+
+PROJECT_ROOT = Path(_BUNDLE_DIR).resolve() if _BUNDLE_DIR else Path(__file__).resolve().parent.parent
+
+
+def resource_path(*parts):
+    """Absolute path to a read-only bundled resource (works when frozen)."""
+    return PROJECT_ROOT.joinpath(*parts)
 
 DATA_DIR = Path(os.environ.get("PSP_DATA_DIR", str(PROJECT_ROOT / "data")))
 DATS_DIR = Path(os.environ.get("PSP_DATS_DIR", str(DATA_DIR / "dats")))
@@ -12,9 +24,12 @@ def _default_state_dir():
     """Local state directory (fast, reliable local disk).
 
     SQLite locking is unreliable over network filesystems (SMB/FUSE), so the
-    library DB and the cover cache live on local storage while DATs, manual
+    library DB and the cover cache live on local storage while read-only DATs
-    covers and credentials stay in ``DATA_DIR`` (which may be a network share).
+    stay bundled with the app.
     """
+    if os.name == "nt":
+        base = os.environ.get("LOCALAPPDATA") or os.environ.get("APPDATA") or str(Path.home())
+        return Path(base) / "PSPPreserve"
     xdg = os.environ.get("XDG_STATE_HOME")
     base = Path(xdg) if xdg else Path.home() / ".local" / "state"
     return base / "psp-preserve"
@@ -23,14 +38,24 @@ def _default_state_dir():
 STATE_DIR = Path(os.environ.get("PSP_STATE_DIR", str(_default_state_dir())))
 DB_PATH = Path(os.environ.get("PSP_DB_PATH", str(STATE_DIR / "library.sqlite")))
 COVERS_DIR = Path(os.environ.get("PSP_COVERS_DIR", str(STATE_DIR / "covers")))
+# User-writable data (credentials, manual covers, PS1 templates, NPS TSV cache).
+# In dev this is the checkout's ``data/``; when frozen the bundle is read-only,
+# so it points at local state that survives app upgrades.
+USER_DATA_DIR = Path(os.environ.get(
+    "PSP_USER_DATA_DIR", str(DATA_DIR if not IS_FROZEN else STATE_DIR / "data")))
 LEGACY_DB_PATH = DATA_DIR / "library.sqlite"
 LEGACY_COVERS_DIR = DATA_DIR / "covers"
 
+
+def user_data_path(*parts):
+    """Absolute path to a user-writable data file/folder (works when frozen)."""
+    return USER_DATA_DIR.joinpath(*parts)
+
 # Redump 7z store (browsable in the Store tab). Env override; GUI setting wins.
-STORE_ROOT = Path(os.environ.get("PSP_STORE_DIR", "/media/downloads/Sony - PlayStation Portable"))
+STORE_ROOT = Path(os.environ.get("PSP_STORE_DIR", "/data/store"))
 
 # Remote store server (HTTPS). Used by the Store tab as the primary source.
-STORE_SERVER_URL = os.environ.get("PSP_STORE_SERVER", "https://psp.ceaf.dev")
+STORE_SERVER_URL = os.environ.get("PSP_STORE_SERVER", "https://psp.example.com")
 STORE_TOKEN = os.environ.get("PSP_STORE_TOKEN", "")
 
 # Optional direct URLs for the offline cover bundle zips. When unset, the GUI
@@ -46,6 +71,11 @@ ARCHIVE_ITEM = os.environ.get("PSP_ARCHIVE_ITEM", "psp-redump-roms321.com")
 ARCHIVE_LOGGED_IN_SIG = os.environ.get("PSP_ARCHIVE_LOGGED_IN_SIG", "")
 ARCHIVE_LOGGED_IN_USER = os.environ.get("PSP_ARCHIVE_LOGGED_IN_USER", "")
 
+# NoPayStation: where extracted .pkg content lands, and the TSV source base.
+# PSP games go to <NPS_OUTPUT_DIR>/PSP/<TITLE_ID>/; PS1 Classics to .../PSX/.
+NPS_OUTPUT_DIR = Path(os.environ.get("PSP_NPS_DIR", str(STATE_DIR / "nps")))
+NPS_TSV_BASE = os.environ.get("PSP_NPS_TSV_BASE", "https://nopaystation.com/tsv/")
+
 # Scan roots (used by the scanner phase). Comma-separated in env.
 GAMES_ROOTS = [Path(p) for p in os.environ.get("PSP_GAMES_ROOTS", "/data/umd_games").split(",") if p.strip()]
 VIDEO_ROOTS = [Path(p) for p in os.environ.get("PSP_VIDEO_ROOTS", "/data/umd_videos").split(",") if p.strip()]

app/covers.py

@@ -52,7 +52,7 @@ _IGDB_IMAGE = "https://images.igdb.com/igdb/image/upload/"
 _TMDB_SEARCH = "https://api.themoviedb.org/3/search/movie"
 _TMDB_IMAGE = "https://image.tmdb.org/t/p/"
 _GOOGLE_CSE_API = "https://www.googleapis.com/customsearch/v1"
-_MANUAL_DIR = config.DATA_DIR / "manual_covers"
+_MANUAL_DIR = config.USER_DATA_DIR / "manual_covers"
 _OVGDB_ZIP = config.DATA_DIR / "covers" / "openvgdb-covers.zip"
 _LIBRETRO_ZIP = config.DATA_DIR / "covers" / "libretro-covers.zip"
 
@@ -411,6 +411,9 @@ def _fetch_libretro(name, timeout, system="games", indexed_only=False):
         data = fetch_libretro_local(name)
         if data is not None:
             return data
+    # Theme/DLC share the PSP thumbnails repo, so reuse the games index instead
+    # of downloading a duplicate copy of the same tree under a new system key.
+    idx_system = system if system in _PLATFORMS else "games"
     if not indexed_only:
         # 1. Cheap: exact + progressively stripped names (no index needed).
         for kind in _LIBRETRO_KINDS:
@@ -421,7 +424,7 @@ def _fetch_libretro(name, timeout, system="games", indexed_only=False):
     # 2. Fuzzy/exact via the precomputed index (covers exact names too, so the
     #    bulk loader skips the wasteful exact pass entirely).
     for kind in _LIBRETRO_KINDS:
-        best = _index_best(name, kind, system)
+        best = _index_best(name, kind, idx_system)
         if best:
             data = _fetch_png(best, kind, timeout, system)
             if data is not None:
@@ -808,6 +811,346 @@ def compose_game_cover(key_art_bytes):
     return bytes(ba)
 
 
+_PS1_TEMPLATE_DIR = config.USER_DATA_DIR / "ps1_templates"
+
+
+def _ps1_template_bytes(name):
+    """Read a bundled PS1 art template (``ICON0.PNG`` / ``PIC1.PNG``)."""
+    try:
+        p = _PS1_TEMPLATE_DIR / name
+        if p.is_file():
+            return p.read_bytes()
+    except OSError:
+        pass
+    return None
+
+
+def _slot_rect(img):
+    """Find the fully-transparent cover slot in an icon template image.
+
+    Returns ``(x, y, w, h)`` or ``None`` when the image has no transparent
+    region (e.g. a flattened template)."""
+    if img.isNull():
+        return None
+    w, h = img.width(), img.height()
+    min_x = min_y = 1 << 30
+    max_x = max_y = -1
+    for y in range(h):
+        for x in range(w):
+            if img.pixelColor(x, y).alpha() < 10:
+                min_x, max_x = min(min_x, x), max(max_x, x)
+                min_y, max_y = min(min_y, y), max(max_y, y)
+    if max_x < min_x or max_y < min_y:
+        return None
+    return min_x, min_y, max_x - min_x + 1, max_y - min_y + 1
+
+
+def make_ps1_assets(cover_bytes, title="", description="", esrb=None):
+    """Build official-style PS1 Classics art from the cover: (icon0, pic0, pic1).
+
+    - ``ICON0`` (80x80): the cover composited into the bundled case template
+      (PS button logo, ``PlayStation.`` wordmark, gradient frame).
+    - ``PIC0`` (310x180): the PSN-style info board — title, description,
+      ESRB rating badge and PS3/PSP platform badges.
+    - ``PIC1`` (480x272): the bundled launch background (gradient + curve).
+
+    Returns ``(None, None, None)`` when the art can't be decoded or Qt is
+    unavailable.
+    """
+    try:
+        from PySide6.QtCore import QBuffer, QByteArray, QPointF, QRectF, Qt
+        from PySide6.QtGui import (QColor, QFont, QFontMetrics, QImage,
+                                   QLinearGradient, QPainter, QPainterPath,
+                                   QPen, QPolygonF)
+    except Exception:  # noqa: BLE001 - headless API may lack PySide6
+        return None, None, None
+
+    art = QImage.fromData(cover_bytes)
+    if art.isNull():
+        return None, None, None
+    art = art.convertToFormat(QImage.Format_ARGB32)
+
+    def _save(img):
+        ba = QByteArray()
+        buf = QBuffer(ba)
+        buf.open(QBuffer.WriteOnly)
+        img.save(buf, "PNG")
+        buf.close()
+        return bytes(ba)
+
+    # --- ICON0: cover art inside the case template ---------------------------
+    icon = QImage(80, 80, QImage.Format_ARGB32)
+    icon.fill(QColor(0, 0, 0))
+    p = QPainter(icon)
+    p.setRenderHint(QPainter.SmoothPixmapTransform, True)
+    tmpl = QImage.fromData(_ps1_template_bytes("ICON0.PNG") or b"")
+    if not tmpl.isNull():
+        tmpl = tmpl.convertToFormat(QImage.Format_ARGB32)
+        slot = _slot_rect(tmpl) or (0, 0, 80, 80)
+        sx, sy, sw, sh = slot
+        # Fit the whole cover inside the slot (no cropping), centred with the
+        # frame's dark background showing through the letterbox bars.
+        cover = art.scaled(sw, sh, Qt.KeepAspectRatio, Qt.SmoothTransformation)
+        p.drawImage(sx + (sw - cover.width()) // 2, sy + (sh - cover.height()) // 2, cover)
+        p.drawImage(0, 0, tmpl)
+    else:
+        cover = art.scaled(80, 80, Qt.KeepAspectRatio, Qt.SmoothTransformation)
+        p.drawImage((80 - cover.width()) // 2, (80 - cover.height()) // 2, cover)
+    p.end()
+    icon0 = _save(icon)
+
+    # --- PIC0: PSN-style info board -----------------------------------------
+    pic0 = _make_pic0(title, description, esrb, QImage, QPainter, QPainterPath,
+                      QColor, QFont, QFontMetrics, QLinearGradient, QPen,
+                      QPolygonF, QPointF, QRectF, Qt, _save)
+
+    # --- PIC1: bundled launch background ------------------------------------
+    pic1 = _make_pic1(QImage, QPainter, QColor, QLinearGradient, Qt, _save)
+
+    return icon0, pic0, pic1
+
+
+def _make_pic1(QImage, QPainter, QColor, QLinearGradient, Qt, _save):
+    pic = QImage(480, 272, QImage.Format_ARGB32)
+    raw = _ps1_template_bytes("PIC1.PNG")
+    tmpl = QImage.fromData(raw) if raw else QImage()
+    if not tmpl.isNull():
+        return _save(tmpl.convertToFormat(QImage.Format_ARGB32))
+    # Fallback: a light lavender gradient with a subtle curve (same vibe as
+    # the official background) for when the template image is missing.
+    grad = QLinearGradient(0, 0, 0, 272)
+    grad.setColorAt(0.0, QColor(235, 232, 238))
+    grad.setColorAt(1.0, QColor(205, 200, 215))
+    p = QPainter(pic)
+    p.fillRect(0, 0, 480, 272, grad)
+    p.setPen(QPen(QColor(170, 160, 185, 120), 3))
+    path = QPainterPath()
+    path.moveTo(-40, 300)
+    path.quadTo(240, 60, 520, 300)
+    p.drawPath(path)
+    p.end()
+    return _save(pic)
+
+
+def _make_pic0(title, description, esrb, QImage, QPainter, QPainterPath, QColor,
+               QFont, QFontMetrics, QLinearGradient, QPen, QPolygonF, QPointF,
+               QRectF, Qt, _save):
+    W, H = 310, 180
+    img = QImage(W, H, QImage.Format_ARGB32)
+    img.fill(QColor(0, 0, 0, 0))
+
+    # Dark gradient backdrop clipped to a rounded card (transparent corners).
+    grad = QLinearGradient(0, 0, 0, H)
+    grad.setColorAt(0.0, QColor(38, 38, 40))
+    grad.setColorAt(1.0, QColor(12, 12, 14))
+    card = QPainterPath()
+    card.addRoundedRect(QRectF(0, 0, W, H), 12, 12)
+
+    p = QPainter(img)
+    p.setRenderHint(QPainter.Antialiasing, True)
+    p.setRenderHint(QPainter.TextAntialiasing, True)
+    p.fillPath(card, grad)
+
+    # Rounded card border.
+    p.setPen(QPen(QColor(110, 110, 115), 1))
+    p.setBrush(Qt.NoBrush)
+    p.drawPath(card)
+
+    # PlayStation button glyphs, top-right.
+    _draw_ps_glyphs(p, W - 34, 12, 22, QRectF, QPointF, QPolygonF, QPen, Qt,
+                    QColor)
+
+    # Title (bold, upper-left). Shrink the font until the whole title fits, so
+    # long names are shown in full instead of being cut with an ellipsis.
+    f_title = QFont("DejaVu Sans")
+    f_title.setBold(True)
+    p.setPen(QColor(255, 255, 255))
+    title_width = W - 70
+    fm_title = QFontMetrics(f_title)
+    full = (title or "").strip()
+    size = 19
+    while size > 10 and fm_title.horizontalAdvance(full) > title_width:
+        size -= 1
+        f_title.setPixelSize(size)
+        fm_title = QFontMetrics(f_title)
+    title_text = full
+    if fm_title.horizontalAdvance(full) > title_width:
+        title_text = fm_title.elidedText(full, Qt.ElideRight, title_width)
+    p.setFont(f_title)
+    p.drawText(QRectF(18, 16, title_width, 28), Qt.AlignLeft | Qt.AlignVCenter,
+               title_text)
+
+    # Thin divider under the title (like the original PSN info board).
+    p.setPen(QPen(QColor(255, 255, 255, 55), 1))
+    p.drawLine(QPointF(18, 46), QPointF(W - 18, 46))
+
+    # Description (wrapped to at most 3 lines, last line elided).
+    if description:
+        f_desc = QFont("DejaVu Sans")
+        f_desc.setPixelSize(12)
+        p.setFont(f_desc)
+        p.setPen(QColor(215, 215, 215))
+        fm = QFontMetrics(f_desc)
+        lines = _wrap_elided(fm, description.strip(), W - 36, 3, Qt)
+        y = 52
+        for line in lines:
+            p.drawText(QRectF(18, y, W - 36, 16), Qt.AlignLeft | Qt.AlignVCenter, line)
+            y += 16
+
+    # ESRB badge (bottom-left) + caption.
+    if esrb:
+        badge = esrb.strip()
+        if badge:
+            _draw_esrb(p, badge, 18, 140, QRectF, QColor, QFont, QFontMetrics, QPen, Qt)
+
+    # Platform badge (bottom-right). Only PSP for now; PS3/PS4 packaging is a
+    # separate future feature.
+    _draw_platform_badge(p, "PSP", W - 14 - 30, 146, QColor(212, 175, 55),
+                         QRectF, QColor, QFont, QFontMetrics, Qt)
+
+    p.end()
+    return _save(img)
+
+
+def _wrap_elided(fm, text, width, max_lines, Qt):
+    """Word-wrap ``text`` to ``width`` px, eliding the final line when it runs
+    past ``max_lines``. Returns a list of up to ``max_lines`` strings."""
+    words = text.split()
+    lines = []
+    cur = ""
+    for i, w in enumerate(words):
+        cand = (cur + " " + w).strip() if cur else w
+        if fm.horizontalAdvance(cand) <= width:
+            cur = cand
+            continue
+        if len(lines) == max_lines - 1:
+            rest = " ".join([cur] + words[i:]) if cur else " ".join(words[i:])
+            lines.append(fm.elidedText(rest, Qt.ElideRight, width))
+            return lines
+        lines.append(cur)
+        cur = w
+    if cur:
+        lines.append(cur)
+    return lines[:max_lines]
+
+
+def _draw_ps_glyphs(p, x, y, size, QRectF, QPointF, QPolygonF, QPen, Qt, QColor):
+    """Draw the four PlayStation face-button glyphs in a 2x2 grid, using the
+    official button colours (green triangle, red circle, blue cross, pink square)."""
+    cell = size / 2.0
+    p.setBrush(Qt.NoBrush)
+
+    def _pen(color):
+        pen = QPen(color, max(1.0, size / 14.0))
+        pen.setCapStyle(Qt.RoundCap)
+        pen.setJoinStyle(Qt.RoundJoin)
+        return pen
+
+    # Triangle (top-left, green).
+    p.setPen(_pen(QColor("#3F9B0F")))
+    tri = QPolygonF([QPointF(x, y + cell), QPointF(x + cell, y), QPointF(x + cell, y + cell)])
+    p.drawPolygon(tri)
+    # Circle (top-right, red).
+    p.setPen(_pen(QColor("#DE1C18")))
+    p.drawEllipse(QRectF(x + cell, y, cell, cell))
+    # Cross (bottom-left, blue).
+    p.setPen(_pen(QColor("#287FC1")))
+    p.drawLine(QPointF(x + 1, y + cell + 1), QPointF(x + cell - 1, y + size - 1))
+    p.drawLine(QPointF(x + cell - 1, y + cell + 1), QPointF(x + 1, y + size - 1))
+    # Square (bottom-right, pink).
+    p.setPen(_pen(QColor("#C94E9B")))
+    p.drawRect(QRectF(x + cell, y + cell, cell, cell))
+
+
+def _draw_esrb(p, badge, x, y, QRectF, QColor, QFont, QFontMetrics, QPen, Qt):
+    f = QFont("DejaVu Sans")
+    f.setPixelSize(9)
+    f.setBold(True)
+    fm = QFontMetrics(f)
+    text = badge if badge != "EVERYONE" else "EVERYONE"
+    # Shrink until it fits the box (the official badge shows the word).
+    size = 9
+    while size > 5 and fm.horizontalAdvance(text) > 46:
+        size -= 1
+        f.setPixelSize(size)
+        fm = QFontMetrics(f)
+    rect = QRectF(x, y, 50, 24)
+    p.setPen(QPen(QColor(20, 20, 20), 1))
+    p.setBrush(QColor(255, 255, 255))
+    p.drawRoundedRect(rect, 3, 3)
+    p.setPen(QColor(20, 20, 20))
+    p.setFont(f)
+    p.drawText(rect, Qt.AlignCenter, text)
+    # Caption.
+    fc = QFont("DejaVu Sans")
+    fc.setPixelSize(7)
+    p.setFont(fc)
+    p.setPen(QColor(150, 150, 155))
+    p.drawText(QRectF(x + 56, y + 6, 120, 14),
+               Qt.AlignLeft | Qt.AlignVCenter, "ESRB CONTENT RATING")
+
+
+def _draw_platform_badge(p, label, x, y, color, QRectF, QColor, QFont,
+                         QFontMetrics, Qt):
+    f = QFont("DejaVu Sans")
+    f.setPixelSize(10)
+    f.setBold(True)
+    rect = QRectF(x, y, 30, 16)
+    p.setPen(Qt.NoPen)
+    p.setBrush(QColor(26, 26, 28))
+    p.drawRoundedRect(rect, 4, 4)
+    p.setPen(color)
+    p.setFont(f)
+    p.drawText(rect, Qt.AlignCenter, label)
+
+
+def ps1_art(title, release_id, timeout=10):
+    """Fetch a PS1 game's cover and build ``(icon0, pic0, pic1)`` PNG bytes.
+
+    The EBOOT icon prefers IGDB first (clean box art without the PlayStation
+    banner that libretro/ScreenScraper thumbnails bake in); if IGDB has
+    nothing it falls back to the normal cover pipeline (libretro, OpenVGDB,
+    ScreenScraper, Wikipedia, IGDB). The description and ESRB rating for the
+    PIC0 info board come from IGDB (best effort).
+    Returns ``(None, None, None)`` when no art can be produced.
+    """
+    key = release_id or stable_key(title)
+    path = None
+    try:
+        # IGDB first for the icon: clean box art without the banner.
+        data = _fetch_igdb_cover(title, min(timeout, 6), system="ps1")
+        if data is not None:
+            dest = cover_path(key, "ps1")
+            _write_atomic(dest, data)
+            path = dest
+            log.info("ps1 icon cover %r <- igdb", title)
+    except Exception:  # noqa: BLE001
+        path = None
+    if path is None:
+        try:
+            path = fetch_cover(title, key, "ps1", timeout=timeout)
+        except Exception:  # noqa: BLE001
+            return None, None, None
+    if path is None:
+        return None, None, None
+
+    description = ""
+    esrb = None
+    try:
+        meta = get_game_metadata_igdb(title, timeout=timeout, system="ps1")
+        if meta:
+            description = meta.get("overview") or ""
+            esrb = meta.get("esrb")
+    except Exception:  # noqa: BLE001 - metadata is best effort
+        pass
+
+    try:
+        return make_ps1_assets(path.read_bytes(), title=title,
+                               description=description, esrb=esrb)
+    except OSError:
+        return None, None, None
+
+
 # --------------------------------------------------------------------------- #
 # Public entry point
 # --------------------------------------------------------------------------- #
@@ -1255,6 +1598,21 @@ def _igdb_date(ts):
         return ""
 
 
+# IGDB ``age_ratings.rating`` values for ESRB (category 1). 6=RP, 7=EC, 8=E,
+# 9=E10+, 10=T, 11=M, 12=AO. The badge uses the short letter form.
+_ESRB_BADGE = {6: "RP", 7: "EC", 8: "EVERYONE", 9: "EVERYONE 10+",
+               10: "TEEN", 11: "MATURE", 12: "ADULTS ONLY"}
+
+
+def _igdb_esrb(g):
+    for ar in g.get("age_ratings") or []:
+        if not isinstance(ar, dict):
+            continue
+        if ar.get("category") == 1:  # ESRB
+            return _ESRB_BADGE.get(ar.get("rating"))
+    return None
+
+
 def _igdb_game_meta(g):
     genres = [x.get("name") for x in (g.get("genres") or []) if isinstance(x, dict) and x.get("name")]
     devs, pubs = [], []
@@ -1287,6 +1645,7 @@ def _igdb_game_meta(g):
         "genres": list(dict.fromkeys(genres)),
         "players": None,
         "rating": rating,
+        "esrb": _igdb_esrb(g),
         "youtube": yt,
     }
 
@@ -1301,7 +1660,7 @@ def _igdb_search(query, limit=20, timeout=10, system="games"):
         f'search "{term}"; '
         "fields name, cover.image_id, first_release_date, summary, genres.name, "
         "involved_companies.company.name, involved_companies.developer, involved_companies.publisher, "
-        "rating, videos.video_id; "
+        "rating, videos.video_id, age_ratings.category, age_ratings.rating; "
         f"where platforms = ({platform_id}); "
         f"limit {max(limit, 1)};"
     )
@@ -1360,7 +1719,7 @@ def game_metadata_by_id_igdb(game_id, timeout=10):
     q = (
         "fields name, cover.image_id, first_release_date, summary, genres.name, "
         "involved_companies.company.name, involved_companies.developer, involved_companies.publisher, "
-        "rating, videos.video_id; "
+        "rating, videos.video_id, age_ratings.category, age_ratings.rating; "
         f"where id = {int(game_id)}; limit 1;"
     )
     games = _igdb_post(q, timeout) or []

app/info.py

@@ -23,6 +23,9 @@ _miss_db = {}
 _miss_loaded = False
 _MISS_TTL = 86400.0  # retry failed metadata after 1 day
 
+# Memoised release-date table (invalidated on save/reset).
+_dates_cache = None
+
 
 def _load_miss_db():
     global _miss_loaded
@@ -122,6 +125,7 @@ def save(release_id, system, meta, manual=False, title=None):
         )
         conn.commit()
         conn.close()
+        _invalidate_dates_cache()
         return True
     except sqlite3.Error:
         return False
@@ -140,6 +144,7 @@ def reset(release_id, system):
         )
         conn.commit()
         conn.close()
+        _invalidate_dates_cache()
     except sqlite3.Error:
         pass
 
@@ -161,15 +166,18 @@ def cached_release_dates():
     """Return {(release_id, system): release_date} from cached metadata only.
 
     Pure DB read — no network — so list views can show a release date without
-    triggering API fetches for every row.
+    triggering API fetches for every row. Result is memoised and invalidated
+    whenever metadata is saved.
     """
+    global _dates_cache
+    if _dates_cache is None:
         out = {}
         try:
             conn = get_connection(config.DB_PATH)
             rows = conn.execute("SELECT release_id, system, meta_json FROM item_info").fetchall()
             conn.close()
         except sqlite3.Error:
-        return {}
+            return out
         for r in rows:
             try:
                 meta = json.loads(r["meta_json"] or "{}")
@@ -177,7 +185,13 @@ def cached_release_dates():
                 continue
             if isinstance(meta, dict) and meta.get("release_date"):
                 out[(r["release_id"], r["system"])] = meta["release_date"]
-    return out
+        _dates_cache = out
+    return _dates_cache
+
+
+def _invalidate_dates_cache():
+    global _dates_cache
+    _dates_cache = None
 
 
 def get_or_fetch(release_id, system, fetch_title):

app/ingest.py

@@ -88,6 +88,42 @@ def ingest_dat(conn, path):
     return dat_name, system, release_count, rom_count
 
 
+def ensure_catalog(dats_dir=None, conn=None):
+    """Ingest any DAT files missing from the DB (idempotent, cheap when current).
+
+    Called once at startup so a fresh/reset database still has the catalog and
+    scanning produces matches instead of everything coming back ``unknown``.
+    Returns the number of DATs ingested.
+    """
+    dats_dir = Path(dats_dir) if dats_dir else config.DATS_DIR
+    if not dats_dir.is_dir():
+        return 0
+    files = sorted(p for p in dats_dir.glob("*.dat") if p.is_file())
+    if not files:
+        return 0
+
+    own = conn is None
+    if own:
+        conn = get_connection(config.DB_PATH)
+    try:
+        known = {r["source_path"] for r in conn.execute("SELECT source_path FROM dats")}
+        count = 0
+        for path in files:
+            if str(path) in known:
+                continue
+            try:
+                ingest_dat(conn, path)
+            except Exception as exc:  # noqa: BLE001 - a bad DAT shouldn't block startup
+                print(f"warning: could not ingest {path.name}: {exc}", file=sys.stderr)
+                continue
+            count += 1
+        conn.commit()
+        return count
+    finally:
+        if own:
+            conn.close()
+
+
 def main(argv=None):
     parser = argparse.ArgumentParser(description="Ingest clrmamepro DAT files into SQLite")
     parser.add_argument("--dats", help="directory containing .dat files (default: data/dats)")

app/launcher.py

@@ -48,8 +48,10 @@ def launch_ppsspp(iso, exe=""):
         else:
             return False, "PPSSPP not found. Install it or set its path in Settings → Saves."
     try:
-        subprocess.Popen(cmd, start_new_session=True, env=_env(),
+        kwargs = {"env": _env(), "stdout": subprocess.DEVNULL, "stderr": subprocess.DEVNULL}
-                         stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+        if os.name != "nt":
+            kwargs["start_new_session"] = True  # POSIX-only: detach from our process group
+        subprocess.Popen(cmd, **kwargs)
         return True, ""
     except OSError as exc:
         return False, str(exc)

app/matcher.py

@@ -38,7 +38,11 @@ def clear_cache():
 
 
 def _all_release_candidates(conn):
-    """Catalog releases + supplement entries with pre-normalized names."""
+    """Catalog releases + supplement entries with pre-normalized names.
+
+    Each entry is ``(normalized_name, significant_word_set, candidate)`` so the
+    fuzzy step can cheaply skip candidates that share no significant word.
+    """
     key = id(conn)
     cands = _releases_cache.get(key)
     if cands is not None:
@@ -53,7 +57,11 @@ def _all_release_candidates(conn):
         )
     ]
     cands.extend(_supplement_release(e) for e in _load_supplement())
-    cands = [(_normalize(c["name"]), c) for c in cands]
+    cands = [
+        (norm, frozenset(w for w in norm.split() if len(w) >= 3), c)
+        for c in cands
+        if (norm := _normalize(c["name"] or ""))
+    ]
     _releases_cache[key] = cands
     return cands
 
@@ -103,6 +111,36 @@ def normalize_name(name):
     return _normalize(name)
 
 
+_EUROPEAN_REGIONS = {
+    "europe", "germany", "france", "spain", "italy", "russia", "netherlands",
+    "portugal", "poland", "united kingdom", "greece", "norway", "sweden",
+    "denmark", "finland", "austria", "belgium", "switzerland",
+}
+
+
+def region_matches(region, prefer):
+    """True if ``region`` satisfies the user's preferred-region hint."""
+    if not prefer or not region:
+        return False
+    tokens = {t.strip().lower() for t in str(region).split(",") if t.strip()}
+    if not tokens:
+        return False
+    prefer = prefer.strip().lower()
+    if prefer in tokens:
+        return True
+    if prefer == "europe":
+        return bool(tokens & _EUROPEAN_REGIONS)
+    return False
+
+
+def apply_region_preference(candidates, prefer):
+    """Narrow ``candidates`` to the preferred region (fall back to all)."""
+    if not prefer:
+        return candidates
+    filtered = [c for c in candidates if region_matches(c.get("region"), prefer)]
+    return filtered or candidates
+
+
 def serial_candidates(conn, record):
     """Return all catalog releases matching the disc's serial (size-narrowed)."""
     serial = record.get("serial")
@@ -123,7 +161,7 @@ def serial_candidates(conn, record):
     return _narrow(conn, [dict(r) for r in rows], record.get("size"))
 
 
-def match(conn, record):
+def match(conn, record, prefer_region=None):
     size = record.get("size")
 
     # 1. Hash is the most precise key; serials are shared across revisions.
@@ -163,18 +201,31 @@ def match(conn, record):
                 for cand in candidates:
                     if cand["id"] == saved["release_id"]:
                         return "choice", cand
+            if prefer_region:
+                filtered = [c for c in candidates if region_matches(c.get("region"), prefer_region)]
+                if len(filtered) == 1:
+                    return "region", filtered[0]
             return "unknown", None
 
     # 4. Fuzzy fallback (filename + PARAM.SFO title), size-disambiguated.
     disk_norm = _normalize(record["name"])
     title_norm = _normalize(record.get("title") or "")
 
+    # Cheap pre-filter: only run the expensive difflib comparison against
+    # candidates sharing at least one significant (>=3 char) word with the
+    # disc's filename or PARAM.SFO title.
+    target_words = frozenset(w for w in disk_norm.split() if len(w) >= 3) | \
+        frozenset(w for w in title_norm.split() if len(w) >= 3)
+    if not target_words:
+        return "unknown", None
+
     scored = []
-    for cand_norm, cand in _all_release_candidates(conn):
+    for cand_norm, cand_words, cand in _all_release_candidates(conn):
-        ratio = max(
+        if not (target_words & cand_words):
-            SequenceMatcher(None, disk_norm, cand_norm).ratio(),
+            continue
-            SequenceMatcher(None, title_norm, cand_norm).ratio(),
+        ratio = SequenceMatcher(None, disk_norm, cand_norm).ratio()
-        )
+        if title_norm:
+            ratio = max(ratio, SequenceMatcher(None, title_norm, cand_norm).ratio())
         scored.append((ratio, cand))
     best_ratio = max((r for r, _ in scored), default=0.0)
     if best_ratio < 0.9:

app/nopaystation.py

@@ -0,0 +1,210 @@
+"""NoPayStation (.pkg) browsing and extraction.
+
+NoPayStation publishes per-platform TSV lists (``https://nopaystation.com/tsv/``)
+with one row per downloadable PSN item. Each row links to an encrypted PSN
+``.pkg`` (a ``\\x7FPKG`` container, not a ZIP) that is decrypted by the bundled
+pure-Python decryptor (``app/pkg.py``) into a ``PSP/GAME/<TITLE_ID>/``-style
+folder — no Wine or ``pkg2zip`` required.
+"""
+from __future__ import annotations
+
+import logging
+import shutil
+import urllib.parse
+import urllib.request
+from datetime import datetime
+from pathlib import Path
+from typing import List
+
+from . import config
+
+log = logging.getLogger("nopaystation")
+
+_TSV_NAMES = {
+    "psp": "PSP_GAMES.tsv",
+    "psx": "PSX_GAMES.tsv",
+    "theme": "PSP_THEMES.tsv",
+    "dlc": "PSP_DLCS.tsv",
+}
+
+# NoPayStation TSVs are tab-separated with a header row whose exact columns
+# differ per platform (PSP has "Type"/"RAP" columns, PSX has "Original Name").
+# Map header names to canonical keys instead of relying on fixed positions.
+_HEADER_ALIASES = {
+    "title id": "title_id",
+    "region": "region",
+    "name": "name",
+    "pkg direct link": "pkg_url",
+    "content id": "content_id",
+    "last modification date": "date",
+    "file size": "size",
+    "sha256": "sha256",
+    "zrif": "zrif",
+    "rap": "rap",
+    "download .rap file": "rap_url",
+    "type": "content_kind",
+    "original name": "original_name",
+}
+
+
+def tsv_url(content_type: str, base: str = "") -> str:
+    """TSV URL for a content type (``psp`` / ``psx`` / ``theme`` / ``dlc``)."""
+    base = (base or config.NPS_TSV_BASE).rstrip("/")
+    return f"{base}/{_TSV_NAMES.get(content_type, _TSV_NAMES['psp'])}"
+
+
+def _tsv_dir() -> Path:
+    d = config.USER_DATA_DIR / "nps"
+    d.mkdir(parents=True, exist_ok=True)
+    return d
+
+
+def _parse_date(value: str) -> str:
+    value = (value or "").strip()
+    if not value:
+        return ""
+    for fmt in ("%Y-%m-%d %H:%M:%S", "%Y-%m-%d"):
+        try:
+            return datetime.strptime(value, fmt).strftime("%Y-%m-%d")
+        except ValueError:
+            continue
+    return value[:10]
+
+
+def parse_tsv(text: str, content_type: str) -> List[dict]:
+    """Parse a NoPayStation TSV into store item dicts.
+
+    The header row drives column mapping (PSP and PSX TSVs differ). Each item
+    carries the fields the Store page expects (``name``, ``size``,
+    ``release_date``, ``mtime_ns``) plus ``title_id``, ``pkg_url``, ``sha256``,
+    ``content_type`` and the cover ``system`` ("games" for PSP, "ps1" for PSX).
+    """
+    system = {"psp": "games", "psx": "ps1", "theme": "theme", "dlc": "dlc"}.get(content_type, "games")
+    items: List[dict] = []
+    header = None
+    for line in text.splitlines():
+        line = line.rstrip("\r\n")
+        if not line.strip():
+            continue
+        cols = line.split("\t")
+        if header is None:
+            header = [c.strip().lower() for c in cols]
+            continue
+        row = {}
+        for i, key in enumerate(header):
+            canon = _HEADER_ALIASES.get(key)
+            if canon and i < len(cols):
+                row[canon] = cols[i].strip()
+        name = row.get("name") or ""
+        pkg_url = row.get("pkg_url") or ""
+        # NoPayStation marks delisted packages with the literal "MISSING" in the
+        # URL column — skip them so they can't be queued for download.
+        if not name or not pkg_url or not pkg_url.lower().startswith(("http://", "https://")):
+            continue
+        title_id = row.get("title_id") or ""
+        try:
+            size = int(float(row.get("size") or 0))
+        except (TypeError, ValueError):
+            size = 0
+        date = _parse_date(row.get("date") or "")
+        try:
+            mtime_ns = int(datetime.strptime(date, "%Y-%m-%d").timestamp() * 1_000_000_000) if date else 0
+        except ValueError:
+            mtime_ns = 0
+        items.append({
+            "name": name,
+            "title_id": title_id,
+            "region": row.get("region") or "",
+            "pkg_url": pkg_url,
+            "zrif": row.get("zrif") or "",
+            "content_id": row.get("content_id") or "",
+            "size": size,
+            "sha256": (row.get("sha256") or "").strip().lower(),
+            "release_date": date,
+            "mtime_ns": mtime_ns,
+            "content_type": content_type,
+            "system": system,
+            "content_kind": row.get("content_kind") or "",
+        })
+    return items
+
+
+def fetch_items(content_type: str, url: str = "", timeout: int = 60, force: bool = False) -> List[dict]:
+    """Download (and cache) a TSV, returning parsed item dicts.
+
+    ``force`` re-downloads the TSV (used by the Store's Refresh button); the
+    local cache is only used as a fallback when the network fails.
+    """
+    url = url or tsv_url(content_type)
+    name = _TSV_NAMES.get(content_type, "PSP_GAMES.tsv")
+    cache = _tsv_dir() / name
+
+    def read_cache():
+        try:
+            return parse_tsv(cache.read_text(encoding="utf-8", errors="replace"), content_type)
+        except OSError:
+            return None
+
+    if not force and cache.is_file():
+        items = read_cache()
+        if items is not None:
+            return items
+
+    try:
+        req = urllib.request.Request(url, headers={"User-Agent": "psp-preserve/0.1"})
+        with urllib.request.urlopen(req, timeout=timeout) as resp:
+            data = resp.read()
+        text = data.decode("utf-8", errors="replace")
+        cache.write_text(text, encoding="utf-8")
+        return parse_tsv(text, content_type)
+    except Exception:  # noqa: BLE001 - fall back to the cached list on failure
+        items = read_cache()
+        if items is not None:
+            log.warning("could not refresh %s TSV; using cached copy", content_type)
+            return items
+        raise
+
+
+def _safe_folder(value: str) -> str:
+    import re
+    cleaned = re.sub(r"[^A-Za-z0-9]", "", value or "").upper()
+    return cleaned or "PKG"
+
+
+def _ensure_keys_bin(folder, kind):
+    """PS1 Classics need KEYS.BIN next to EBOOT.PBP to boot on CFW (npdrm)."""
+    if kind != "psx":
+        return
+    src = config.DATA_DIR / "loader" / "KEYS.BIN"
+    dest = Path(folder) / "KEYS.BIN"
+    if src.is_file() and not dest.exists():
+        try:
+            shutil.copy2(src, dest)
+        except OSError:
+            pass
+
+
+def extract_pkg(pkg_path, title_id: str, dest_dir,
+                kind_hint: str = None, progress_cb=None, cancel_event=None) -> Path:
+    """Decrypt/extract a ``.pkg`` into ``dest_dir/<TITLE_ID>/``.
+
+    Uses the bundled pure-Python decryptor (no Wine or pkg2zip). Returns the
+    destination game folder path.
+    """
+    from . import pkg as pkgmod
+    from .store import TransferCancelled
+
+    pkg_path = Path(pkg_path)
+    dest = Path(dest_dir) / _safe_folder(title_id)
+    if dest.is_dir() and any(dest.iterdir()):
+        return dest
+
+    try:
+        _kind, _tid, folder = pkgmod.extract(pkg_path, dest_dir, kind_hint,
+                                             progress_cb, cancel_event)
+        _ensure_keys_bin(folder, _kind)
+        return folder
+    except TransferCancelled:
+        raise
+    except Exception as exc:  # noqa: BLE001
+        raise RuntimeError(f"could not decrypt {pkg_path.name}: {exc}") from exc

app/pipeline.py

@@ -2,9 +2,9 @@
 from . import iso_reader, matcher, namer
 
 
-def identify(conn, record):
+def identify(conn, record, prefer_region=None):
     """Return ``{method, release, serial, canonical}`` for a scanned disc record."""
-    method, release = matcher.match(conn, record)
+    method, release = matcher.match(conn, record, prefer_region=prefer_region)
     return identify_with_release(record, release, method)
 
 

app/pkg.py

@@ -0,0 +1,378 @@
+"""Pure-Python PSP/PSX/theme/DLC PSN ``.pkg`` decryption (no Wine / pkg2zip).
+
+Ports the folder-mode extraction used by pkgi-psp's depackager and pkg2zip:
+parse the ``\\x7FPKG`` header, derive the PSP/PS3 AES key, AES-CTR-decrypt the
+file entries, and write the game's ``EBOOT.PBP`` (+ siblings) into a folder.
+
+Supported content:
+
+* PSP games / minis (``EBOOT.PBP``) — ``DATA.PSP`` stays EDAT-encrypted, so it
+  runs on CFW with ``npdrm_free`` (ARK ships it), same as pkgi-psp's install.
+* PS1 Classics (``EBOOT.PBP`` + ``DOCUMENT.DAT``).
+* PSP themes (``.ptf``) — the packaged PTF is EDAT-wrapped and is unwrapped here.
+* PSP DLC (``.edat``) — extracted as-is into the owning game's folder.
+
+Theme unwrapping needs ``pycryptodome`` (for AES-CMAC + ECB); everything else
+works with either pycryptodome or the built-in pure-Python AES fallback.
+"""
+from __future__ import annotations
+
+from pathlib import Path
+
+PKG_MAGIC = 0x7F504B47
+
+# Static PSN keys (key type 1 = PSP).
+PSP_KEY = bytes.fromhex("07f2c68290b50d2c33818d709b60e62b")
+PS3_KEY = bytes.fromhex("2e7b71d7c9c9a14ea3221f188828b8f8")
+
+# PSP KIRK/AMCTL keys used to unwrap theme PTF EDATs (pkgi-psp / libkirk).
+_KIRK38 = bytes.fromhex("12468d7e1c42209bba5426835eb03303")
+_KIRK39 = bytes.fromhex("c43bb6d653ee67493ea95fbc0ced6f8a")
+_KIRK63 = bytes.fromhex("9c9b1372f8c640cf1c62f5d592ddb582")
+_AMCTL3 = bytes.fromhex("e350ed1d910a1fd029bb1c3ef34077fb")
+_AMCTL4 = bytes.fromhex("135fa47cab395ba476b8cca98f3a0445")
+_AMCTL5 = bytes.fromhex("678d7fa32a9ca0d1508ad8385e4b017e")
+
+try:
+    from Crypto.Cipher import AES as _AES  # pycryptodome (fast)
+    _HAVE_CRYPTO = True
+except ImportError:  # noqa: BLE001
+    _HAVE_CRYPTO = False
+
+
+# --------------------------------------------------------------------------- #
+# Pure-Python AES-128 (fallback when pycryptodome is unavailable)
+# --------------------------------------------------------------------------- #
+_SBOX = bytes.fromhex(
+    "637c777bf26b6fc53001672bfed7ab76ca82c97dfa5947f0add4a2af9ca472c0"
+    "b7fd9326363ff7cc34a5e5f171d8311504c723c31896059a071280e2eb27b275"
+    "09832c1a1b6e5aa0523bd6b329e32f8453d100ed20fcb15b6acbbe394a4c58cf"
+    "d0efaafb434d338545f9027f503c9fa851a3408f929d38f5bcb6da2110fff3d2"
+    "cd0c13ec5f974417c4a77e3d645d197360814fdc222a908846eeb814de5e0bdb"
+    "e0323a0a4906245cc2d3ac629195e479e7c8376d8dd54ea96c56f4ea657aae08"
+    "ba78252e1ca6b4c6e8dd741f4bbd8b8a703eb5664803f60e613557b986c11d9e"
+    "e1f8981169d98e949b1e87e9ce5528df8ca1890dbfe6426841992d0fb054bb16"
+)
+_RCON = (0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1B, 0x36)
+
+
+def _key_schedule(key):
+    w = list(key)
+    for i in range(4, 44):
+        t = list(w[(i - 1) * 4:(i - 1) * 4 + 4])
+        if i % 4 == 0:
+            t = t[1:] + t[:1]
+            t = [_SBOX[b] for b in t]
+            t[0] ^= _RCON[i // 4 - 1]
+        w += [w[(i - 4) * 4 + j] ^ t[j] for j in range(4)]
+    return [bytes(w[i * 16:(i + 1) * 16]) for i in range(11)]
+
+
+def _shift_rows(s):
+    return [s[0], s[5], s[10], s[15], s[4], s[9], s[14], s[3],
+            s[8], s[13], s[2], s[7], s[12], s[1], s[6], s[11]]
+
+
+def _xtime(a):
+    a <<= 1
+    return (a ^ 0x1B) & 0xFF if a & 0x100 else a & 0xFF
+
+
+def _mix_columns(s):
+    out = [0] * 16
+    for c in range(4):
+        a0, a1, a2, a3 = s[4 * c], s[4 * c + 1], s[4 * c + 2], s[4 * c + 3]
+        out[4 * c] = _xtime(a0) ^ (_xtime(a1) ^ a1) ^ a2 ^ a3
+        out[4 * c + 1] = a0 ^ _xtime(a1) ^ (_xtime(a2) ^ a2) ^ a3
+        out[4 * c + 2] = a0 ^ a1 ^ _xtime(a2) ^ (_xtime(a3) ^ a3)
+        out[4 * c + 3] = (_xtime(a0) ^ a0) ^ a1 ^ a2 ^ _xtime(a3)
+    return out
+
+
+def _aes_encrypt_block(rk, block):
+    s = [block[i] ^ rk[0][i] for i in range(16)]
+    for rnd in range(1, 10):
+        s = [_SBOX[b] for b in s]
+        s = _shift_rows(s)
+        s = _mix_columns(s)
+        s = [s[i] ^ rk[rnd][i] for i in range(16)]
+    s = [_SBOX[b] for b in s]
+    s = _shift_rows(s)
+    s = [s[i] ^ rk[10][i] for i in range(16)]
+    return bytes(s)
+
+
+def _add128(counter, n):
+    c = bytearray(counter)
+    for i in range(15, -1, -1):
+        n += c[i]
+        c[i] = n & 0xFF
+        n >>= 8
+    return bytes(c)
+
+
+def _ctr_decrypt_py(key, iv, block_index, data):
+    """AES-CTR decrypt (pure-Python): counter = iv + block_index, +1 per block."""
+    rk = _key_schedule(key)
+    counter = _add128(iv, block_index)
+    out = bytearray()
+    for i in range(0, len(data), 16):
+        ks = _aes_encrypt_block(rk, counter)
+        out += bytes(b ^ k for b, k in zip(data[i:i + 16], ks))
+        counter = _add128(counter, 1)
+    return bytes(out)
+
+
+def _ctr_decrypt(key, iv, block_index, data):
+    """AES-CTR decrypt: 128-bit big-endian counter at ``iv + block_index``."""
+    if _HAVE_CRYPTO:
+        nonce = iv[:8]
+        init = int.from_bytes(iv[8:16], "big") + block_index
+        return _AES.new(key, _AES.MODE_CTR, nonce=nonce, initial_value=init).decrypt(data)
+    return _ctr_decrypt_py(key, iv, block_index, data)
+
+
+def _make_ctr_decryptor(key, iv, block_index):
+    """Return a streaming decryptor (callable: bytes -> bytes) for a data run."""
+    if _HAVE_CRYPTO:
+        nonce = iv[:8]
+        init = int.from_bytes(iv[8:16], "big") + block_index
+        cipher = _AES.new(key, _AES.MODE_CTR, nonce=nonce, initial_value=init)
+        return cipher.decrypt
+    rk = _key_schedule(key)
+    counter = _add128(iv, block_index)
+    state = {"rk": rk, "counter": counter}
+
+    def decrypt(chunk):
+        out = bytearray()
+        for i in range(0, len(chunk), 16):
+            ks = _aes_encrypt_block(state["rk"], state["counter"])
+            out += bytes(b ^ k for b, k in zip(chunk[i:i + 16], ks))
+            state["counter"] = _add128(state["counter"], 1)
+        return bytes(out)
+    return decrypt
+
+
+# --------------------------------------------------------------------------- #
+# PSP theme PTF EDAT unwrapping (pkgi-psp's unpack_psp_edat)
+# --------------------------------------------------------------------------- #
+def _need_crypto():
+    if not _HAVE_CRYPTO:
+        raise RuntimeError("theme extraction needs pycryptodome (pip install pycryptodome)")
+
+
+def _ecb_decrypt(key, block):
+    _need_crypto()
+    return _AES.new(key, _AES.MODE_ECB).decrypt(block)
+
+
+def _cmac(key, data):
+    _need_crypto()
+    from Crypto.Hash import CMAC
+    c = CMAC.new(key, ciphermod=_AES)
+    c.update(data)
+    return c.digest()
+
+
+def _kirk_iv(mac, key_header, offset2):
+    tmp = _ecb_decrypt(_KIRK38, bytes(key_header[0x70:0x80]))
+    iv = bytes(mac[i] ^ tmp[i] ^ key_header[offset2 + i] ^ _AMCTL3[i] ^ _AMCTL5[i] for i in range(16))
+    iv = _ecb_decrypt(_KIRK39, iv)
+    return bytes(b ^ _AMCTL4[i] for i, b in enumerate(iv))
+
+
+def _kirk_cbc_decrypt(iv, index, data):
+    prev = bytearray(16) if index == 0 else bytearray(iv[:12]) + index.to_bytes(4, "little")
+    block = bytearray(iv[:12]) + index.to_bytes(4, "little")
+    out = bytearray()
+    for i in range(0, len(data), 16):
+        v = int.from_bytes(block[12:16], "little") + 1
+        block[12:16] = v.to_bytes(4, "little")
+        o = _ecb_decrypt(_KIRK63, bytes(block))
+        out += bytes(b ^ prev[k] ^ o[k] for k, b in enumerate(data[i:i + 16]))
+        prev = bytes(block)
+    return bytes(out)
+
+
+def _unwrap_theme_ptf(buf):
+    """Unwrap a PSP theme PTF EDAT (``buf`` is the fully CTR-decrypted entry)."""
+    if len(buf) < 0x90 + 0xA0:
+        raise RuntimeError("theme EDAT is too short")
+    kh_off = buf[0xC]
+    key_header = bytearray(buf[kh_off:kh_off + 0xA0])
+    if bytes(key_header[:4]) != b"\x00PGD":
+        raise RuntimeError("theme EDAT: bad PGD header")
+    if int.from_bytes(key_header[4:8], "little") != 1 or int.from_bytes(key_header[8:12], "little") != 1:
+        raise RuntimeError("theme EDAT: unsupported key/drm type")
+
+    mac = _cmac(_KIRK38, bytes(key_header[:0x70]))
+
+    # Step 1: reveal the data size/offset fields (bytes 0x30..0x60).
+    key_header[0x30:0x60] = _kirk_cbc_decrypt(_kirk_iv(mac, key_header, 0x10), 0, bytes(key_header[0x30:0x60]))
+    data_size = int.from_bytes(key_header[0x44:0x48], "little")
+    data_offset = int.from_bytes(key_header[0x4c:0x50], "little")
+    if data_offset != 0x90:
+        raise RuntimeError("theme EDAT: unexpected data offset")
+
+    # Step 2: decrypt the PTF body.
+    iv = _kirk_iv(mac, key_header, 0x30)
+    out = bytearray()
+    nblocks = (data_size + 15) // 16
+    for i in range(nblocks):
+        chunk = buf[kh_off + data_offset + i * 16:kh_off + data_offset + (i + 1) * 16]
+        out += _kirk_cbc_decrypt(iv, i, chunk)
+    return bytes(out[:data_size])
+
+
+# --------------------------------------------------------------------------- #
+# PKG extraction
+# --------------------------------------------------------------------------- #
+def extract(pkg_path, dest_dir, kind_hint=None, progress_cb=None, cancel_event=None):
+    """Decrypt a PSN pkg into ``dest_dir/<TITLE_ID>/``.
+
+    Returns ``(kind, title_id, folder)`` where kind is ``"psp"``, ``"psx"``,
+    ``"theme"`` or ``"dlc"``. ``kind_hint`` ("theme"/"dlc") overrides the
+    pkg-header content-type detection (NoPayStation DLC ships as two formats).
+    """
+    from .store import TransferCancelled
+
+    pkg_path = Path(pkg_path)
+    dest_dir = Path(dest_dir)
+
+    with open(pkg_path, "rb") as fh:
+        header = fh.read(0x100)
+    if len(header) < 0xE8 or int.from_bytes(header[0:4], "big") != PKG_MAGIC:
+        raise RuntimeError(f"not a PKG file: {pkg_path.name}")
+
+    meta_offset = int.from_bytes(header[8:12], "big")
+    meta_count = int.from_bytes(header[12:16], "big")
+    item_count = int.from_bytes(header[20:24], "big")
+    enc_offset = int.from_bytes(header[32:40], "big")
+    iv = header[0x70:0x80]
+    key_type = header[0xE7] & 7
+    title_id = header[0x37:0x40].decode("ascii", "replace").rstrip("\x00").strip() or "PKG"
+
+    content_type = 0
+    items_offset = 0
+    with open(pkg_path, "rb") as fh:
+        off = meta_offset
+        for _ in range(meta_count):
+            fh.seek(off)
+            m = fh.read(16)
+            if len(m) < 16:
+                break
+            mtype = int.from_bytes(m[0:4], "big")
+            msize = int.from_bytes(m[4:8], "big")
+            if mtype == 2:
+                content_type = int.from_bytes(m[8:12], "big")
+            elif mtype == 13:
+                items_offset = int.from_bytes(m[8:12], "big")
+            off += 8 + msize
+
+    if kind_hint in ("theme", "dlc"):
+        kind = kind_hint
+    elif content_type == 6:
+        kind = "psx"
+    elif content_type in (7, 0xE, 0xF, 0x10):
+        kind = "psp"
+    elif content_type == 9:
+        kind = "theme"
+    elif content_type == 0xB:
+        kind = "dlc"
+    else:
+        raise RuntimeError(f"unsupported NoPayStation content type 0x{content_type:x}")
+
+    # NoPayStation DLC is wrapped in a PS3-format pkg (key type 4 in the header
+    # but actually encrypted with the PS3 key); everything else uses the PSP key.
+    if content_type == 0xB:
+        main_key = PS3_KEY
+        ps3_key = PS3_KEY
+    elif key_type == 1:
+        main_key = PSP_KEY
+        ps3_key = PS3_KEY
+    else:
+        raise RuntimeError(f"unsupported PKG key type {key_type}")
+
+    # Decrypt the whole item table in one shot.
+    with open(pkg_path, "rb") as fh:
+        fh.seek(enc_offset + items_offset)
+        table = fh.read(item_count * 32)
+    table = _ctr_decrypt(main_key, iv, items_offset // 16, table)
+
+    entries = []
+    for i in range(item_count):
+        e = table[i * 32:(i + 1) * 32]
+        name_offset = int.from_bytes(e[0:4], "big")
+        name_size = int.from_bytes(e[4:8], "big")
+        data_offset = int.from_bytes(e[8:16], "big")
+        data_size = int.from_bytes(e[16:24], "big")
+        psp_type = e[24]
+        flags = e[27]
+        if flags in (4, 18) or data_size == 0:
+            continue
+        item_key = main_key if psp_type == 0x90 else ps3_key
+        entries.append((name_offset, name_size, data_offset, data_size, item_key))
+
+    folder = dest_dir / title_id
+    folder.mkdir(parents=True, exist_ok=True)
+    written = []
+
+    total = sum(ds for *_, ds, _ in entries) or 1
+    done = 0
+
+    with open(pkg_path, "rb") as fh:
+        for name_offset, name_size, data_offset, data_size, item_key in entries:
+            if cancel_event is not None and cancel_event.is_set():
+                raise TransferCancelled()
+            fh.seek(enc_offset + name_offset)
+            name = _ctr_decrypt(item_key, iv, name_offset // 16, fh.read(name_size))
+            name = name.split(b"\x00", 1)[0].decode("utf-8", "replace")
+            base = name.rsplit("/", 1)[-1]
+
+            if kind == "psx" and base not in ("EBOOT.PBP", "DOCUMENT.DAT"):
+                continue
+            if kind == "psp" and base not in ("EBOOT.PBP", "PSP-KEY.EDAT", "CONTENT.DAT"):
+                continue
+            if kind == "theme" and not base.lower().endswith(".ptf"):
+                continue
+            if kind == "dlc" and not base.lower().endswith(".edat"):
+                continue
+            if kind == "dlc" and base.upper() == "ISO.BIN.EDAT":
+                # Small EDAT wrapper shipped inside PSP DLC packages — not DLC
+                # content itself, so don't install it (matches pkgi-psp).
+                continue
+
+            if kind == "theme":
+                # Read the (small) entry fully, CTR-decrypt, then unwrap the EDAT.
+                fh.seek(enc_offset + data_offset)
+                raw = _ctr_decrypt(item_key, iv, data_offset // 16, fh.read(data_size))
+                dest = folder / base
+                dest.write_bytes(_unwrap_theme_ptf(raw))
+                done += data_size
+            else:
+                dest = folder / base
+                decrypt = _make_ctr_decryptor(item_key, iv, data_offset // 16)
+                fh.seek(enc_offset + data_offset)
+                with open(dest, "wb") as out:
+                    remaining = data_size
+                    while remaining > 0:
+                        if cancel_event is not None and cancel_event.is_set():
+                            raise TransferCancelled()
+                        chunk = fh.read(min(1 << 20, remaining))
+                        if not chunk:
+                            break
+                        out.write(decrypt(chunk))
+                        remaining -= len(chunk)
+                        done += len(chunk)
+            if progress_cb is not None:
+                progress_cb("Extracting", min(done / total, 1.0), "")
+            written.append(dest)
+
+    if kind in ("psp", "psx") and not (folder / "EBOOT.PBP").exists():
+        raise RuntimeError(f"no EBOOT.PBP found in {pkg_path.name}")
+    if kind == "theme" and not any(p.suffix.lower() == ".ptf" for p in written):
+        raise RuntimeError(f"no PTF found in {pkg_path.name}")
+    if kind == "dlc" and not written:
+        raise RuntimeError(f"no DLC EDAT found in {pkg_path.name}")
+
+    return kind, title_id, folder

app/ps1_convert.py

@@ -40,6 +40,7 @@ import io
 import os
 import re
 import struct
+import sys
 import zlib
 from dataclasses import dataclass, field
 from pathlib import Path
@@ -88,7 +89,9 @@ SYNC_PATTERN = b"\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x00"
 # (ARK/PRO/ME) loads this ELF directly as the DATA.PSP section, sidestepping
 # the base PBP's encrypted ~PSP loader which frequently fails to link on
 # 6.60/6.61 (error 80020148 "game could not be started").
-_LOADER_DIR = Path(__file__).resolve().parent.parent / "data" / "loader"
+_BUNDLE_DIR = getattr(sys, "_MEIPASS", None)
+_APP_ROOT = Path(_BUNDLE_DIR).resolve() if _BUNDLE_DIR else Path(__file__).resolve().parent.parent
+_LOADER_DIR = _APP_ROOT / "data" / "loader"
 BUNDLED_DATA_PSP = _LOADER_DIR / "DATA.PSP"
 BUNDLED_KEYS_BIN = _LOADER_DIR / "KEYS.BIN"
 
@@ -871,6 +874,9 @@ def convert(
     progress_cb=None,
     cancel_event=None,
     complevel: int = 1,
+    icon0: Optional[bytes] = None,
+    pic0: Optional[bytes] = None,
+    pic1: Optional[bytes] = None,
 ) -> Path:
     """Convert a PS1 disc image to ``out_path`` (an ``EBOOT.PBP``).
 
@@ -878,6 +884,9 @@ def convert(
     ``.iso``/``.img``/``.bin``. ``base_pbp`` must be a PSN PS1 classic EBOOT.
     ``complevel`` is the DEFLATE level for the disc data (1-9; 0 = raw, which
     does not boot on real hardware and is only useful for diagnostics).
+    ``icon0`` (80x80 PNG), ``pic0`` (310x180 PNG) and ``pic1`` (480x272 PNG)
+    override the generated art; when absent the base PBP's ICON0 is reused
+    and PIC0/PIC1 are left empty.
     """
     if not base_pbp.is_file():
         raise ConversionError(f"base.pbp not found: {base_pbp}")
@@ -901,19 +910,18 @@ def convert(
     # Reuse the base PBP's SFO, patched with our title + game id (the
     # popstation approach), rather than rebuilding it from scratch.
     sfo = patch_sfo(extract_sfo(base_pbp), title, game_id)
-    # Reuse the base PBP's ICON0 too. The XMB icon parser is picky about PNG
+    # Reuse the base PBP's ICON0 when no custom icon was supplied (the XMB
-    # variants, and the base icon is guaranteed to decode; the other image
+    # icon parser is picky about PNG variants, and the base icon is guaranteed
-    # sections are left empty exactly like popstation when no assets are
+    # to decode). PIC1 is the launch background; empty when no art is given.
-    # supplied alongside the conversion.
+    icon0 = icon0 or extract_icon0(base_pbp)
-    icon0 = extract_icon0(base_pbp)
 
     # Sections in header order; empty sections keep the previous offset.
     sections = {
         "sfo": sfo,
         "icon0": icon0,
         "icon1": b"",
-        "pic0": b"",
+        "pic0": pic0 or b"",
-        "pic1": b"",
+        "pic1": pic1 or b"",
         "snd0": b"",
         "data_psp": data_psp,
         # psar written separately, sized after everything else.
@@ -981,6 +989,9 @@ def convert_to_folder(
     progress_cb=None,
     cancel_event=None,
     complevel: int = 1,
+    icon0: Optional[bytes] = None,
+    pic0: Optional[bytes] = None,
+    pic1: Optional[bytes] = None,
 ) -> Path:
     """Convert a PS1 disc into a game folder ready for /PSP/GAME.
 
@@ -993,7 +1004,8 @@ def convert_to_folder(
     folder.mkdir(parents=True, exist_ok=True)
 
     convert(source, title, game_id, base_pbp, folder / "EBOOT.PBP",
-            progress_cb=progress_cb, cancel_event=cancel_event, complevel=complevel)
+            progress_cb=progress_cb, cancel_event=cancel_event, complevel=complevel,
+            icon0=icon0, pic0=pic0, pic1=pic1)
     return folder
 
 

app/psp.py

@@ -221,8 +221,48 @@ def _pkg_items(root):
     return items
 
 
+def _theme_items(root):
+    """Installed themes (``PSP/THEME/*.ptf``), named from the PTF header."""
+    items = []
+    theme_dir = root / "PSP" / "THEME"
+    if theme_dir.is_dir():
+        try:
+            entries = sorted(theme_dir.iterdir())
+        except OSError:
+            return items
+        for path in entries:
+            if not path.is_file() or path.suffix.lower() != ".ptf":
+                continue
+            item = _file_item(path, "theme")
+            try:
+                from . import theme as theme_mod
+                name = theme_mod.ptf_name(path)
+            except Exception:  # noqa: BLE001
+                name = ""
+            if name:
+                item["name"] = name
+            items.append(item)
+    return items
+
+
+def _dlc_items(root):
+    """Installed DLC (``PSP/GAME/<GAME_ID>/*.edat``)."""
+    items = []
+    game_dir = root / "PSP" / "GAME"
+    if game_dir.is_dir():
+        for path in sorted(game_dir.rglob("*")):
+            if not path.is_file() or path.suffix.lower() != ".edat":
+                continue
+            if path.name.upper() == "ISO.BIN.EDAT":
+                continue  # package wrapper, not DLC content
+            item = _file_item(path, "dlc")
+            item["id"] = path.parent.name
+            items.append(item)
+    return items
+
+
 def list_installed(root):
-    """Return ``{games, videos, homebrew, pkg}`` inventories for a PSP root."""
+    """Return ``{games, videos, homebrew, pkg, themes, dlc}`` for a PSP root."""
     root = Path(root)
     games, videos, homebrew_isos = _iso_items(root)
     return {
@@ -230,14 +270,19 @@ def list_installed(root):
         "videos": videos,
         "homebrew": _homebrew_items(root) + homebrew_isos,
         "pkg": _pkg_items(root),
+        "themes": _theme_items(root),
+        "dlc": _dlc_items(root),
     }
 
 
 def build_index(inventory):
     """Build a lookup index for matching library discs against the PSP.
 
-    Returns ``{"raw": set, "names": set}`` where ``raw`` holds lowercase ISO
+    Returns ``{"raw", "names", "homebrew_ids", "homebrew_names"}`` where
-    stems (exact filename match) and ``names`` holds fuzzy-normalized stems.
+    ``raw`` holds lowercase ISO stems (exact filename match), ``names`` holds
+    fuzzy-normalized stems, and the homebrew keys index ``PSP/GAME/**/EBOOT.PBP``
+    (homebrew + PS1 Classics, including Category Lite subfolders) by folder id
+    and embedded title.
     """
     raw, names = set(), set()
     for group in ("games", "videos"):
@@ -247,7 +292,20 @@ def build_index(inventory):
             norm = matcher.normalize_name(stem)
             if norm:
                 names.add(norm)
-    return {"raw": raw, "names": names}
+
+    hb_ids, hb_names = set(), set()
+    for it in (inventory or {}).get("homebrew", []):
+        ident = str(it.get("id") or "").strip().lower()
+        if ident:
+            hb_ids.add(ident)
+        stem = Path(it.get("name") or "").stem.strip().lower()
+        if stem:
+            hb_names.add(stem)
+        norm = matcher.normalize_name(Path(it.get("name") or "").stem)
+        if norm:
+            hb_names.add(norm)
+    return {"raw": raw, "names": names,
+            "homebrew_ids": hb_ids, "homebrew_names": hb_names}
 
 
 def find_umd_iso(root):

app/sources.py

@@ -11,7 +11,7 @@ from pathlib import Path
 from . import config
 
 CREDENTIALS_PATH = Path(
-    os.environ.get("PSP_CREDENTIALS", str(config.DATA_DIR / "credentials.json"))
+    os.environ.get("PSP_CREDENTIALS", str(config.USER_DATA_DIR / "credentials.json"))
 )
 
 FIELDS = [

app/style.py

@@ -0,0 +1,316 @@
+"""Global dark theme for the GUI (Fusion style + palette + stylesheet).
+
+Applied once at startup from ``gui.main``.  The per-widget ``setStyleSheet``
+colors sprinkled through ``gui.py`` (``#999`` secondary text, ``#e06c6c`` delete
+buttons, ``#14151a`` preview panels) were written for a dark background, so a
+single cohesive dark theme here makes the whole UI consistent.
+"""
+from PySide6.QtGui import QColor, QPalette
+
+from . import config
+
+# Design tokens
+BG = "#1e1f24"        # window background
+SURFACE = "#26272e"   # cards, inputs, table headers
+RAISED = "#2d2e36"    # buttons, combos, menus
+BORDER = "#3a3b44"
+BORDER_SOFT = "#33343d"
+TEXT = "#e6e6ea"
+TEXT_DIM = "#9a9ba5"
+TEXT_FAINT = "#6f7079"
+ACCENT = "#4a9eff"
+ACCENT_HOVER = "#6bb0ff"
+
+
+_STYLESHEET = f"""
+QMainWindow {{
+    background: {BG};
+}}
+QWidget {{
+    color: {TEXT};
+}}
+
+/* --- Tabs --- */
+QTabWidget::pane {{
+    border: 1px solid {BORDER};
+    border-radius: 6px;
+    top: -1px;
+}}
+QTabBar::tab {{
+    background: transparent;
+    color: {TEXT_DIM};
+    padding: 8px 18px;
+    border: none;
+    border-bottom: 2px solid transparent;
+    margin-right: 2px;
+}}
+QTabBar::tab:hover:!selected {{
+    color: {TEXT};
+}}
+QTabBar::tab:selected {{
+    color: {TEXT};
+    border-bottom: 2px solid {ACCENT};
+}}
+
+/* --- Buttons --- */
+QPushButton {{
+    background: {RAISED};
+    border: 1px solid {BORDER};
+    border-radius: 6px;
+    padding: 6px 12px;
+}}
+QPushButton:hover {{
+    background: #343640;
+    border-color: {ACCENT_HOVER};
+}}
+QPushButton:pressed {{
+    background: {SURFACE};
+}}
+QPushButton:disabled {{
+    color: {TEXT_FAINT};
+    background: {SURFACE};
+    border-color: {BORDER_SOFT};
+}}
+QPushButton:checked {{
+    background: {ACCENT};
+    border-color: {ACCENT};
+    color: #101116;
+}}
+
+/* --- Inputs --- */
+QLineEdit, QSpinBox, QPlainTextEdit, QTextEdit {{
+    background: {SURFACE};
+    border: 1px solid {BORDER};
+    border-radius: 6px;
+    padding: 5px 8px;
+    selection-background-color: {ACCENT};
+    selection-color: #101116;
+}}
+QLineEdit:focus, QSpinBox:focus, QPlainTextEdit:focus, QTextEdit:focus {{
+    border-color: {ACCENT};
+}}
+QLineEdit:disabled, QSpinBox:disabled {{
+    color: {TEXT_FAINT};
+}}
+
+/* --- Combo boxes --- */
+QComboBox {{
+    background: {RAISED};
+    border: 1px solid {BORDER};
+    border-radius: 6px;
+    padding: 4px 10px;
+}}
+QComboBox:hover {{
+    border-color: {ACCENT_HOVER};
+}}
+QComboBox::drop-down {{
+    border: none;
+    width: 22px;
+}}
+QComboBox::down-arrow {{
+    image: url(__CHEVRON__);
+    width: 12px;
+    height: 8px;
+    margin-right: 6px;
+}}
+QComboBox QAbstractItemView {{
+    background: {RAISED};
+    border: 1px solid {BORDER};
+    border-radius: 6px;
+    selection-background-color: rgba(74, 158, 255, 0.25);
+    selection-color: {TEXT};
+    outline: 0;
+}}
+
+/* --- Tables --- */
+QTableWidget {{
+    background: transparent;
+    border: none;
+    gridline-color: {BORDER_SOFT};
+}}
+QHeaderView::section {{
+    background: {SURFACE};
+    color: {TEXT_DIM};
+    border: none;
+    border-bottom: 1px solid {BORDER};
+    padding: 6px 8px;
+}}
+QTableWidget::item {{
+    padding: 4px 6px;
+}}
+QTableWidget::item:selected {{
+    background: rgba(74, 158, 255, 0.22);
+    color: {TEXT};
+}}
+QTableCornerButton::section {{
+    background: {SURFACE};
+    border: none;
+    border-bottom: 1px solid {BORDER};
+}}
+
+/* --- Cover grid / lists --- */
+QListWidget {{
+    background: transparent;
+    border: none;
+}}
+QListWidget::item {{
+    border-radius: 6px;
+}}
+QListWidget::item:hover:!selected {{
+    background: rgba(255, 255, 255, 0.04);
+}}
+QListWidget::item:selected {{
+    background: rgba(74, 158, 255, 0.22);
+}}
+
+/* --- Cards (details panels use QScrollArea) --- */
+QScrollArea {{
+    background: {SURFACE};
+    border: none;
+}}
+
+/* --- Menus --- */
+QMenu {{
+    background: {RAISED};
+    border: 1px solid {BORDER};
+    border-radius: 6px;
+    padding: 4px;
+}}
+QMenu::item {{
+    padding: 6px 26px 6px 12px;
+    border-radius: 4px;
+}}
+QMenu::item:selected {{
+    background: rgba(74, 158, 255, 0.25);
+}}
+QMenu::separator {{
+    height: 1px;
+    background: {BORDER};
+    margin: 4px 8px;
+}}
+
+/* --- Scrollbars --- */
+QScrollBar:vertical {{
+    background: transparent;
+    width: 10px;
+    margin: 0;
+}}
+QScrollBar::handle:vertical {{
+    background: {BORDER};
+    border-radius: 5px;
+    min-height: 30px;
+}}
+QScrollBar::handle:vertical:hover {{
+    background: {ACCENT};
+}}
+QScrollBar:horizontal {{
+    background: transparent;
+    height: 10px;
+    margin: 0;
+}}
+QScrollBar::handle:horizontal {{
+    background: {BORDER};
+    border-radius: 5px;
+    min-width: 30px;
+}}
+QScrollBar::handle:horizontal:hover {{
+    background: {ACCENT};
+}}
+QScrollBar::add-line, QScrollBar::sub-line {{
+    width: 0;
+    height: 0;
+}}
+QScrollBar::add-page, QScrollBar::sub-page {{
+    background: transparent;
+}}
+
+/* --- Splitter --- */
+QSplitter::handle {{
+    background: transparent;
+}}
+QSplitter::handle:horizontal {{
+    width: 1px;
+}}
+QSplitter::handle:vertical {{
+    height: 1px;
+}}
+
+/* --- Misc --- */
+QToolTip {{
+    background: {RAISED};
+    color: {TEXT};
+    border: 1px solid {BORDER};
+    padding: 4px 6px;
+}}
+QStatusBar {{
+    background: {SURFACE};
+    color: {TEXT_DIM};
+    border-top: 1px solid {BORDER};
+}}
+QProgressBar {{
+    background: {SURFACE};
+    border: 1px solid {BORDER};
+    border-radius: 6px;
+    text-align: center;
+}}
+QProgressBar::chunk {{
+    background: {ACCENT};
+    border-radius: 5px;
+}}
+QCheckBox {{
+    spacing: 8px;
+}}
+QCheckBox::indicator {{
+    width: 16px;
+    height: 16px;
+    border: 1px solid {BORDER};
+    border-radius: 4px;
+    background: {SURFACE};
+}}
+QCheckBox::indicator:checked {{
+    background: {ACCENT};
+    border-color: {ACCENT};
+}}
+QGroupBox {{
+    border: 1px solid {BORDER};
+    border-radius: 6px;
+    margin-top: 10px;
+}}
+QGroupBox::title {{
+    subcontrol-origin: margin;
+    left: 10px;
+    padding: 0 4px;
+    color: {TEXT_DIM};
+}}
+"""
+
+
+def _dark_palette():
+    p = QPalette()
+    p.setColor(QPalette.Window, QColor(BG))
+    p.setColor(QPalette.WindowText, QColor(TEXT))
+    p.setColor(QPalette.Base, QColor(SURFACE))
+    p.setColor(QPalette.AlternateBase, QColor(RAISED))
+    p.setColor(QPalette.ToolTipBase, QColor(RAISED))
+    p.setColor(QPalette.ToolTipText, QColor(TEXT))
+    p.setColor(QPalette.Text, QColor(TEXT))
+    p.setColor(QPalette.Button, QColor(RAISED))
+    p.setColor(QPalette.ButtonText, QColor(TEXT))
+    p.setColor(QPalette.BrightText, QColor("#ff5c5c"))
+    p.setColor(QPalette.Link, QColor(ACCENT))
+    p.setColor(QPalette.Highlight, QColor(ACCENT))
+    p.setColor(QPalette.HighlightedText, QColor("#101116"))
+    p.setColor(QPalette.PlaceholderText, QColor(TEXT_FAINT))
+
+    faint = QColor(TEXT_FAINT)
+    for role in (QPalette.WindowText, QPalette.Text, QPalette.ButtonText):
+        p.setColor(QPalette.Disabled, role, faint)
+    return p
+
+
+def apply_theme(app):
+    """Apply the dark Fusion theme to ``app`` (call once before showing UI)."""
+    app.setStyle("Fusion")
+    app.setPalette(_dark_palette())
+    chevron = str(config.resource_path("img", "chevron.png"))
+    app.setStyleSheet(_STYLESHEET.replace("__CHEVRON__", chevron))

app/theme.py

@@ -0,0 +1,511 @@
+"""PSP theme (``.ptf``) introspection: name + preview image.
+
+PTF themes embed a readable name in their header and a preview image (a GIM
+bitmap) in object 0. This module decodes both without any external service:
+
+* the name lives at offset 0x08 (128 UTF-8 bytes);
+* the preview is object 0's largest image item, stored as a GIM that may be
+  Sony-LZR compressed.
+
+GIM decoding covers the common RGBA formats (5650/5551/4444/8888) and 8-bit
+palettes; anything exotic simply yields no preview.
+"""
+from __future__ import annotations
+
+import zlib
+from pathlib import Path
+
+PTF_MAGIC = b"\x00PTF"
+
+# --------------------------------------------------------------------------- #
+# Sony LZR/RLZ decompression (sceLzrDecompress), ported from PTF-Studio.
+# --------------------------------------------------------------------------- #
+_LZR_PROBABILITY_SLOTS = 2800
+_LZR_INITIAL_PROBABILITY = 0x80
+_LZR_RENORM_LIMIT = 0x00FFFFFF
+_LZR_U32_MOD = 0x100000000
+
+
+def _lzr_decompress(inp, max_output, offset=0):
+    inp = bytes(inp)
+    end = offset + len(inp) - offset
+    out = bytearray(max_output)
+    probs = [_LZR_INITIAL_PROBABILITY] * _LZR_PROBABILITY_SLOTS
+    out_pos = 0
+    in_pos = offset + 5
+    code = int.from_bytes(inp[offset + 1:offset + 5], "big")
+    range_ = 0xFFFFFFFF
+    spec = 0
+    corrupt = False
+    buf_off = 0
+    last_byte = 0
+    last_number_flag = 0
+    type_ = inp[offset]
+    if type_ >= 0x80:
+        type_ -= 0x100
+
+    def next_byte():
+        nonlocal in_pos, corrupt
+        if in_pos >= end:
+            corrupt = True
+            return 0
+        b = inp[in_pos]
+        in_pos += 1
+        return b
+
+    if type_ > 7:
+        raise ValueError("unsupported LZR literal-context mode")
+    if type_ < 0:
+        stored = code
+        if stored > len(out) or in_pos + stored > end:
+            raise ValueError("malformed stored LZR block")
+        return inp[in_pos:in_pos + stored]
+
+    def renormalize():
+        nonlocal code, range_
+        if range_ <= _LZR_RENORM_LIMIT:
+            code = (code * 256 + next_byte()) % _LZR_U32_MOD
+            range_ = (range_ * 256) % _LZR_U32_MOD
+
+    def decode_bit(prob_index):
+        nonlocal code, range_, corrupt
+        if prob_index < 0 or prob_index >= _LZR_PROBABILITY_SLOTS:
+            corrupt = True
+            return 0
+        renormalize()
+        if corrupt:
+            return 0
+        p = probs[prob_index]
+        bound = (range_ // 256) * p
+        probs[prob_index] = p - (p // 8)
+        if code < bound:
+            range_ = bound
+            probs[prob_index] += 31
+            return 1
+        code -= bound
+        range_ -= bound
+        return 0
+
+    def decode_bit_speculative(prob_index):
+        nonlocal code, range_, spec, corrupt
+        if prob_index < 0 or prob_index >= _LZR_PROBABILITY_SLOTS:
+            corrupt = True
+            return 0
+        if spec <= _LZR_RENORM_LIMIT:
+            code = (code * 256 + next_byte()) % _LZR_U32_MOD
+            range_ = (spec * 256) % _LZR_U32_MOD
+        if corrupt:
+            return 0
+        p = probs[prob_index]
+        bound = (range_ // 256) * p
+        spec = bound
+        probs[prob_index] = p - (p // 8)
+        if code < bound:
+            range_ = bound
+            probs[prob_index] += 31
+            return 1
+        code -= bound
+        range_ -= bound
+        return 0
+
+    def decode_number(bits, base, step):
+        nonlocal code, range_, corrupt, last_number_flag
+        number = 1
+        if bits >= 3:
+            number = number * 2 + decode_bit(base + 3 * step)
+            if bits >= 4:
+                number = number * 2 + decode_bit(base + 3 * step)
+                if bits >= 5:
+                    renormalize()
+                    remaining = bits
+                    while remaining >= 5:
+                        if range_ == 0:
+                            corrupt = True
+                            return 0
+                        number *= 2
+                        range_ = range_ // 2
+                        if code < range_:
+                            number += 1
+                        else:
+                            code -= range_
+                        remaining -= 1
+        last_number_flag = decode_bit(base)
+        number = number * 2 + last_number_flag
+        if bits >= 1:
+            number = number * 2 + decode_bit(base + step)
+            if bits >= 2:
+                number = number * 2 + decode_bit(base + 2 * step)
+        return number
+
+    def selector_context():
+        return buf_off + 2488
+
+    def decode_literal(shift):
+        nonlocal out_pos, last_byte, corrupt, buf_off
+        if buf_off > 0:
+            buf_off -= 1
+        if out_pos == len(out):
+            return False
+        context = ((((out_pos & 7) << 8) + last_byte) // (2 ** shift)) & 7
+        tree_base = context * 0xFF - 1
+        node = 1
+        while node <= 0xFF:
+            node = node * 2 + decode_bit(tree_base + node)
+            if corrupt:
+                return False
+        out[out_pos] = node & 0xFF
+        last_byte = node & 0xFF
+        out_pos += 1
+        return True
+
+    def decode_match():
+        nonlocal out_pos, last_byte, buf_off, spec, code, range_, corrupt, last_number_flag
+        slot = selector_context()
+        spec = range_
+        length_class = -1
+        bit = 0
+        while True:
+            slot += 8
+            bit = decode_bit_speculative(slot)
+            if corrupt:
+                return -1
+            length_class += bit
+            if bit == 0 or length_class >= 6:
+                break
+        offset_group = length_class + 2033
+        offset_bias = 64
+        if bit != 0 or length_class >= 0:
+            length_context = (length_class << 5) + (((out_pos * (2 ** length_class)) & 3) << 3) + buf_off + 2552
+            match_length = decode_number(length_class, length_context, 8)
+            if corrupt:
+                return -1
+            if match_length == 0xFF:
+                return 1
+            if last_number_flag != 0 or length_class > 0:
+                offset_group += 56
+                offset_bias = 352
+        else:
+            match_length = 1
+        index = 1
+        offset_class = 0
+        while True:
+            offset_class = (index << 4) - offset_bias
+            prob_index = offset_group + (index << 3)
+            if prob_index >= _LZR_PROBABILITY_SLOTS:
+                return -1
+            bit = decode_bit(prob_index)
+            if corrupt:
+                return -1
+            index = (index << 1) | bit
+            if offset_class >= 0:
+                break
+        if bit != 0 or offset_class > 0:
+            if bit == 0:
+                offset_class -= 8
+            base = offset_class + 2344
+            if base < 0 or base + 3 >= _LZR_PROBABILITY_SLOTS:
+                return -1
+            back_offset = decode_number(offset_class // 8, base, 1)
+            if corrupt:
+                return -1
+        else:
+            back_offset = 1
+        if back_offset > out_pos:
+            return -1
+        copy_end = out_pos + match_length + 1
+        if copy_end > len(out):
+            return -1
+        buf_off = ((copy_end + 1) & 1) + 6
+        from_ = out_pos - back_offset
+        while out_pos < copy_end:
+            out[out_pos] = out[from_]
+            out_pos += 1
+            from_ += 1
+        last_byte = out[out_pos - 1]
+        return 0
+
+    token_budget = max(1024, max_output * 2 + 1024)
+    while True:
+        token_budget -= 1
+        if token_budget < 0:
+            raise ValueError("malformed LZR stream did not terminate")
+        token_is_match = decode_bit(selector_context())
+        if corrupt:
+            raise ValueError("truncated LZR stream")
+        if token_is_match == 0:
+            if not decode_literal(type_):
+                raise ValueError("LZR stream exceeds declared output size")
+        else:
+            result = decode_match()
+            if result == 1:
+                return bytes(out[:out_pos])
+            if result < 0:
+                raise ValueError("malformed LZR back-reference")
+
+
+# --------------------------------------------------------------------------- #
+# PTF parsing
+# --------------------------------------------------------------------------- #
+def _decompress_item(blob, comp, ucsize):
+    if comp == 2 and len(blob) < ucsize:
+        return zlib.decompress(blob)
+    if comp == 1 and len(blob) < ucsize:
+        return _lzr_decompress(blob, ucsize)
+    return blob
+
+
+def parse_ptf(data):
+    """Return ``(name, items)`` where items are decompressed item blobs."""
+    if not isinstance(data, (bytes, bytearray)):
+        data = data.read_bytes() if hasattr(data, "read_bytes") else bytes(data)
+    data = bytes(data)
+    if data[:4] != PTF_MAGIC:
+        raise ValueError("not a PTF file")
+
+    raw_name = data[8:8 + 128]
+    name = raw_name.split(b"\x00", 1)[0].decode("utf-8", "replace").strip()
+
+    def u16(o):
+        return int.from_bytes(data[o:o + 2], "little")
+
+    def u32(o):
+        return int.from_bytes(data[o:o + 4], "little")
+
+    items = []
+    pos = 0x100
+    while True:
+        offset = u32(pos)
+        pos += 4
+        if offset == 0 or offset >= len(data):
+            break
+        count = u16(offset + 2)
+        data_off = u32(offset + 8)
+        p = data_off
+        for _ in range(count):
+            file_type = u16(p + 4)
+            comp = u16(p + 6)
+            size = u32(p + 8)
+            ucsize = u32(p + 12)
+            blob = data[p + 0x20:p + 0x20 + size]
+            items.append((file_type, _decompress_item(blob, comp, ucsize)))
+            p += 0x20 + size
+    return name, items
+
+
+def ptf_name(path):
+    """Theme display name embedded in a ``.ptf`` file."""
+    try:
+        with open(path, "rb") as fh:
+            head = fh.read(8 + 128)
+    except OSError:
+        return ""
+    if head[:4] != PTF_MAGIC:
+        return ""
+    name = head[8:8 + 128].split(b"\x00", 1)[0].decode("utf-8", "replace").strip()
+    return name or Path(path).stem
+
+
+# --------------------------------------------------------------------------- #
+# GIM decoding (RGBA formats only)
+# --------------------------------------------------------------------------- #
+def _overscan(value, tile):
+    return value if value % tile == 0 else value + (tile - (value % tile))
+
+
+def _untile(pixels, w, h, tile_w, tile_h):
+    over_w = _overscan(w, tile_w)
+    over_h = _overscan(h, tile_h)
+    out = [0] * (w * h)
+    tile_pos = 0
+    origin_x = 0
+    origin_y = 0
+    for y in range(over_h):
+        for x in range(over_w):
+            dx = origin_x + (tile_pos % tile_w)
+            dy = origin_y + (tile_pos // tile_w)
+            if dx < w and dy < h:
+                out[dy * w + dx] = pixels[y * over_w + x]
+            tile_pos += 1
+            if tile_pos == tile_w * tile_h:
+                tile_pos = 0
+                origin_x += tile_w
+                if origin_x >= over_w:
+                    origin_x = 0
+                    origin_y += tile_h
+    return out
+
+
+def _gim_to_rgba(data):
+    """Decode a GIM to ``(width, height, rgba_bytes)`` or None if unsupported."""
+    data = bytes(data)
+    if len(data) < 0x10:
+        return None
+
+    # Detect byte order from the magic. Sony GIMs store the magic as the byte
+    # string "MIG.00.1PSP" with little-endian data (LibPSPThemes semantics).
+    if data[:4] == b"MIG.":
+        byteorder = "little"
+    elif data[:4] == b".GIM":
+        byteorder = "big"
+    else:
+        return None
+
+    def rd(off, size):
+        return int.from_bytes(data[off:off + size], byteorder)
+
+    image = None
+    palette = None
+    pos = 0x10
+    for _ in range(32):
+        if pos + 16 > len(data):
+            break
+        btype = rd(pos, 2)
+        next_block = rd(pos + 8, 4)
+        if btype == 4 or btype == 5:
+            h = pos + 0x10
+            fmt = rd(h + 4, 2)
+            pixel_order = rd(h + 6, 2)
+            width = rd(h + 8, 2)
+            height = rd(h + 10, 2)
+            bpp = rd(h + 12, 2)
+            next_index = rd(h + 24, 4)
+            frame_data_end = rd(h + 32, 4)
+            frame_offset = rd(pos + 0x10 + next_index, 4)
+            block_content = pos + 0x10
+            start = block_content + frame_offset
+            end = block_content + frame_data_end
+            raw = data[start:end]
+            pixels = _decode_pixels(raw, fmt, bpp, width, height, pixel_order)
+            if pixels is None:
+                return None
+            if btype == 4:
+                image = (width, height, pixels)
+            else:
+                palette = (fmt, width, height, pixels)
+        if next_block == 0:
+            break
+        pos += next_block
+
+    if image is None:
+        return None
+    width, height, pixels = image
+    if palette is not None:
+        _, pw, ph, pvals = palette
+        if pw * ph > 0:
+            pixels = [pvals[p] if p < len(pvals) else 0 for p in pixels]
+
+    rgba = bytearray(width * height * 4)
+    for i, v in enumerate(pixels):
+        # pixels are packed 0xAABBGGRR
+        o = i * 4
+        rgba[o] = v & 0xFF
+        rgba[o + 1] = (v >> 8) & 0xFF
+        rgba[o + 2] = (v >> 16) & 0xFF
+        rgba[o + 3] = (v >> 24) & 0xFF
+    return width, height, bytes(rgba)
+
+
+def _decode_pixels(raw, fmt, bpp, width, height, pixel_order):
+    """Decode a GIM frame into a list of packed 0xAABBGGRR ints."""
+    if fmt in (0, 1, 2, 3, 5):
+        pass
+    else:
+        return None  # indexed-16 / DXT etc. not supported
+
+    if fmt == 5:  # p8 indexed
+        bytes_per_pixel = 1
+        tile_w = 0x80 // max(bpp, 8)
+    else:
+        bytes_per_pixel = max(1, (bpp + 7) // 8)
+        tile_w = 0x80 // max(bpp, 1)
+    tile_h = 8
+
+    if pixel_order == 1:
+        w = _overscan(width, tile_w)
+        h = _overscan(height, tile_h)
+    else:
+        w, h = width, height
+
+    count = w * h
+    values = []
+    pos = 0
+    for _ in range(count):
+        v = int.from_bytes(raw[pos:pos + bytes_per_pixel], "little")
+        pos += bytes_per_pixel
+        values.append(_expand(fmt, bpp, v))
+        if pos >= len(raw):
+            # pad missing trailing pixels with transparent
+            values.extend([0] * (count - len(values)))
+            break
+
+    if pixel_order == 1:
+        values = _untile(values, width, height, tile_w, tile_h)
+    return values[:width * height]
+
+
+def _expand(fmt, bpp, v):
+    """Expand a raw GIM pixel value into packed 0xAABBGGRR."""
+    if fmt == 3:  # rgba8888
+        r = v & 0xFF
+        g = (v >> 8) & 0xFF
+        b = (v >> 16) & 0xFF
+        a = (v >> 24) & 0xFF
+        return (a << 24) | (b << 16) | (g << 8) | r
+    if fmt == 0:  # rgba5650
+        r = (v >> 11) & 0x1F
+        g = (v >> 5) & 0x3F
+        b = v & 0x1F
+        r = (r << 3) | (r >> 2)
+        g = (g << 2) | (g >> 4)
+        b = (b << 3) | (b >> 2)
+        return (0xFF << 24) | (b << 16) | (g << 8) | r
+    if fmt == 1:  # rgba5551
+        r = (v >> 11) & 0x1F
+        g = (v >> 6) & 0x1F
+        b = (v >> 1) & 0x1F
+        a = 0xFF if v & 1 else 0
+        r = (r << 3) | (r >> 2)
+        g = (g << 3) | (g >> 2)
+        b = (b << 3) | (b >> 2)
+        return (a << 24) | (b << 16) | (g << 8) | r
+    if fmt == 2:  # rgba4444
+        r = (v >> 12) & 0xF
+        g = (v >> 8) & 0xF
+        b = (v >> 4) & 0xF
+        a = v & 0xF
+        r = (r << 4) | r
+        g = (g << 4) | g
+        b = (b << 4) | b
+        a = (a << 4) | a
+        return (a << 24) | (b << 16) | (g << 8) | r
+    if fmt == 5:  # p8 — value is a palette index (expanded later)
+        return v & 0xFF
+    return 0
+
+
+# --------------------------------------------------------------------------- #
+# Public API
+# --------------------------------------------------------------------------- #
+def theme_preview_rgba(ptf_path):
+    """Decode the preview image of a theme PTF.
+
+    Returns ``(width, height, rgba_bytes)`` or None if it can't be decoded.
+    """
+    try:
+        data = Path(ptf_path).read_bytes()
+        _, items = parse_ptf(data)
+    except (OSError, ValueError):
+        return None
+
+    # The preview image is the largest decodable GIM item.
+    best = None
+    for file_type, blob in items:
+        if file_type != 5:
+            continue
+        decoded = _gim_to_rgba(blob)
+        if decoded is None:
+            continue
+        w, h, rgba = decoded
+        if best is None or w * h > best[0] * best[1]:
+            best = (w, h, rgba)
+    return best

app/transfers.py

@@ -237,12 +237,20 @@ class Ps1ConvertSource(Source):
             if progress_cb is not None and total:
                 progress_cb("Converting", min(done / total, 1.0), "")
 
-        from . import ps1_convert
+        from . import covers, ps1_convert
+
+        # Pull the game's real cover art (libretro / ScreenScraper / IGDB /
+        # Wikipedia) and bake it into ICON0 + PIC0 + PIC1 so the XMB shows the
+        # official-style art, not the default PS1 icon. Best effort.
+        if progress_cb is not None:
+            progress_cb("Artwork", 0.0, "")
+        icon0, pic0, pic1 = covers.ps1_art(title, game_id)
 
         try:
             ps1_convert.convert_to_folder(
                 source, title, game_id, self.base_pbp, dest_dir,
                 progress_cb=cb, cancel_event=cancel_event,
+                icon0=icon0, pic0=pic0, pic1=pic1,
             )
         except ps1_convert.Cancelled:
             raise TransferCancelled() from None
@@ -455,3 +463,58 @@ class LocalShareSource(Source):
             return dest
         finally:
             shutil.rmtree(tmp, ignore_errors=True)
+
+
+class NoPayStationSource(Source):
+    """Browse NoPayStation .pkg lists and install PSP/PSX PSN content.
+
+    ``content_type`` is ``"psp"`` (PSP_GAMES.tsv), ``"psx"`` (PSX_GAMES.tsv),
+    ``"theme"`` (PSP_THEMES.tsv) or ``"dlc"`` (PSP_DLCS.tsv). Downloading
+    decrypts the ``.pkg`` with the bundled pure-Python decryptor and writes a
+    ``<TITLE_ID>/`` game folder into ``dest_dir``.
+    """
+
+    label = "NoPayStation"
+
+    def __init__(self, content_type, tsv_url="", force=False):
+        from . import nopaystation
+        self.content_type = content_type
+        self.tsv_url = tsv_url or nopaystation.tsv_url(content_type)
+        self.force = force
+
+    def scan(self, root=None):
+        from . import nopaystation
+        return nopaystation.fetch_items(self.content_type, self.tsv_url, force=self.force)
+
+    def download(self, item, dest_dir, progress_cb=None, cancel_event=None):
+        from . import nopaystation
+        dest_dir = Path(dest_dir)
+        dest_dir.mkdir(parents=True, exist_ok=True)
+
+        # The bundled Python decryptor handles PSP/PSX/themes/DLC directly.
+        title_id = item.get("title_id") or item.get("content_id") or ""
+        pkg_name = re.sub(r"[^A-Za-z0-9_-]", "", title_id) or "pkg"
+        tmp = Path(tempfile.mkdtemp(prefix="nps-download-"))
+        pkg = tmp / f"{pkg_name}.pkg"
+        try:
+            if progress_cb is not None:
+                progress_cb("Downloading", 0.0, "")
+            download_url(item["pkg_url"], pkg, None, progress_cb, cancel_event)
+            kind_hint = self.content_type if self.content_type in ("theme", "dlc") else None
+            folder = nopaystation.extract_pkg(pkg, title_id, dest_dir,
+                                              kind_hint, progress_cb, cancel_event)
+            if self.content_type in ("theme", "dlc"):
+                _write_sidecar(folder, item)
+            return folder
+        finally:
+            shutil.rmtree(tmp, ignore_errors=True)
+
+
+def _write_sidecar(folder, item):
+    """Save the store display name beside a downloaded theme/DLC (for the library)."""
+    try:
+        meta = {"name": item.get("name") or "", "title_id": item.get("title_id") or "",
+                "content_id": item.get("content_id") or ""}
+        (Path(folder) / "meta.json").write_text(json.dumps(meta, ensure_ascii=False), encoding="utf-8")
+    except OSError:
+        pass

data/nps/README.md

@@ -0,0 +1,2 @@
+# NoPayStation TSV lists are cached here (downloaded on first store scan).
+# You can also drop PSP_GAMES.tsv / PSX_GAMES.tsv here manually to work offline.

docker-compose.yml

@@ -6,7 +6,7 @@ services:
     # Plain HTTP for now; see Caddyfile to add Let's Encrypt TLS later.
     networks:
       br0:
-        ipv4_address: 192.168.10.100
+        ipv4_address: ${PSP_LAN_IP}
     environment:
       PSP_DATA_DIR: /data
       PSP_DATS_DIR: /data/dats
@@ -16,14 +16,14 @@ services:
       PSP_VIDEO_ROOTS: /data/umd_videos
       PSP_STORE_DIR: /data/store
       # Secret token the desktop app sends as `Authorization: Bearer <token>`.
-      # Set via a .env file next to this compose file.
+      # Set in the .env file next to this compose file.
       PSP_API_TOKEN: ${PSP_API_TOKEN:-}
     volumes:
       - ./data:/data
-      # Adjust host paths to your Unraid share layout:
+      # Host paths come from .env (see .env.example):
-      - /mnt/user/downloads/Sony - PlayStation Portable:/data/store:ro
+      - ${PSP_STORE_HOST}:/data/store:ro
-      - /mnt/user/psp/umd_games:/data/umd_games:ro
+      - ${PSP_UMD_GAMES_HOST}:/data/umd_games:ro
-      - /mnt/user/psp/umd_videos:/data/umd_videos:ro
+      - ${PSP_UMD_VIDEOS_HOST}:/data/umd_videos:ro
     restart: unless-stopped
 
 networks:

psp-preserve.spec

@@ -0,0 +1,65 @@
+# -*- mode: python ; coding: utf-8 -*-
+"""PyInstaller spec: build the PSP Preservation Tool (onedir).
+
+Bundles the read-only resources (DATs, PS1 loader, offline cover bundles,
+icons) under ``_internal/`` next to the executable. User-writable data
+(credentials, manual covers, PS1 templates, NPS cache, library DB, cover
+cache) lives in the OS state dir at runtime — see ``app/config.py``.
+
+Usage:  pyinstaller --clean --noconfirm psp-preserve.spec
+Output: dist/psp-preserve/
+"""
+from PyInstaller.utils.hooks import collect_dynamic_libs, collect_submodules
+
+datas = [
+    ("data/dats", "data/dats"),
+    ("data/loader", "data/loader"),
+    ("data/supplement.json", "data"),
+    ("data/covers/libretro-covers.zip", "data/covers"),
+    ("data/covers/openvgdb-covers.zip", "data/covers"),
+    ("data/covers/libretro-index.json", "data/covers"),
+    ("data/covers/openvgdb-index.json", "data/covers"),
+    ("data/covers/UMD_COVER_TEMPLATE.png", "data/covers"),
+    ("data/covers/UMD_COVER_TEMPLATE_FEATURE.png", "data/covers"),
+    ("data/covers/UMD_GAME_COVER_TEMPLATE.png", "data/covers"),
+    ("img/app-icon.png", "img"),
+    ("img/chevron.png", "img"),
+]
+
+a = Analysis(
+    ["run.py"],
+    pathex=[],
+    binaries=collect_dynamic_libs("curl_cffi"),
+    datas=datas,
+    hiddenimports=collect_submodules("curl_cffi"),
+    hookspath=[],
+    hooksconfig={},
+    runtime_hooks=[],
+    excludes=["tkinter", "unittest", "pydoc"],
+    noarchive=False,
+)
+
+pyz = PYZ(a.pure)
+
+exe = EXE(
+    pyz,
+    a.scripts,
+    [],
+    exclude_binaries=True,
+    name="psp-preserve",
+    debug=False,
+    bootloader_ignore_signals=False,
+    strip=False,
+    upx=False,
+    console=False,
+    disable_windowed_traceback=False,
+)
+
+coll = COLLECT(
+    exe,
+    a.binaries,
+    a.datas,
+    strip=False,
+    upx=False,
+    name="psp-preserve",
+)

requirements-build.txt

@@ -0,0 +1,7 @@
+# Build dependencies (pinned for reproducible CI builds).
+# PySide6 is pinned to 6.8.3: newer 6.11.x bundles a Qt6Core.dll that imports
+# icuuc.dll on Windows, which is not shipped and crashes at startup.
+pyinstaller>=6.11
+PySide6==6.8.3
+curl_cffi>=0.7
+pycryptodome>=3.20

requirements.txt

@@ -1,2 +1,3 @@
 PySide6>=6.6
 curl_cffi>=0.7
+pycryptodome>=3.20

run.py

@@ -0,0 +1,10 @@
+"""PyInstaller entry point.
+
+Runs the GUI the same way ``python -m app.main`` does, but as a plain script
+so PyInstaller can build it (relative imports inside ``app`` won't resolve when
+a module file is executed directly, hence this top-level launcher).
+"""
+from app.main import main
+
+if __name__ == "__main__":
+    raise SystemExit(main())