Add release-aware self update #25

Drop ignored SAB records before each sync so ownership remapping removes old decisions.

README.md

@@ -43,6 +43,8 @@ sudo -n sh /opt/importarr/repo-upgrade.sh
 
 The helper refuses to run when the checkout has uncommitted changes, then performs `git pull --ff-only`, reinstalls the package from the repo, restarts `importarr.service`, and prints service status. Use it after changes have been committed and pushed to `main`.
 
+Installed deployments can expose the same operation through the authenticated API. `GET /api/control/update-check` queries the latest release from `IMPORTARR_UPDATE_RELEASE_URL` (default: this repository's Gitea latest-release API) and compares it with the running `IMPORTARR_VERSION`. `POST /api/control/update` performs the same check and only runs the update command when a newer release tag exists. Configure `IMPORTARR_UPDATE_COMMAND` when the default `sh deploy/repo-upgrade.sh` is not correct for the service working directory, and configure `IMPORTARR_RESTART_COMMAND` when the default `systemctl restart importarr.service` needs a wrapper such as sudo.
+
 Release-worthy changes should be committed, tagged with SemVer (`v0.1.1`, `v0.2.0`, ...), pushed with tags, then installed from the tagged checkout or artifact.
 
 ### Required setup
@@ -75,6 +77,9 @@ Release-worthy changes should be committed, tagged with SemVer (`v0.1.1`, `v0.2.
 - `POST /api/control/pause`
 - `POST /api/control/stop`
 - `POST /api/control/cancel-current`
+- `POST /api/control/restart`
+- `GET /api/control/update-check`
+- `POST /api/control/update`
 - `POST /api/queue-items/{id}/action` with `{ "action": "retry|ignore|remove" }`
 - `POST /api/import/run-now`
 

deploy/importarr.env.example

@@ -3,6 +3,9 @@ IMPORTARR_SAB_URL=http://sabnzbd:8080
 # IMPORTARR_SAB_API_KEY=change-me
 # IMPORTARR_SAB_API_KEY_FILE=/etc/importarr/sab-api-key
 IMPORTARR_SAB_CATEGORY=manual
+# SAB may report storage paths from inside its container; set this when that
+# differs from the local host path Importarr scans in IMPORTARR_DOWNLOAD_ROOT.
+# IMPORTARR_SAB_STORAGE_ROOT=/data/downloads/manual
 IMPORTARR_DOWNLOAD_ROOT=/data/downloads/manual
 IMPORTARR_MOVIES_ROOT=/data/movies
 IMPORTARR_TV_ROOT=/data/tv

importarr/build_info.py

@@ -8,14 +8,31 @@ from . import __version__
 
 
 def build_info() -> dict[str, str]:
+    build_date = os.getenv("IMPORTARR_BUILD_DATE", "development")
     return {
         "name": "Importarr",
         "version": os.getenv("IMPORTARR_VERSION", __version__),
-        "build_date": os.getenv("IMPORTARR_BUILD_DATE", "development"),
+        "build_date": local_timestamp(build_date),
         "git_sha": os.getenv("IMPORTARR_GIT_SHA", "development"),
         "python": platform.python_version(),
         "started_at": STARTED_AT,
     }
 
 
-STARTED_AT = datetime.now(UTC).isoformat(timespec="seconds")
+def local_timestamp(value: str) -> str:
+    if value == "development":
+        return value
+
+    normalized = value.removesuffix("Z") + "+00:00" if value.endswith("Z") else value
+    try:
+        timestamp = datetime.fromisoformat(normalized)
+    except ValueError:
+        return value
+
+    if timestamp.tzinfo is None:
+        timestamp = timestamp.replace(tzinfo=UTC)
+
+    return timestamp.astimezone().isoformat(timespec="seconds")
+
+
+STARTED_AT = datetime.now(UTC).astimezone().isoformat(timespec="seconds")

importarr/config.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import os
+import shlex
 from pathlib import Path
 
 from pydantic import BaseModel, Field
@@ -10,6 +11,7 @@ class Settings(BaseModel):
     sab_url: str = "http://sabnzbd:8080"
     sab_api_key: str | None = None
     sab_category: str = "manual"
+    sab_storage_root: Path | None = None
     download_root: Path = Path("/data/downloads/manual")
     movies_root: Path = Path("/data/movies")
     tv_root: Path = Path("/data/tv")
@@ -20,6 +22,11 @@ class Settings(BaseModel):
     sonarr_url: str | None = None
     sonarr_api_key: str | None = None
     auth_token: str | None = None
+    restart_command: list[str] = Field(default_factory=lambda: ["systemctl", "restart", "importarr.service"])
+    update_command: list[str] = Field(default_factory=lambda: ["sh", "deploy/repo-upgrade.sh"])
+    update_release_url: str = "https://gitea.delphas.dk/api/v1/repos/daniels/importarr/releases/latest"
+    update_check_timeout_seconds: int = Field(default=15, ge=1)
+    control_command_timeout_seconds: int = Field(default=120, ge=1)
     bind_host: str = "127.0.0.1"
     bind_port: int = 8765
     poll_seconds: int = Field(default=60, ge=5)
@@ -30,6 +37,7 @@ class Settings(BaseModel):
             sab_url=os.getenv("IMPORTARR_SAB_URL", cls.model_fields["sab_url"].default),
             sab_api_key=_env_secret("IMPORTARR_SAB_API_KEY"),
             sab_category=os.getenv("IMPORTARR_SAB_CATEGORY", "manual"),
+            sab_storage_root=Path(os.getenv("IMPORTARR_SAB_STORAGE_ROOT")) if os.getenv("IMPORTARR_SAB_STORAGE_ROOT") else None,
             download_root=Path(os.getenv("IMPORTARR_DOWNLOAD_ROOT", "/data/downloads/manual")),
             movies_root=Path(os.getenv("IMPORTARR_MOVIES_ROOT", "/data/movies")),
             tv_root=Path(os.getenv("IMPORTARR_TV_ROOT", "/data/tv")),
@@ -40,6 +48,11 @@ class Settings(BaseModel):
             sonarr_url=os.getenv("IMPORTARR_SONARR_URL"),
             sonarr_api_key=_env_secret("IMPORTARR_SONARR_API_KEY"),
             auth_token=_env_secret("IMPORTARR_AUTH_TOKEN"),
+            restart_command=_env_command("IMPORTARR_RESTART_COMMAND", ["systemctl", "restart", "importarr.service"]),
+            update_command=_env_command("IMPORTARR_UPDATE_COMMAND", ["sh", "deploy/repo-upgrade.sh"]),
+            update_release_url=os.getenv("IMPORTARR_UPDATE_RELEASE_URL", "https://gitea.delphas.dk/api/v1/repos/daniels/importarr/releases/latest"),
+            update_check_timeout_seconds=int(os.getenv("IMPORTARR_UPDATE_CHECK_TIMEOUT_SECONDS", "15")),
+            control_command_timeout_seconds=int(os.getenv("IMPORTARR_CONTROL_COMMAND_TIMEOUT_SECONDS", "120")),
             bind_host=os.getenv("IMPORTARR_BIND_HOST", "127.0.0.1"),
             bind_port=int(os.getenv("IMPORTARR_BIND_PORT", "8765")),
             poll_seconds=int(os.getenv("IMPORTARR_POLL_SECONDS", "60")),
@@ -61,3 +74,10 @@ def _env_secret(name: str) -> str | None:
     if file_value:
         return Path(file_value).read_text(encoding="utf-8").strip()
     return os.getenv(name)
+
+
+def _env_command(name: str, default: list[str]) -> list[str]:
+    value = os.getenv(name)
+    if not value:
+        return default
+    return shlex.split(value)

importarr/main.py

@@ -1,9 +1,11 @@
 from __future__ import annotations
 
 from pathlib import Path
+import subprocess
 from typing import Annotated
 
 import uvicorn
+import httpx
 from fastapi import Depends, FastAPI, Header, HTTPException, Request
 from fastapi.responses import HTMLResponse
 from fastapi.staticfiles import StaticFiles
@@ -41,6 +43,22 @@ class QueueItemActionRequest(BaseModel):
     action: str
 
 
+class ControlCommandResponse(BaseModel):
+    status: str
+    command: list[str]
+    returncode: int
+    stdout: str
+    stderr: str
+
+
+class UpdateCheckResponse(BaseModel):
+    status: str
+    current_version: str
+    latest_version: str | None
+    update_available: bool
+    release_url: str | None = None
+
+
 class AppSettingsUpdate(BaseModel):
     sab_url: str
     sab_api_key: str | None = None
@@ -50,6 +68,12 @@ class AppSettingsUpdate(BaseModel):
     sonarr_api_key: str | None = None
 
 
+class ConnectionTestRequest(BaseModel):
+    service: str
+    url: str
+    api_key: str | None = None
+
+
 def load_ui_settings() -> None:
     for key in ("sab_url", "sab_api_key", "radarr_url", "radarr_api_key", "sonarr_url", "sonarr_api_key"):
         stored = state.get_app_state(key)
@@ -136,6 +160,33 @@ def update_ui_settings(payload: AppSettingsUpdate, _: None = Depends(require_wri
     return get_ui_settings()
 
 
+@app.post("/api/settings/test-connection")
+async def test_connection(payload: ConnectionTestRequest, _: None = Depends(require_write_auth)) -> dict[str, object]:
+    service = payload.service.strip().lower()
+    url = payload.url.strip().rstrip("/")
+    api_key = (payload.api_key or "").strip() or None
+    if service not in {"sabnzbd", "radarr", "sonarr"}:
+        raise HTTPException(status_code=400, detail="service must be sabnzbd, radarr, or sonarr")
+    if not url:
+        raise HTTPException(status_code=400, detail="URL is required")
+    if api_key is None:
+        api_key = getattr(settings, f"{service if service != 'sabnzbd' else 'sab'}_api_key")
+    try:
+        if service == "sabnzbd":
+            data = await SabnzbdClient(url, api_key).queue()
+            return {"ok": True, "service": service, "message": f"Connected to SABnzbd; {len(data.get('queue', {}).get('slots', []))} queued jobs visible."}
+        headers = {"X-Api-Key": api_key} if api_key else {}
+        async with httpx.AsyncClient(timeout=15) as client:
+            response = await client.get(f"{url}/api/v3/system/status", headers=headers)
+            response.raise_for_status()
+            data = response.json()
+        name = str(data.get("appName") or service.title())
+        version = str(data.get("version") or "unknown version")
+        return {"ok": True, "service": service, "message": f"Connected to {name} {version}."}
+    except Exception as exc:
+        return {"ok": False, "service": service, "message": f"Connection failed: {exc.__class__.__name__}"}
+
+
 def control_status() -> dict[str, object]:
     mode = state.get_app_state("queue_mode", "running") or "running"
     current = state.get_app_state("current_job")
@@ -202,6 +253,92 @@ def cancel_current(_: None = Depends(require_write_auth)) -> dict[str, object]:
     return control_status()
 
 
+@app.post("/api/control/restart")
+def restart_service(_: None = Depends(require_write_auth)) -> dict[str, object]:
+    return _run_control_command(settings.restart_command)
+
+
+@app.post("/api/control/update")
+def update_service(_: None = Depends(require_write_auth)) -> dict[str, object]:
+    update = check_update_available()
+    if not update["update_available"]:
+        return {**update, "command": settings.update_command, "stdout": "", "stderr": ""}
+    result = _run_control_command(settings.update_command)
+    return {**update, "command_result": result}
+
+
+@app.get("/api/control/update-check")
+def update_check(_: None = Depends(require_write_auth)) -> dict[str, object]:
+    return check_update_available()
+
+
+def check_update_available() -> dict[str, object]:
+    current = build_info()["version"]
+    try:
+        with httpx.Client(timeout=settings.update_check_timeout_seconds) as client:
+            response = client.get(settings.update_release_url, headers={"Accept": "application/json"})
+            response.raise_for_status()
+            release = response.json()
+    except Exception as exc:
+        raise HTTPException(status_code=502, detail=f"release check failed: {exc.__class__.__name__}") from exc
+
+    latest = str(release.get("tag_name") or release.get("name") or "").strip()
+    if not latest:
+        raise HTTPException(status_code=502, detail="release check failed: latest release has no tag_name")
+
+    payload = UpdateCheckResponse(
+        status="update_available" if _is_newer_version(latest, current) else "current",
+        current_version=current,
+        latest_version=latest,
+        update_available=_is_newer_version(latest, current),
+        release_url=release.get("html_url"),
+    )
+    return payload.model_dump()
+
+
+def _is_newer_version(candidate: str, current: str) -> bool:
+    candidate_version = _version_key(candidate)
+    current_version = _version_key(current)
+    if candidate_version is None or current_version is None:
+        return candidate.lstrip("vV") != current.lstrip("vV") and current in {"", "development"}
+    return candidate_version > current_version
+
+
+def _version_key(value: str) -> tuple[int, ...] | None:
+    normalized = value.strip().lstrip("vV").split("-", 1)[0]
+    parts = normalized.split(".")
+    if not parts or any(not part.isdigit() for part in parts):
+        return None
+    return tuple(int(part) for part in parts)
+
+
+def _run_control_command(command: list[str]) -> dict[str, object]:
+    if not command:
+        raise HTTPException(status_code=500, detail="control command is not configured")
+    try:
+        result = subprocess.run(
+            command,
+            check=False,
+            capture_output=True,
+            text=True,
+            timeout=settings.control_command_timeout_seconds,
+        )
+    except subprocess.TimeoutExpired as exc:
+        raise HTTPException(status_code=504, detail=f"control command timed out after {exc.timeout} seconds") from exc
+    except OSError as exc:
+        raise HTTPException(status_code=500, detail=f"control command failed to start: {exc.__class__.__name__}") from exc
+    payload = ControlCommandResponse(
+        status="ok" if result.returncode == 0 else "failed",
+        command=command,
+        returncode=result.returncode,
+        stdout=result.stdout[-4000:],
+        stderr=result.stderr[-4000:],
+    ).model_dump()
+    if result.returncode != 0:
+        raise HTTPException(status_code=500, detail=payload)
+    return payload
+
+
 @app.get("/api/manual-batches")
 def manual_batches() -> list[dict[str, object]]:
     if queue_accepting_new_jobs():
@@ -241,6 +378,10 @@ def queue_item_action(item_id: int, payload: QueueItemActionRequest, _: None = D
     if payload.action == "retry":
         retry_state = "manual_batch" if item["source_type"] == "manual" else "ready"
         state.mark_queue_item(item["source_type"], item["source_id"], retry_state, "retry requested")
+    elif payload.action == "run-now":
+        imported = _import_queue_item(item, Importer(settings.movies_root, settings.tv_root))
+        updated = state.get_queue_item(item_id)
+        return {"status": "imported" if imported else "updated", "imported": imported, "item": serialize_queue_item(updated or item)}
     elif payload.action == "ignore":
         state.mark_queue_item(item["source_type"], item["source_id"], "skipped", "ignored by user")
     elif payload.action == "remove":
@@ -275,16 +416,17 @@ async def sync_queue() -> None:
         state.upsert_queue_item(source_type="system", source_id="sab-sync", name="SABnzbd", state="failed", reason=exc.__class__.__name__)
         return
     slots = data.get("history", {}).get("slots", [])
+    state.delete_queue_items_by_state("sab", "ignored")
     for item in slots:
-        readiness = classify_history_item(item, active, settings.sab_category, settings.download_root)
+        readiness = classify_history_item(item, active, settings.sab_category, settings.download_root, sab_storage_root=settings.sab_storage_root)
         job_id = str(item.get("nzo_id") or item.get("nzoid") or item.get("name") or "")
         if not job_id:
             continue
         if readiness.ready and readiness.storage:
             for video in scan_videos(readiness.storage):
-                state.upsert_queue_item(source_type="sab", source_id=str(video.path), source_path=video.path, name=video.path.name, state="ready", reason=readiness.reason, relative_path=str(video.relative_path), size=video.size, job_id=job_id)
+                state.upsert_queue_item(source_type="sab", source_id=str(video.path), source_path=video.path, name=video.path.name, state="ready", reason=readiness.reason, relative_path=str(video.relative_path), size=video.size, job_id=job_id, sab_category=str(item.get("category") or item.get("cat") or ""))
         else:
-            state.upsert_queue_item(source_type="sab", source_id=job_id, source_path=readiness.storage, name=str(item.get("name") or job_id), state=readiness.state, reason=readiness.reason, job_id=job_id)
+            state.upsert_queue_item(source_type="sab", source_id=job_id, source_path=readiness.storage, name=str(item.get("name") or job_id), state=readiness.state, reason=readiness.reason, job_id=job_id, sab_category=str(item.get("category") or item.get("cat") or ""))
 
 
 def queue_jobs() -> list[dict[str, object]]:
@@ -311,7 +453,7 @@ def serialize_queue_item(item: dict[str, object]) -> dict[str, object]:
         "updated_at": item["updated_at"],
         "completed_at": item["completed_at"],
         "sab_status": state_name if source_type == "sab" else None,
-        "sab_category": settings.sab_category if source_type == "sab" else None,
+        "sab_category": item.get("sab_category") if source_type == "sab" else None,
         "can_run_now": state_name in {"ready", "manual_batch", "failed"},
         "can_retry": state_name in {"failed", "skipped"},
         "can_ignore": state_name not in {"imported", "skipped"},
@@ -387,7 +529,7 @@ async def _import_ready_sab_jobs(importer: Importer, force: bool = False) -> int
     for item in data.get("history", {}).get("slots", []):
         if consume_cancel_request():
             break
-        readiness = classify_history_item(item, active, settings.sab_category, settings.download_root, force_status=force)
+        readiness = classify_history_item(item, active, settings.sab_category, settings.download_root, force_status=force, sab_storage_root=settings.sab_storage_root)
         if readiness.storage is None or (not readiness.ready and not force):
             continue
         for video in scan_videos(readiness.storage):
@@ -411,6 +553,32 @@ async def _import_ready_sab_jobs(importer: Importer, force: bool = False) -> int
     return imported
 
 
+def _import_queue_item(item: dict[str, object], importer: Importer) -> int:
+    if item["source_type"] not in {"sab", "manual"} or item["state"] not in {"ready", "manual_batch", "failed"}:
+        return 0
+    source_path = item.get("source_path")
+    if not source_path:
+        state.mark_queue_item(str(item["source_type"]), str(item["source_id"]), "failed", "missing source path")
+        return 0
+    source = Path(str(source_path))
+    set_current_job(str(source))
+    try:
+        result = importer.import_file(source, should_cancel=consume_cancel_request)
+        state.add_history(result.source, result.target, "imported", result.bytes)
+        state.mark_queue_item(str(item["source_type"]), str(item["source_id"]), "imported")
+        return 1
+    except ImportCancelled:
+        state.add_history(source, source, "cancelled", 0, "cancelled")
+        state.mark_queue_item(str(item["source_type"]), str(item["source_id"]), "skipped", "cancelled")
+        return 0
+    except Exception as exc:
+        state.add_history(source, source, "failed", 0, exc.__class__.__name__)
+        state.mark_queue_item(str(item["source_type"]), str(item["source_id"]), "failed", exc.__class__.__name__)
+        return 0
+    finally:
+        set_current_job(None)
+
+
 def _import_manual_batches(importer: Importer) -> int:
     if queue_accepting_new_jobs():
         sync_manual_queue()

importarr/readiness.py

@@ -26,25 +26,37 @@ def has_transient_part(path: Path) -> bool:
     return any(part in TRANSIENT_PARTS or any(token in part for token in TRANSIENT_PARTS) for part in path.parts)
 
 
-def classify_history_item(item: dict[str, Any], active_nzo_ids: set[str], category: str, download_root: Path, force_status: bool = False) -> Readiness:
+def classify_history_item(item: dict[str, Any], active_nzo_ids: set[str], category: str, download_root: Path, force_status: bool = False, sab_storage_root: Path | None = None) -> Readiness:
     nzo_id = str(item.get("nzo_id") or item.get("nzoid") or "")
     if not force_status and nzo_id and nzo_id in active_nzo_ids:
         return Readiness("processing", "SAB job is still present in queue")
-    if str(item.get("category") or "") != category:
-        return Readiness("ignored", "SAB category is not owned by Importarr")
+    item_category = str(item.get("category") or item.get("cat") or "")
     status = str(item.get("status") or "")
+    storage_value = str(item.get("storage") or "")
+    storage = Path(storage_value).resolve() if storage_value else None
+    root = download_root.resolve()
+    sab_root = (sab_storage_root or download_root).resolve()
+    storage_in_local_root = bool(storage and (storage == root or root in storage.parents))
+    storage_in_sab_root = bool(storage and (storage == sab_root or sab_root in storage.parents))
+    storage_in_root = storage_in_local_root or storage_in_sab_root
+    if item_category != category and not storage_in_root:
+        return Readiness("ignored", "SAB category/storage is not owned by Importarr", storage)
     if not force_status and status == "Failed":
         return Readiness("failed", "SAB history reports failure")
     if not force_status and (status in NOT_READY_STATUSES or status != "Completed"):
         return Readiness("processing", f"SAB status is {status or 'unknown'}")
-    storage_value = str(item.get("storage") or "")
-    if not storage_value:
+    if storage is None:
         return Readiness("unknown", "SAB completed item has no final storage")
-    storage = Path(storage_value).resolve()
-    root = download_root.resolve()
-    if storage != root and root not in storage.parents:
+    if not storage_in_root:
         return Readiness("ignored", "SAB storage is outside configured download root", storage)
+    if storage_in_sab_root and not storage_in_local_root:
+        storage = root / storage.relative_to(sab_root)
     if has_transient_part(storage):
         return Readiness("processing", "SAB storage path contains transient unpack/admin marker", storage)
-    reason = "forced despite SAB status" if force_status and status != "Completed" else "SAB completed in owned category with final storage"
+    if force_status and status != "Completed":
+        reason = "forced despite SAB status"
+    elif item_category != category:
+        reason = "SAB completed inside Importarr download root"
+    else:
+        reason = "SAB completed in owned category with final storage"
     return Readiness("ready", reason, storage)

importarr/state.py

@@ -46,6 +46,7 @@ class State:
               size integer not null default 0,
               batch_id integer,
               job_id text,
+              sab_category text,
               first_seen_at text not null default current_timestamp,
               updated_at text not null default current_timestamp,
               completed_at text,
@@ -53,6 +54,9 @@ class State:
             );
             """
         )
+        columns = {row["name"] for row in self.conn.execute("pragma table_info(import_queue_items)")}
+        if "sab_category" not in columns:
+            self.conn.execute("alter table import_queue_items add column sab_category text")
         self.conn.commit()
 
     def get_app_state(self, key: str, default: str | None = None) -> str | None:
@@ -111,11 +115,12 @@ class State:
         size: int = 0,
         batch_id: int | None = None,
         job_id: str | None = None,
+        sab_category: str | None = None,
     ) -> dict[str, Any]:
         self.conn.execute(
             """
-            insert into import_queue_items(source_type, source_id, source_path, name, state, reason, relative_path, size, batch_id, job_id)
-            values (?,?,?,?,?,?,?,?,?,?)
+            insert into import_queue_items(source_type, source_id, source_path, name, state, reason, relative_path, size, batch_id, job_id, sab_category)
+            values (?,?,?,?,?,?,?,?,?,?,?)
             on conflict(source_type, source_id) do update set
               source_path=excluded.source_path,
               name=excluded.name,
@@ -125,10 +130,11 @@ class State:
               size=excluded.size,
               batch_id=excluded.batch_id,
               job_id=excluded.job_id,
+              sab_category=excluded.sab_category,
               updated_at=current_timestamp,
               completed_at=case when excluded.state in ('imported','failed','skipped') then current_timestamp else null end
             """,
-            (source_type, source_id, str(source_path) if source_path else None, name, state, reason, relative_path, size, batch_id, job_id),
+            (source_type, source_id, str(source_path) if source_path else None, name, state, reason, relative_path, size, batch_id, job_id, sab_category),
         )
         self.conn.commit()
         row = self.conn.execute("select * from import_queue_items where source_type = ? and source_id = ?", (source_type, source_id)).fetchone()
@@ -146,6 +152,14 @@ class State:
         self.conn.commit()
         return cursor.rowcount > 0
 
+    def delete_queue_items_by_state(self, source_type: str, state: str, reason: str | None = None) -> int:
+        if reason is None:
+            cursor = self.conn.execute("delete from import_queue_items where source_type = ? and state = ?", (source_type, state))
+        else:
+            cursor = self.conn.execute("delete from import_queue_items where source_type = ? and state = ? and reason = ?", (source_type, state, reason))
+        self.conn.commit()
+        return cursor.rowcount
+
     def get_queue_item(self, item_id: int) -> dict[str, Any] | None:
         row = self.conn.execute("select * from import_queue_items where id = ?", (item_id,)).fetchone()
         return dict(row) if row else None

importarr/templates/index.html

@@ -8,18 +8,33 @@
 </head>
 <body>
   <header class="topbar">
-    <div><h1>Importarr</h1><p>Manual SABnzbd imports, safely gated by SAB completion.</p></div>
-    <div class="build"><strong>{{ status.build.version }}</strong><span>{{ status.build.git_sha[:12] }} · {{ status.build.build_date }}</span><button type="button" id="open-settings">Settings</button></div>
+    <div class="brand"><h1>Importarr</h1><p id="ready-state">{{ 'Running' if status.control.queue_mode == 'start' else status.control.queue_mode|capitalize }}</p></div>
+    <div class="top-status"><span>Current</span><strong id="top-current-job">{{ status.current or 'idle' }}</strong></div>
+    <div class="top-controls">
+      <button type="button" data-control="start" aria-label="Start imports">▶</button>
+      <button type="button" data-control="pause" aria-label="Pause imports">⏸</button>
+      <details class="menu">
+        <summary aria-label="Open menu">☰</summary>
+        <div class="menu-panel">
+          <button type="button" id="open-settings">Settings</button>
+          <button type="button" data-control="stop">Stop queue</button>
+          <button type="button" data-control="cancel-current" class="danger">Cancel current job</button>
+          <button id="force-run" type="button">Force run now</button>
+          <a href="#manual-batches">Manual batches</a>
+          <a href="#service-info">Service info</a>
+        </div>
+      </details>
+    </div>
   </header>
   <main>
-    <section class="cards">
-      <article><strong>{{ status.imported_total }}</strong><span>Imported total</span></article>
-      <article><strong>{{ status.failed_total }}</strong><span>Failed total</span></article>
-      <article><strong>{{ status.manual_batches }}</strong><span>Manual batches</span></article>
-      <article><strong>{{ status.category }}</strong><span>SAB category</span></article>
+    <section class="summary-strip" aria-label="Importarr summary">
+      <article><strong>{{ status.control.queue_mode }}</strong><span>Queue mode</span></article>
+      <article><strong>{{ status.current or 'Idle' }}</strong><span>Current import</span></article>
+      <article><strong>{{ status.imported_total }}</strong><span>Imported</span></article>
+      <article><strong>{{ status.failed_total }}</strong><span>Failed</span></article>
     </section>
-    <section class="panel">
-      <h2>Service info</h2>
+    <details class="panel packed" id="service-info">
+      <summary>Service info and build details</summary>
       <dl class="info">
         <dt>Name</dt><dd>{{ status.build.name }}</dd>
         <dt>Version</dt><dd>{{ status.build.version }}</dd>
@@ -38,9 +53,9 @@
         <dt>Queue mode</dt><dd id="queue-mode">{{ status.control.queue_mode }}</dd>
         <dt>Current job</dt><dd id="current-job">{{ status.current or 'idle' }}</dd>
       </dl>
-    </section>
-    <section class="panel">
-      <h2>Queue controls</h2>
+    </details>
+    <details class="panel packed">
+      <summary>Queue controls</summary>
       <p>Pause and stop prevent new jobs from being added to the queue. They do not interrupt an import already in progress; use cancel current job for that.</p>
       <div class="controls">
         <button type="button" data-control="start">Start</button>
@@ -48,22 +63,21 @@
         <button type="button" data-control="stop">Stop</button>
         <button type="button" data-control="cancel-current" class="danger">Cancel current job</button>
       </div>
-    </section>
-    <section>
-      <h2>Manual batches</h2>
+    </details>
+    <details class="panel packed" id="manual-batches">
+      <summary>Manual batches</summary>
       <form id="batch-form" class="inline-form">
         <input name="path" placeholder="folder under download root">
         <input id="batch-picker" type="file" webkitdirectory directory multiple hidden>
         <button type="button" id="browse-batch">Browse…</button>
         <button>Add batch</button>
       </form>
-      <table><thead><tr><th>ID</th><th>Status</th><th>Path</th></tr></thead><tbody>
+      <div class="table-scroll"><table><thead><tr><th>ID</th><th>Status</th><th>Path</th></tr></thead><tbody>
       {% for batch in batches %}<tr><td>{{ batch.id }}</td><td>{{ batch.status }}</td><td>{{ batch.path }}</td></tr>{% endfor %}
-      </tbody></table>
-    </section>
-    <section class="panel">
-      <div class="section-title"><h2>Jobs and queue</h2><button id="force-run" type="button">Force run now</button></div>
-      <p>Rows are grouped by processing state. Failed and skipped rows can be retried; ignore and remove actions only update Importarr's queue.</p>
+      </tbody></table></div>
+    </details>
+    <section class="panel queue-panel">
+      <div class="section-title"><h2>Queue and history</h2><span>Grouped by processing state</span></div>
       <div id="jobs">Loading…</div>
     </section>
   </main>
@@ -74,16 +88,19 @@
         <legend>SABnzbd</legend>
         <label>SAB URL <input name="sab_url" type="url" value="{{ status.sab_url }}" placeholder="http://sabnzbd:8080" required></label>
         <label>API token <input name="sab_api_key" type="password" placeholder="{% if status.sab_api_key_configured %}Configured; enter a new token to replace{% else %}SAB API token{% endif %}" autocomplete="off"></label>
+        <button type="button" data-test-connection="sabnzbd">Test SABnzbd connection</button><output id="sabnzbd-test-result"></output>
       </fieldset>
       <fieldset>
         <legend>Radarr</legend>
         <label>Radarr URL <input name="radarr_url" type="url" value="{{ status.radarr_url }}" placeholder="http://radarr:7878"></label>
         <label>API token <input name="radarr_api_key" type="password" placeholder="{% if status.radarr_api_key_configured %}Configured; enter a new token to replace{% else %}Radarr API token{% endif %}" autocomplete="off"></label>
+        <button type="button" data-test-connection="radarr">Test Radarr connection</button><output id="radarr-test-result"></output>
       </fieldset>
       <fieldset>
         <legend>Sonarr</legend>
         <label>Sonarr URL <input name="sonarr_url" type="url" value="{{ status.sonarr_url }}" placeholder="http://sonarr:8989"></label>
         <label>API token <input name="sonarr_api_key" type="password" placeholder="{% if status.sonarr_api_key_configured %}Configured; enter a new token to replace{% else %}Sonarr API token{% endif %}" autocomplete="off"></label>
+        <button type="button" data-test-connection="sonarr">Test Sonarr connection</button><output id="sonarr-test-result"></output>
       </fieldset>
       <p class="hint">Blank token fields clear the stored token. Environment values remain the startup defaults until saved here.</p>
       <button type="submit">Save settings</button>
@@ -92,9 +109,11 @@
   <script>
   const esc=value=>String(value??'').replace(/[&<>"']/g,ch=>({'&':'&amp;','<':'&lt;','>':'&gt;','"':'&quot;',"'":'&#39;'}[ch]));
   async function postJson(url, body){ const response=await fetch(url,{method:'POST',headers:{'content-type':'application/json'},body:body?JSON.stringify(body):undefined}); if(!response.ok){ const error=await response.json().catch(()=>({detail:response.statusText})); alert(error.detail||'Request failed'); } return response; }
-  function actionButtons(j){ const buttons=[]; if(j.can_retry) buttons.push(`<button type="button" data-action="retry" data-id="${j.id}">Retry</button>`); if(j.can_ignore) buttons.push(`<button type="button" data-action="ignore" data-id="${j.id}" class="warn">Ignore</button>`); if(j.can_remove) buttons.push(`<button type="button" data-action="remove" data-id="${j.id}" class="danger">Remove</button>`); return buttons.join(' '); }
-  function renderJobs(data){ const groups=(data.groups||[]).filter(group=>group.jobs.length); if(!groups.length) return '<p>No queue items.</p>'; return groups.map(group=>`<section class="job-group"><h3>${esc(group.label)} <span>${group.jobs.length}</span></h3><table><thead><tr><th>File</th><th>Release / folder context</th><th>Readiness</th><th>SAB</th><th>Actions</th></tr></thead><tbody>${group.jobs.map(j=>`<tr><td><strong class="file-name">${esc(j.name)}</strong><small>${esc(j.source_type)}${j.batch_id?' · batch '+esc(j.batch_id):''}</small></td><td><small>${esc(j.relative_path||j.storage||j.source_id)}</small></td><td><span class="state">${esc(j.state)}</span><small>${esc(j.reason||'')}</small></td><td><small>${esc(j.sab_status||'—')}${j.sab_category?' · '+esc(j.sab_category):''}</small></td><td class="row-actions">${actionButtons(j)}</td></tr>`).join('')}</tbody></table></section>`).join(''); }
-  async function refresh(){ const r=await fetch('/api/jobs'); const d=await r.json(); document.title=d.jobs.length?`📥 ${d.jobs.length} jobs - Importarr`:'📥 - idle · Importarr'; document.getElementById('jobs').innerHTML=renderJobs(d); if(d.control){ document.getElementById('queue-mode').textContent=d.control.queue_mode; document.getElementById('current-job').textContent=d.control.current||'idle'; } }
+  function actionButtons(j){ const buttons=[]; if(j.can_run_now) buttons.push(`<button type="button" data-action="run-now" data-id="${j.id}" title="Run now">▶</button>`); if(j.can_retry) buttons.push(`<button type="button" data-action="retry" data-id="${j.id}" title="Retry">↻</button>`); if(j.can_ignore) buttons.push(`<button type="button" data-action="ignore" data-id="${j.id}" class="warn" title="Ignore">!</button>`); if(j.can_remove) buttons.push(`<button type="button" data-action="remove" data-id="${j.id}" class="danger" title="Remove">🗑</button>`); return buttons.join(' '); }
+  function jobSubtext(j){ return `${esc(j.source_type)}${j.batch_id?' · batch '+esc(j.batch_id):''} · ${esc(j.relative_path||j.storage||j.source_id)}`; }
+  function readiness(j){ return `<span class="state" title="${esc(j.reason||j.state)}">${esc(j.state)}</span>`; }
+  function renderJobs(data){ const groups=(data.groups||[]).filter(group=>group.jobs.length); if(!groups.length) return '<p>No queue items.</p>'; return groups.map(group=>`<section class="job-group"><h3>${esc(group.label)} <span>${group.jobs.length}</span></h3><div class="table-scroll jobs-table"><table><thead><tr><th>File</th><th>Readiness</th><th>SAB</th><th>Actions</th></tr></thead><tbody>${group.jobs.map(j=>`<tr><td><strong class="file-name">${esc(j.name)}</strong><small>${jobSubtext(j)}</small></td><td>${readiness(j)}</td><td><small>${esc(j.sab_status||'—')}${j.sab_category?' · '+esc(j.sab_category):''}</small></td><td class="row-actions">${actionButtons(j)}</td></tr>`).join('')}</tbody></table></div><div class="job-cards">${group.jobs.map(j=>`<article class="job-card"><strong class="file-name">${esc(j.name)}</strong><small>${jobSubtext(j)}</small><dl><dt>Readiness</dt><dd>${readiness(j)}</dd><dt>SAB</dt><dd>${esc(j.sab_status||'—')}${j.sab_category?' · '+esc(j.sab_category):''}</dd></dl><div class="row-actions">${actionButtons(j)}</div></article>`).join('')}</div></section>`).join(''); }
+  async function refresh(){ const r=await fetch('/api/jobs'); const d=await r.json(); document.title=d.jobs.length?`📥 ${d.jobs.length} jobs - Importarr`:'📥 - idle · Importarr'; document.getElementById('jobs').innerHTML=renderJobs(d); if(d.control){ const current=d.control.current||'idle'; document.getElementById('queue-mode').textContent=d.control.queue_mode; document.getElementById('current-job').textContent=current; document.getElementById('top-current-job').textContent=current; document.getElementById('ready-state').textContent=d.control.queue_mode==='start'?'Running':d.control.queue_mode; } }
   document.getElementById('jobs').addEventListener('click', async e=>{ const button=e.target.closest('button[data-action]'); if(!button)return; const action=button.dataset.action; const destructive=['ignore','remove'].includes(action); if(destructive&&!confirm(`${action} this Importarr queue item?`)) return; await postJson(`/api/queue-items/${button.dataset.id}/action`,{action}); await refresh(); });
   document.querySelectorAll('[data-control]').forEach(button=>button.addEventListener('click', async()=>{ if(button.dataset.control==='cancel-current'&&!confirm('Cancel the current import job?')) return; await postJson(`/api/control/${button.dataset.control}`); await refresh(); }));
   document.getElementById('browse-batch').addEventListener('click',()=>document.getElementById('batch-picker').click());
@@ -102,7 +121,10 @@
   document.getElementById('batch-form').addEventListener('submit', async e=>{ e.preventDefault(); const response=await postJson('/api/manual-batches',{path:e.target.path.value}); if(response.ok) location.reload(); });
   document.getElementById('open-settings').addEventListener('click',()=>document.getElementById('settings-dialog').showModal());
   document.getElementById('close-settings').addEventListener('click',()=>document.getElementById('settings-dialog').close());
+  document.addEventListener('click',e=>{ document.querySelectorAll('details.menu[open]').forEach(menu=>{ if(!menu.contains(e.target)) menu.removeAttribute('open'); }); });
+  document.getElementById('settings-dialog').addEventListener('click',e=>{ if(e.target===e.currentTarget) e.currentTarget.close(); });
   document.getElementById('settings-form').addEventListener('submit', async e=>{ e.preventDefault(); const body=Object.fromEntries(new FormData(e.target)); const response=await postJson('/api/settings',body); if(response.ok){ const data=await response.json(); document.getElementById('sab-token-status').textContent=data.sab_api_key_configured?'configured':'not configured'; ['sab_api_key','radarr_api_key','sonarr_api_key'].forEach(name=>e.target.elements[name].value=''); document.getElementById('settings-dialog').close(); } });
+  document.querySelectorAll('[data-test-connection]').forEach(button=>button.addEventListener('click', async()=>{ const form=document.getElementById('settings-form'); const service=button.dataset.testConnection; const prefix=service==='sabnzbd'?'sab':service; const output=document.getElementById(`${service}-test-result`); output.textContent='Testing…'; output.className=''; const response=await postJson('/api/settings/test-connection',{service,url:form.elements[`${prefix}_url`].value,api_key:form.elements[`${prefix}_api_key`].value}); if(response.ok){ const data=await response.json(); output.textContent=data.message; output.className=data.ok?'success':'error'; } }));
   document.getElementById('force-run').addEventListener('click', async()=>{ await postJson('/api/import/run-now',{force:true}); await refresh(); });
   refresh(); setInterval(refresh, 10000);
   </script>

tests/test_queue_controls.py

@@ -73,6 +73,28 @@ def test_queue_item_retry_ignore_and_remove_actions(tmp_path, monkeypatch):
     assert main.state.get_queue_item(row["id"]) is None
 
 
+def test_queue_item_run_now_imports_only_selected_item(tmp_path, monkeypatch):
+    main, download, movies, _tv = configure_main(tmp_path, monkeypatch)
+    batch = download / "Release"
+    batch.mkdir(parents=True)
+    selected = batch / "Selected.mkv"
+    waiting = batch / "Waiting.mkv"
+    selected.write_bytes(b"selected")
+    waiting.write_bytes(b"waiting")
+    selected_row = main.state.upsert_queue_item(source_type="manual", source_id=str(selected), source_path=selected, name=selected.name, state="manual_batch")
+    main.state.upsert_queue_item(source_type="manual", source_id=str(waiting), source_path=waiting, name=waiting.name, state="manual_batch")
+
+    result = main.queue_item_action(selected_row["id"], main.QueueItemActionRequest(action="run-now"))
+
+    assert result["status"] == "imported"
+    assert result["imported"] == 1
+    assert (movies / "Selected.mkv").read_bytes() == b"selected"
+    assert waiting.exists()
+    rows = {row["name"]: row for row in main.state.list_queue_items(active_only=False)}
+    assert rows["Selected.mkv"]["state"] == "imported"
+    assert rows["Waiting.mkv"]["state"] == "manual_batch"
+
+
 def test_cancel_current_stops_before_next_manual_item(tmp_path, monkeypatch):
     main, download, movies, tv = configure_main(tmp_path, monkeypatch)
     batch = download / "Release"
@@ -109,3 +131,98 @@ def test_cancel_current_stops_active_copy(tmp_path, monkeypatch):
     assert source.exists()
     assert not any(movies.glob("*.partial"))
     assert main.state.list_queue_items(active_only=False)[0]["state"] == "skipped"
+
+
+def test_control_update_runs_configured_command(tmp_path, monkeypatch):
+    main, _download, _movies, _tv = configure_main(tmp_path, monkeypatch)
+    main.settings.update_command = ["upgrade", "now"]
+    monkeypatch.setattr(main, "check_update_available", lambda: {"status": "update_available", "current_version": "0.1.0", "latest_version": "0.2.0", "update_available": True, "release_url": None})
+
+    calls = []
+
+    def fake_run(command, **kwargs):
+        calls.append((command, kwargs))
+        return main.subprocess.CompletedProcess(command, 0, stdout="updated", stderr="")
+
+    monkeypatch.setattr(main.subprocess, "run", fake_run)
+
+    result = main.update_service()
+
+    assert result["status"] == "update_available"
+    assert result["command_result"]["status"] == "ok"
+    assert result["command_result"]["command"] == ["upgrade", "now"]
+    assert result["command_result"]["stdout"] == "updated"
+    assert calls[0][0] == ["upgrade", "now"]
+    assert calls[0][1].get("shell") is not True
+
+
+def test_control_update_skips_command_when_current(tmp_path, monkeypatch):
+    main, _download, _movies, _tv = configure_main(tmp_path, monkeypatch)
+    main.settings.update_command = ["upgrade", "now"]
+    monkeypatch.setattr(main, "check_update_available", lambda: {"status": "current", "current_version": "0.2.0", "latest_version": "v0.2.0", "update_available": False, "release_url": None})
+
+    def fake_run(command, **kwargs):
+        raise AssertionError("update command should not run without a newer release")
+
+    monkeypatch.setattr(main.subprocess, "run", fake_run)
+
+    result = main.update_service()
+
+    assert result["status"] == "current"
+    assert result["command"] == ["upgrade", "now"]
+    assert result["update_available"] is False
+
+
+def test_update_check_compares_latest_release(tmp_path, monkeypatch):
+    main, _download, _movies, _tv = configure_main(tmp_path, monkeypatch)
+    monkeypatch.setenv("IMPORTARR_VERSION", "0.1.0")
+
+    class FakeResponse:
+        def raise_for_status(self):
+            return None
+
+        def json(self):
+            return {"tag_name": "v0.2.0", "html_url": "https://example.test/releases/v0.2.0"}
+
+    class FakeClient:
+        def __init__(self, timeout):
+            self.timeout = timeout
+
+        def __enter__(self):
+            return self
+
+        def __exit__(self, exc_type, exc, tb):
+            return False
+
+        def get(self, url, headers):
+            assert url == main.settings.update_release_url
+            assert headers["Accept"] == "application/json"
+            return FakeResponse()
+
+    monkeypatch.setattr(main.httpx, "Client", FakeClient)
+
+    result = main.check_update_available()
+
+    assert result["status"] == "update_available"
+    assert result["current_version"] == "0.1.0"
+    assert result["latest_version"] == "v0.2.0"
+    assert result["update_available"] is True
+
+
+def test_control_restart_reports_command_failure(tmp_path, monkeypatch):
+    main, _download, _movies, _tv = configure_main(tmp_path, monkeypatch)
+    main.settings.restart_command = ["restart"]
+
+    def fake_run(command, **kwargs):
+        return main.subprocess.CompletedProcess(command, 1, stdout="", stderr="failed")
+
+    monkeypatch.setattr(main.subprocess, "run", fake_run)
+
+    try:
+        main.restart_service()
+    except main.HTTPException as exc:
+        assert exc.status_code == 500
+        assert exc.detail["status"] == "failed"
+        assert exc.detail["stderr"] == "failed"
+    else:
+        raise AssertionError("expected HTTPException")

tests/test_sab_readiness.py

@@ -19,9 +19,44 @@ def test_completed_manual_is_ready():
 
 def test_wrong_category_ignored():
     result = classify_history_item(item(category="*"), set(), "manual", ROOT)
+    assert result.ready
+    assert result.reason == "SAB completed inside Importarr download root"
+
+
+def test_wrong_category_outside_root_ignored():
+    result = classify_history_item(item(category="*", storage="/tmp/other/Movie"), set(), "manual", ROOT)
     assert result.state == "ignored"
 
 
+def test_sab_storage_root_maps_to_local_download_root():
+    result = classify_history_item(
+        item(category="*", storage="/data/downloads/manual/Movie"),
+        set(),
+        "manual",
+        ROOT,
+        sab_storage_root=Path("/data/downloads/manual"),
+    )
+    assert result.ready
+    assert result.storage == ROOT / "Movie"
+
+
+def test_radarr_sonarr_storage_roots_are_not_importarr_owned():
+    for storage in ("/data/downloads/movies/Movie", "/data/downloads/tv/Show"):
+        result = classify_history_item(
+            item(category="*", storage=storage),
+            set(),
+            "manual",
+            ROOT,
+            sab_storage_root=Path("/data/downloads/manual"),
+        )
+        assert result.state == "ignored"
+
+
+def test_sab_cat_field_is_treated_as_category():
+    result = classify_history_item(item(category=None, cat="manual"), set(), "manual", ROOT)
+    assert result.ready
+
+
 def test_queue_item_not_ready():
     result = classify_history_item(item(), {"1"}, "manual", ROOT)
     assert result.state == "processing"

tests/test_state.py

@@ -0,0 +1,13 @@
+from importarr.state import State
+
+
+def test_delete_queue_items_by_state_can_target_reason(tmp_path):
+    state = State(tmp_path / "state.db")
+    state.upsert_queue_item(source_type="sab", source_id="stale", name="Stale", state="ignored", reason="SAB category is not owned by Importarr")
+    state.upsert_queue_item(source_type="sab", source_id="other", name="Other", state="ignored", reason="other reason")
+
+    assert state.delete_queue_items_by_state("sab", "ignored", "SAB category is not owned by Importarr") == 1
+
+    rows = state.list_queue_items()
+    assert len(rows) == 1
+    assert rows[0]["source_id"] == "other"

tests/test_status.py

@@ -8,6 +8,19 @@ def test_health_contains_build_info(tmp_path, monkeypatch):
     assert payload["version"]
 
 
+def test_build_date_is_rendered_in_local_time(monkeypatch):
+    import importarr.build_info as build_info
+
+    monkeypatch.setenv("TZ", "Europe/Copenhagen")
+    import time
+
+    time.tzset()
+
+    monkeypatch.setenv("IMPORTARR_BUILD_DATE", "2026-07-29T12:00:00Z")
+
+    assert build_info.build_info()["build_date"] == "2026-07-29T14:00:00+02:00"
+
+
 def test_status_contains_service_configuration(tmp_path, monkeypatch):
     monkeypatch.setenv("IMPORTARR_STATE_PATH", str(tmp_path / "state.db"))
     import importarr.main as main
@@ -33,6 +46,25 @@ def test_index_renders_queue_controls(tmp_path, monkeypatch):
     assert "cancel-current" in response.text
 
 
+def test_index_packs_secondary_controls_into_menu(tmp_path, monkeypatch):
+    monkeypatch.setenv("IMPORTARR_STATE_PATH", str(tmp_path / "state.db"))
+    import importarr.main as main
+
+    from fastapi.testclient import TestClient
+
+    response = TestClient(main.app).get("/")
+
+    assert response.status_code == 200
+    assert 'class="menu"' in response.text
+    assert "Service info and build details" in response.text
+    assert "Queue and history" in response.text
+    assert "Current import" in response.text
+    assert "details.menu[open]" in response.text
+    assert "e.target===e.currentTarget" in response.text
+    assert "function readiness" in response.text
+    assert 'title="${esc(j.reason||j.state)}"' in response.text
+
+
 def test_index_renders_settings_dialog(tmp_path, monkeypatch):
     monkeypatch.setenv("IMPORTARR_STATE_PATH", str(tmp_path / "state.db"))
     import importarr.main as main
@@ -46,6 +78,47 @@ def test_index_renders_settings_dialog(tmp_path, monkeypatch):
     assert "SABnzbd" in response.text
     assert "Radarr" in response.text
     assert "Sonarr" in response.text
+    assert "Test SABnzbd connection" in response.text
+    assert "Test Radarr connection" in response.text
+    assert "Test Sonarr connection" in response.text
+
+
+def test_index_renders_responsive_table_wrappers(tmp_path, monkeypatch):
+    monkeypatch.setenv("IMPORTARR_STATE_PATH", str(tmp_path / "state.db"))
+    import importarr.main as main
+
+    from fastapi.testclient import TestClient
+
+    response = TestClient(main.app).get("/")
+
+    assert response.status_code == 200
+    assert 'class="table-scroll"' in response.text
+    assert "job-cards" in response.text
+    assert "job-card" in response.text
+    assert '<meta name="viewport" content="width=device-width, initial-scale=1">' in response.text
+
+
+def test_stylesheet_includes_mobile_responsive_rules():
+    from pathlib import Path
+
+    css = Path("importarr/static/importarr.css").read_text()
+
+    assert "@media (max-width:640px)" in css
+    assert ".table-scroll" in css
+    assert "overflow-x:auto" in css
+    assert "flex-direction:column" in css
+    assert ".jobs-table{display:none}" in css
+    assert ".job-cards{display:block}" in css
+    assert "word-break:break-word" in css
+    assert "max-width:1280px" in css
+    assert ".jobs-table table{table-layout:fixed;min-width:0}" in css
+    assert ".jobs-table th:nth-child(1){width:66%}" in css
+    assert ".row-actions button{width:1.85rem" in css
+    assert ".summary-strip" in css
+    assert ".menu-panel" in css
+    assert "@media (prefers-color-scheme:dark)" in css
+    assert "--primary:#4b42b8" in css
+    assert "--cyan:#50dce5" in css
 
 
 def test_settings_endpoint_persists_arr_connection_values(tmp_path, monkeypatch):
@@ -77,3 +150,37 @@ def test_settings_endpoint_persists_arr_connection_values(tmp_path, monkeypatch)
     }
     assert main.settings.sab_api_key == "sab-secret"
     assert main.state.get_app_state("radarr_api_key") == "radarr-secret"
+
+
+def test_sab_connection_test_reports_success(tmp_path, monkeypatch):
+    monkeypatch.setenv("IMPORTARR_STATE_PATH", str(tmp_path / "state.db"))
+    import importarr.main as main
+
+    from fastapi.testclient import TestClient
+
+    async def fake_queue(self):
+        return {"queue": {"slots": [{"name": "one"}, {"name": "two"}]}}
+
+    monkeypatch.setattr(main.SabnzbdClient, "queue", fake_queue)
+
+    response = TestClient(main.app).post(
+        "/api/settings/test-connection",
+        json={"service": "sabnzbd", "url": "http://sab:8080", "api_key": "secret"},
+    )
+
+    assert response.status_code == 200
+    assert response.json() == {"ok": True, "service": "sabnzbd", "message": "Connected to SABnzbd; 2 queued jobs visible."}
+
+
+def test_connection_test_rejects_unknown_service(tmp_path, monkeypatch):
+    monkeypatch.setenv("IMPORTARR_STATE_PATH", str(tmp_path / "state.db"))
+    import importarr.main as main
+
+    from fastapi.testclient import TestClient
+
+    response = TestClient(main.app).post(
+        "/api/settings/test-connection",
+        json={"service": "lidarr", "url": "http://lidarr:8686"},
+    )
+
+    assert response.status_code == 400