refactor: eliminate hardcoded (320,320) resolution defaults

Resolution is now resolved exclusively from the USB handshake and stored
per-device in config['devices']['X']['w'/'h']. FBL_PROFILES in core/models.py
is the single source of truth for all resolution constants.

Key changes:
- settings._width/_height default to 0,0; _resolve_paths() skipped until
  a real resolution is known from the handshake
- app._wire_bus() dispatches InitializeDeviceCommand after building the LCD
  bus, so CLI/API paths get settings.resolution set from the handshake (the
  GUI already did this via lcd_handler.apply_device_config)
- cli/resume: calls lcd.set_resolution(*dev.resolution) before loading theme
- ThemeService.discover_local/load_local_themes: resolution now optional (0,0)
- services/media: set_target_size() required before load(); _make_service()
  fixture pre-wires it via FBL_PROFILES[100]
- services/overlay: OverlayRenderer defaults to 0,0; tests use _ov() helper
- test_conf: updated to reflect in-memory-only set_resolution semantics
- conftest: settings_with_resolution fixture for widget tests

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: Lexonight1

src/trcc/adapters/device/scsi.py

@@ -77,7 +77,7 @@ class ScsiDevice(FrameDevice):
     # Track which devices have been initialized (poll + init sent)
     _initialized_devices: Set[str] = set()
 
-    def __init__(self, device_path: str, width: int = 320, height: int = 320):
+    def __init__(self, device_path: str, width: int = 0, height: int = 0):
         self.device_path = device_path
         self.width = width
         self.height = height
@@ -218,7 +218,7 @@ def _init_device(dev: str) -> tuple[int, bytes]:
         return fbl, response[:64]
 
     @staticmethod
-    def _send_frame(dev: str, rgb565_data: bytes, width: int = 320, height: int = 320):
+    def _send_frame(dev: str, rgb565_data: bytes, width: int, height: int):
         """Send one RGB565 frame in SCSI chunks sized for the resolution."""
         chunks = ScsiDevice._get_frame_chunks(width, height)
         total_size = sum(size for _, size in chunks)

src/trcc/adapters/infra/dc_config.py

@@ -62,8 +62,8 @@ def __init__(self, filepath: str | Path | None = None):
         self.overlay_enabled: bool = True
         self.overlay_x: int = 0
         self.overlay_y: int = 0
-        self.overlay_w: int = 320
-        self.overlay_h: int = 320
+        self.overlay_w: int = 0
+        self.overlay_h: int = 0
 
         # Mask
         self.mask_enabled: bool = False
@@ -151,15 +151,15 @@ def _to_theme_config(self):
 
     # ── Overlay conversion ──
 
-    def to_overlay_config(self, width: int = 320, height: int = 320) -> dict:
+    def to_overlay_config(self) -> dict:
         """Convert to overlay renderer config dict."""
         parsed = {
             'elements': self.legacy_elements,
             'display_elements': self.elements,
             'custom_text': self.custom_text,
             'flags': self.flags,
         }
-        return DcParser.to_overlay_config(parsed, width, height)
+        return DcParser.to_overlay_config(parsed)
 
     @classmethod
     def from_overlay_config(cls, overlay_config: dict,

src/trcc/adapters/infra/dc_parser.py

@@ -445,7 +445,7 @@ def _parse_display_elements(data: bytes, start_pos: int) -> List[DisplayElement]
         return elements
 
     @staticmethod
-    def to_overlay_config(dc_config: dict, display_width: int = 320, display_height: int = 320) -> dict:
+    def to_overlay_config(dc_config: dict) -> dict:
         """Convert parsed .dc config to overlay renderer config format."""
         elements = dc_config.get('elements', {})
         display_elements = dc_config.get('display_elements', [])
@@ -629,7 +629,7 @@ def list_configs(base_path: str) -> list:
         return sorted(str(dc_file) for dc_file in base.rglob('config1.dc'))
 
     @staticmethod
-    def validate_theme(theme_path: str, display_width: int = 320, display_height: int = 320) -> dict:
+    def validate_theme(theme_path: str, display_width: int | None = None, display_height: int | None = None) -> dict:
         """Validate a theme's config and return any issues found."""
         import os
 
@@ -668,17 +668,18 @@ def validate_theme(theme_path: str, display_width: int = 320, display_height: in
                     result['issues'].append('Time in config but not in display_elements (0xDD bug)')
                     result['valid'] = False
 
-            for key, cfg in overlay.items():
-                x, y = cfg.get('x', 0), cfg.get('y', 0)
-                if x < 0 or x > display_width or y < 0 or y > display_height:
-                    result['warnings'].append(
-                        f'{key}: position ({x}, {y}) outside {display_width}x{display_height}')
-
-            mask = parsed.get('mask_settings', {})
-            if mask.get('mask_enabled'):
-                pos = mask.get('mask_position', (0, 0))
-                if pos[0] < 0 or pos[0] > display_width or pos[1] < 0 or pos[1] > display_height:
-                    result['warnings'].append(f'Mask position {pos} may be outside bounds')
+            if display_width is not None and display_height is not None:
+                for key, cfg in overlay.items():
+                    x, y = cfg.get('x', 0), cfg.get('y', 0)
+                    if x < 0 or x > display_width or y < 0 or y > display_height:
+                        result['warnings'].append(
+                            f'{key}: position ({x}, {y}) outside {display_width}x{display_height}')
+
+                mask = parsed.get('mask_settings', {})
+                if mask.get('mask_enabled'):
+                    pos = mask.get('mask_position', (0, 0))
+                    if pos[0] < 0 or pos[0] > display_width or pos[1] < 0 or pos[1] > display_height:
+                        result['warnings'].append(f'Mask position {pos} may be outside bounds')
 
             mask_file = os.path.join(theme_path, '01.png')
             bg_file = os.path.join(theme_path, '00.png')

src/trcc/adapters/infra/media_player.py

@@ -40,7 +40,7 @@ def _check_ffmpeg() -> bool:
 class VideoDecoder:
     """Decode video frames via FFmpeg pipe. No playback state."""
 
-    def __init__(self, video_path: str, target_size: tuple[int, int] = (320, 320),
+    def __init__(self, video_path: str, target_size: tuple[int, int],
                  fit_mode: str = 'fill') -> None:
         if not FFMPEG_AVAILABLE:
             from trcc.core.builder import ControllerBuilder
@@ -155,7 +155,7 @@ def close(self) -> None:
     def extract_frames(
         video_path: str,
         output_dir: str,
-        target_size: tuple[int, int] = (320, 320),
+        target_size: tuple[int, int],
         max_frames: int | None = None,
     ) -> int:
         """Extract video frames to PNG files via FFmpeg."""
@@ -205,7 +205,7 @@ class ThemeZtDecoder:
     - for each frame: int32 size + JPEG bytes
     """
 
-    def __init__(self, zt_path: str, target_size: tuple[int, int] | None = None) -> None:
+    def __init__(self, zt_path: str, target_size: tuple[int, int]) -> None:
         self.frames: list[RawFrame] = []
         self.timestamps: list[int] = []
         self.delays: list[int] = []
@@ -236,12 +236,10 @@ def __init__(self, zt_path: str, target_size: tuple[int, int] | None = None) ->
 
     @staticmethod
     def _decode_jpeg(jpeg_bytes: bytes,
-                     target_size: tuple[int, int] | None) -> RawFrame:
+                     target_size: tuple[int, int]) -> RawFrame:
         """Decode JPEG bytes → RawFrame via ffmpeg pipe."""
-        vf_args: list[str] = []
-        if target_size:
-            tw, th = target_size
-            vf_args = ['-vf', f'scale={tw}:{th}']
+        tw, th = target_size
+        vf_args = ['-vf', f'scale={tw}:{th}']
         cmd = [
             'ffmpeg', '-f', 'jpeg_pipe', '-i', 'pipe:0',
             *vf_args,
@@ -256,10 +254,10 @@ def _decode_jpeg(jpeg_bytes: bytes,
                 raise ValueError(f"ffmpeg decode failed: {result.stderr[:100]!r}")
         except Exception as exc:
             log.warning("ThemeZtDecoder: JPEG decode failed (%s), returning blank", exc)
-            w, h = target_size if target_size else (320, 320)
+            w, h = target_size
             return RawFrame(bytes(w * h * 3), w, h)
 
-        w, h = target_size if target_size else (320, 320)
+        w, h = target_size
         return RawFrame(result.stdout[:w * h * 3], w, h)
 
     @property

src/trcc/adapters/infra/theme_cloud.py

@@ -40,6 +40,8 @@
 from urllib.error import HTTPError, URLError
 from urllib.request import Request, urlopen
 
+from trcc.core.models import CLOUD_SERVERS, CLOUD_THEME_URL_KEYS
+
 log = logging.getLogger(__name__)
 
 # Category definitions matching Windows FormCZTV.CheakWebFile
@@ -58,46 +60,9 @@
 # Category name lookup
 CATEGORY_NAMES = {cat[0]: cat[1] for cat in CATEGORIES}
 
-# Server URLs (Windows pattern: http://www.czhorde.com/tr/bj{resolution}/)
-SERVERS = {
-    'international': 'http://www.czhorde.cc/tr/bj{resolution}/',
-    'china': 'http://www.czhorde.com/tr/bj{resolution}/',
-}
-
-# Resolution URL suffixes — full C# v2.1.2 GifWebDir* parity
-RESOLUTION_URLS = {
-    "240x240": "bj240240",
-    "240x320": "bj240320",
-    "320x240": "bj320240",
-    "320x320": "bj320320",
-    "360x360": "bj360360",
-    "480x480": "bj480480",
-    "640x172": "bj640172",
-    "640x480": "bj640480",
-    "800x480": "bj800480",
-    "854x480": "bj854480",
-    "960x320": "bj960320",
-    "960x540": "bj960540",
-    "1280x480": "bj1280480",
-    "1600x720": "bj1600720",
-    "1600x720u": "bj1600720u",
-    "1600x720l": "bj1600720l",
-    "1920x440": "bj1920440",
-    "1920x462": "bj1920462",
-    # Portrait variants
-    "172x640": "bj172640",
-    "320x960": "bj320960",
-    "440x1920": "bj4401920",
-    "462x1920": "bj4621920",
-    "480x640": "bj480640",
-    "480x800": "bj480800",
-    "480x854": "bj480854",
-    "480x1280": "bj4801280",
-    "540x960": "bj540960",
-    "720x1600": "bj7201600",
-    "720x1600u": "bj7201600u",
-    "720x1600l": "bj7201600l",
-}
+# Re-export for backward compatibility
+SERVERS = CLOUD_SERVERS
+RESOLUTION_URLS = CLOUD_THEME_URL_KEYS
 
 
 class CloudThemeDownloader:
@@ -138,7 +103,7 @@ def get_themes_by_category(category: str) -> List[str]:
 
     def __init__(
         self,
-        resolution: str = "320x320",
+        resolution: str = '',
         cache_dir: Optional[str] = None,
         server: str = 'international'
     ):
@@ -466,7 +431,7 @@ def get_cached_themes(self) -> List[str]:
 
 def download_theme(
     theme_id: str,
-    resolution: str = "320x320",
+    resolution: str,
     cache_dir: Optional[str] = None,
 ) -> Optional[str]:
     """Quick download of a single theme (convenience wrapper)."""

src/trcc/adapters/system/linux/setup.py

@@ -20,6 +20,7 @@
     _posix_raise_existing_instance,
     _print_summary,
 )
+from trcc.core.paths import _TRCC_PKG
 from trcc.core.platform import is_root
 from trcc.core.ports import PlatformSetup
 
@@ -250,8 +251,7 @@ def setup_selinux() -> int:
             print(f"  {tool} not found — {_install_hint(tool, pm)}")
         return 1
 
-    trcc_root = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-    te_src = os.path.join(trcc_root, 'data', 'trcc_usb.te')
+    te_src = os.path.join(_TRCC_PKG, 'data', 'trcc_usb.te')
     if not os.path.isfile(te_src):
         print(f"SELinux policy source not found: {te_src}")
         return 1
@@ -301,7 +301,7 @@ def install_desktop() -> int:
     home = _real_user_home()
     app_dir = home / ".local" / "share" / "applications"
 
-    pkg_root = Path(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
+    pkg_root = Path(_TRCC_PKG)
     icon_pkg_dir = pkg_root / "assets" / "icons"
     desktop_src = pkg_root / "assets" / "trcc-linux.desktop"
 

src/trcc/api/themes.py

@@ -46,7 +46,7 @@ def _preview_url(theme_name: str, theme_dir: str) -> str:
 
 
 @router.post("/init")
-def init_theme_data(resolution: str = "320x320") -> dict:
+def init_theme_data(resolution: str) -> dict:
     """Download and extract theme/web/mask archives for a resolution.
 
     Safe to call repeatedly — no-op if data is already cached.
@@ -67,7 +67,7 @@ def init_theme_data(resolution: str = "320x320") -> dict:
 
 
 @router.get("")
-def list_themes(resolution: str = "320x320") -> list[ThemeResponse]:
+def list_themes(resolution: str) -> list[ThemeResponse]:
     """List available local themes for a given resolution."""
     w, h = _parse_resolution(resolution)
 
@@ -90,7 +90,7 @@ def list_themes(resolution: str = "320x320") -> list[ThemeResponse]:
 
 
 @router.get("/web")
-def list_web_themes(resolution: str = "320x320") -> list[WebThemeResponse]:
+def list_web_themes(resolution: str) -> list[WebThemeResponse]:
     """List available cloud theme previews for a given resolution."""
     w, h = _parse_resolution(resolution)
 
@@ -137,12 +137,16 @@ def download_web_theme(
     from trcc.adapters.infra.theme_cloud import CloudThemeDownloader
     from trcc.api import _display_dispatcher
 
-    # Resolve resolution from device or parameter
-    w, h = 320, 320
+    # Resolve resolution from parameter or connected device
     if resolution:
         w, h = _parse_resolution(resolution)
     elif _display_dispatcher and _display_dispatcher.connected:
         w, h = _display_dispatcher.resolution  # type: ignore[union-attr]
+    else:
+        raise HTTPException(
+            status_code=400,
+            detail="resolution required — no device connected and no resolution specified",
+        )
 
     if send and (not _display_dispatcher or not _display_dispatcher.connected):
         raise HTTPException(
@@ -180,7 +184,7 @@ def download_web_theme(
 
 
 @router.get("/masks")
-def list_masks(resolution: str = "320x320") -> list[MaskResponse]:
+def list_masks(resolution: str) -> list[MaskResponse]:
     """List available mask overlays for a given resolution."""
     w, h = _parse_resolution(resolution)
 
@@ -252,7 +256,10 @@ def load_theme(body: ThemeLoadRequest) -> dict:
         if res:
             w, h = res
         else:
-            w, h = getattr(api._display_dispatcher, 'lcd_size', (320, 320))
+            raise HTTPException(
+                status_code=409,
+                detail="No device connected and no resolution available",
+            )
 
     if is_animated and theme_path:
         # Find video file (Theme.zt or .mp4)
@@ -290,19 +297,30 @@ def save_theme(body: ThemeSaveRequest) -> dict:
 
 
 @router.post("/export")
-def export_theme(theme_name: str, resolution: str = "320x320") -> Response:
+def export_theme(theme_name: str, resolution: str | None = None) -> Response:
     """Export a theme as a downloadable .tr archive."""
     import re
     import tempfile
     from pathlib import Path
 
     from fastapi.responses import FileResponse
 
+    from trcc.api import _display_dispatcher
+
     # Validate theme_name — no path traversal
     if not re.fullmatch(r'[a-zA-Z0-9_ \-().]+', theme_name):
         raise HTTPException(status_code=400, detail="Invalid theme name")
 
-    w, h = _parse_resolution(resolution)
+    # Resolve resolution from query param or connected device
+    if resolution:
+        w, h = _parse_resolution(resolution)
+    elif _display_dispatcher and _display_dispatcher.connected:
+        w, h = _display_dispatcher.resolution  # type: ignore[union-attr]
+    else:
+        raise HTTPException(
+            status_code=400,
+            detail="resolution required — no device connected and no resolution specified",
+        )
 
     from trcc.adapters.infra.data_repository import ThemeDir
     td = ThemeDir.for_resolution(w, h)
@@ -362,9 +380,12 @@ async def import_theme(file: UploadFile) -> dict:
     try:
         from trcc.adapters.infra.data_repository import ThemeDir
         from trcc.api import _display_dispatcher
-        w, h = (320, 320)
-        if _display_dispatcher and _display_dispatcher.connected:
-            w, h = _display_dispatcher.resolution  # type: ignore[union-attr]
+        if not _display_dispatcher or not _display_dispatcher.connected:
+            raise HTTPException(
+                status_code=409,
+                detail="No device connected. POST /devices/{id}/select first.",
+            )
+        w, h = _display_dispatcher.resolution  # type: ignore[union-attr]
         data_dir = Path(str(ThemeDir.for_resolution(w, h)))
         from trcc.adapters.infra.dc_config import DcConfig
         from trcc.adapters.infra.dc_parser import load_config_json

src/trcc/cli/_display.py

@@ -479,6 +479,11 @@ def resume(builder):
         try:
             svc.select(dev)
             lcd = builder.lcd_from_service(svc)
+            # Apply hardware resolution so the display pipeline encodes correctly.
+            # dev.resolution is set by discover_resolution() (USB handshake result).
+            w, h = dev.resolution
+            if w and h:
+                lcd.set_resolution(w, h)
             lcd.restore_device_settings()
             result = lcd.load_last_theme()
             if not result.get("success"):