Require synced review site

.dockerignore

@@ -0,0 +1,15 @@
+.git
+.venv
+.review-data
+deploy/importarr.review.env
+.pytest_cache
+.mypy_cache
+.ruff_cache
+.tox
+**/__pycache__
+**/*.pyc
+**/*.pyo
+*.egg-info
+.coverage
+htmlcov
+frontend/node_modules

.gitignore

@@ -6,3 +6,6 @@ __pycache__/
 *.db
 *.partial
 AGENTS.local.md
+.review-data/
+deploy/importarr.review.env
+frontend/node_modules/

AGENTS.md

@@ -0,0 +1,7 @@
+# Repository Instructions
+
+The Importarr review site at <http://172.20.30.35:18765/> must always reflect the local working-tree code.
+
+- After making local code changes, run `deploy/review/review.sh update` from the repository root.
+- Before finishing, verify that `http://172.20.30.35:18765/` responds successfully.
+- If deployment or URL verification fails, report the failure clearly; do not claim the review site is current.

Dockerfile

@@ -1,8 +1,16 @@
+FROM node:22-alpine AS frontend
+WORKDIR /build/frontend
+COPY frontend/package*.json ./
+RUN npm ci
+COPY frontend ./
+RUN npm run build
+
 FROM python:3.12-slim AS runtime
 
 WORKDIR /app
 COPY pyproject.toml README.md LICENSE ./
 COPY importarr ./importarr
+COPY --from=frontend /build/importarr/static ./importarr/static
 ARG IMPORTARR_VERSION=0.1.0
 ARG IMPORTARR_BUILD_DATE=unknown
 ARG IMPORTARR_GIT_SHA=unknown

README.md

@@ -43,7 +43,7 @@ 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.
+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. The web UI Start, Stop, and Restart controls target `manual-media-import.service` by default; configure `IMPORTARR_START_COMMAND`, `IMPORTARR_STOP_COMMAND`, or `IMPORTARR_RESTART_COMMAND` when those defaults need 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.
 
@@ -91,10 +91,54 @@ Set `IMPORTARR_AUTH_TOKEN_FILE` or `IMPORTARR_AUTH_TOKEN` to require `Authorizat
 python3.12 -m venv .venv
 . .venv/bin/activate
 pip install -e '.[test]'
+npm --prefix frontend install
+npm --prefix frontend run build
 pytest
 uvicorn importarr.main:app --reload
 ```
 
+The web UI is a Vite React application styled with Tailwind CSS. Its local
+shadcn-style component primitives use Radix UI for dialogs and composition, and
+lucide-react for icons. Run `npm --prefix frontend run dev` for Vite's development
+server (it proxies API calls to port 8765), or build before running FastAPI so the
+production assets are written to `importarr/static`.
+
+### Persistent local review environment
+
+The review Compose stack builds the current working tree, including uncommitted
+UI/API changes, and stays running for pre-commit or pre-push inspection. It is
+separate from production: the web port is bound to localhost by default, state and
+sample media live under the ignored `.review-data/` directory, external Arr/SAB
+services are not required, and service-control/update commands are safe no-ops.
+
+```sh
+deploy/review/review.sh up       # build current files and start in background
+deploy/review/review.sh update   # rebuild changed files and recreate as needed
+deploy/review/review.sh status
+deploy/review/review.sh logs     # follow logs; Ctrl-C leaves the stack running
+deploy/review/review.sh stop     # stop containers, preserving them and data
+deploy/review/review.sh down     # remove containers/network, preserving data
+deploy/review/review.sh reset    # remove stack and all local review data
+```
+
+On first use the wrapper copies `deploy/importarr.review.env.example` to the
+ignored `deploy/importarr.review.env`. Adjust `REVIEW_PORT` there if port 18765
+is occupied, then review `http://127.0.0.1:18765/`. For review from a trusted
+internal network, set `REVIEW_BIND_ADDRESS` to the host's LAN address and use
+that address in the URL. Do not use `0.0.0.0` or expose this review stack to an
+untrusted network; the safe default is `127.0.0.1`. To exercise imports without
+real integrations, place disposable folders in `.review-data/downloads/`; movie
+and TV destinations are `.review-data/movies/` and `.review-data/tv/`.
+Each checkout gets its own Compose project and image name, so worktrees do not
+replace each other's containers or images. Read-only and cleanup commands do not
+create the local env file when it is absent.
+
+Agent workflow: run tests, run `update`, confirm `status` reports healthy, and
+leave the stack running for the reviewer. Reviewer workflow: inspect the UI and
+API, use `logs` when needed, and use `down` after review (or `reset` when the
+saved review state is no longer useful). Re-run `update` after every working-tree
+change that should be reviewed.
+
 ## Operations
 
 Importarr intentionally does not document private deployment topology, hostnames, reverse proxies, monitoring, backups, or operator workflows in this repository. Keep those details in your own ops runbooks.

deploy/docker-compose.review.yml

@@ -0,0 +1,22 @@
+services:
+  importarr:
+    build:
+      context: ..
+      dockerfile: Dockerfile
+    image: ${REVIEW_IMAGE:-importarr-review:local}
+    env_file:
+      - ${REVIEW_SERVICE_ENV_FILE:-importarr.review.env.example}
+    ports:
+      - "${REVIEW_BIND_ADDRESS:-127.0.0.1}:${REVIEW_PORT:-18765}:8765"
+    volumes:
+      - ../.review-data/config:/config
+      - ../.review-data/downloads:/data/downloads/manual
+      - ../.review-data/movies:/data/movies
+      - ../.review-data/tv:/data/tv
+    restart: unless-stopped
+    healthcheck:
+      test: ["CMD", "python", "-c", "import urllib.request; urllib.request.urlopen('http://127.0.0.1:8765/health', timeout=2)"]
+      interval: 10s
+      timeout: 3s
+      retries: 6
+      start_period: 5s

deploy/importarr.review.env.example

@@ -0,0 +1,23 @@
+# Copied to importarr.review.env by deploy/review/review.sh. No secrets or
+# external services are required for review.
+REVIEW_PORT=18765
+# Keep this on loopback unless review access from a trusted network is needed.
+REVIEW_BIND_ADDRESS=127.0.0.1
+IMPORTARR_BIND_HOST=0.0.0.0
+IMPORTARR_BIND_PORT=8765
+IMPORTARR_STATE_PATH=/config/importarr.db
+IMPORTARR_DOWNLOAD_ROOT=/data/downloads/manual
+IMPORTARR_MOVIES_ROOT=/data/movies
+IMPORTARR_TV_ROOT=/data/tv
+IMPORTARR_SAB_URL=http://127.0.0.1:9
+IMPORTARR_SAB_CATEGORY=review
+IMPORTARR_POLL_SECONDS=3600
+IMPORTARR_LOG_LEVEL=info
+
+# UI control operations must not control host services or update this checkout.
+IMPORTARR_START_COMMAND=/bin/true
+IMPORTARR_STOP_COMMAND=/bin/true
+IMPORTARR_RESTART_COMMAND=/bin/true
+IMPORTARR_UPDATE_COMMAND=/bin/true
+IMPORTARR_UPDATE_RELEASE_URL=http://127.0.0.1:9/releases/latest
+IMPORTARR_UPDATE_CHECK_TIMEOUT_SECONDS=1

deploy/review/review.sh

@@ -0,0 +1,108 @@
+#!/bin/sh
+set -eu
+
+script_dir=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
+repo_dir=$(CDPATH= cd -- "$script_dir/../.." && pwd)
+compose_file="$repo_dir/deploy/docker-compose.review.yml"
+env_file="$repo_dir/deploy/importarr.review.env"
+env_example="$repo_dir/deploy/importarr.review.env.example"
+data_dir="$repo_dir/.review-data"
+repo_name=$(printf '%s' "${repo_dir##*/}" | tr '[:upper:]' '[:lower:]' | tr -c 'a-z0-9_-' '-')
+repo_id=$(printf '%s' "$repo_dir" | cksum | awk '{print $1}')
+project_name="importarr-review-${repo_name}-${repo_id}"
+review_image="${project_name}-importarr:review"
+
+usage() {
+    echo "Usage: $0 {up|update|status|logs|stop|down|reset}" >&2
+    exit 2
+}
+
+command -v docker >/dev/null 2>&1 || {
+    echo "docker is required" >&2
+    exit 1
+}
+
+if docker info >/dev/null 2>&1; then
+    docker_with_sudo=false
+elif command -v sudo >/dev/null 2>&1 && sudo -n docker info >/dev/null 2>&1; then
+    docker_with_sudo=true
+else
+    echo "cannot access the Docker daemon with docker or sudo -n docker" >&2
+    exit 1
+fi
+
+compose() {
+    selected_env_file=$env_example
+    if [ -f "$env_file" ]; then
+        selected_env_file=$env_file
+    fi
+
+    if [ "$docker_with_sudo" = true ]; then
+        sudo -n env REVIEW_IMAGE="$review_image" REVIEW_SERVICE_ENV_FILE="$selected_env_file" \
+            docker compose --project-name "$project_name" --project-directory "$repo_dir/deploy" \
+            --env-file "$selected_env_file" -f "$compose_file" "$@"
+    else
+        REVIEW_IMAGE="$review_image" REVIEW_SERVICE_ENV_FILE="$selected_env_file" \
+            docker compose --project-name "$project_name" --project-directory "$repo_dir/deploy" \
+            --env-file "$selected_env_file" -f "$compose_file" "$@"
+    fi
+}
+
+ensure_env_file() {
+    if [ ! -f "$env_file" ]; then
+        cp "$env_example" "$env_file"
+        echo "Created $env_file from the safe review defaults."
+    fi
+}
+
+remove_data() {
+    if rm -rf "$data_dir" 2>/dev/null && [ ! -e "$data_dir" ]; then
+        return
+    fi
+    if [ "$docker_with_sudo" = true ]; then
+        sudo -n rm -rf "$data_dir"
+    else
+        echo "cannot remove root-owned review data without passwordless sudo: $data_dir" >&2
+        exit 1
+    fi
+}
+
+case "${1:-}" in
+    up|update)
+        ensure_env_file
+        mkdir -p "$data_dir/config" "$data_dir/downloads" "$data_dir/movies" "$data_dir/tv"
+        compose up --detach --build --wait
+        ;;
+    status)
+        compose ps
+        container_id=$(compose ps --quiet importarr)
+        [ -n "$container_id" ] || {
+            echo "review service is not running" >&2
+            exit 1
+        }
+        health=$(if [ "$docker_with_sudo" = true ]; then
+            sudo -n docker inspect --format '{{if .State.Health}}{{.State.Health.Status}}{{else}}none{{end}}' "$container_id"
+        else
+            docker inspect --format '{{if .State.Health}}{{.State.Health.Status}}{{else}}none{{end}}' "$container_id"
+        fi)
+        [ "$health" = healthy ] || {
+            echo "review service is not healthy (status: $health)" >&2
+            exit 1
+        }
+        ;;
+    logs)
+        compose logs --follow --tail=200
+        ;;
+    stop)
+        compose stop
+        ;;
+    down)
+        compose down --remove-orphans
+        ;;
+    reset)
+        compose down --remove-orphans
+        remove_data
+        echo "Removed review data: $data_dir"
+        ;;
+    *) usage ;;
+esac

frontend/index.html

@@ -0,0 +1,10 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="theme-color" content="#252B42" />
+    <title>Importarr</title>
+  </head>
+  <body><div id="root"></div><script type="module" src="/src/main.jsx"></script></body>
+</html>

frontend/package.json

@@ -0,0 +1,32 @@
+{
+  "name": "importarr-ui",
+  "private": true,
+  "version": "0.1.0",
+  "type": "module",
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build",
+    "test": "vitest run"
+  },
+  "dependencies": {
+    "@radix-ui/react-dialog": "^1.1.14",
+    "@radix-ui/react-slot": "^1.2.3",
+    "class-variance-authority": "^0.7.1",
+    "clsx": "^2.1.1",
+    "lucide-react": "^0.468.0",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "tailwind-merge": "^2.6.0"
+  },
+  "devDependencies": {
+    "@testing-library/jest-dom": "^6.6.3",
+    "@testing-library/react": "^16.1.0",
+    "@vitejs/plugin-react": "^4.3.4",
+    "autoprefixer": "^10.4.20",
+    "postcss": "^8.4.49",
+    "tailwindcss": "^3.4.17",
+    "vite": "^6.0.5",
+    "vitest": "^2.1.8",
+    "jsdom": "^25.0.1"
+  }
+}

frontend/postcss.config.js

@@ -0,0 +1 @@
+export default { plugins: { tailwindcss: {}, autoprefixer: {} } };

frontend/src/components/ui.jsx

@@ -0,0 +1,23 @@
+import * as DialogPrimitive from "@radix-ui/react-dialog";
+import { Slot } from "@radix-ui/react-slot";
+import { cva } from "class-variance-authority";
+import { X } from "lucide-react";
+import { cn } from "../lib/utils";
+
+const buttonVariants = cva("inline-flex h-9 items-center justify-center gap-2 rounded-md px-4 text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-secondary disabled:pointer-events-none disabled:opacity-50", {
+  variants: { variant: { default: "bg-primary text-white hover:bg-secondary", secondary: "bg-secondary text-white hover:bg-primary", outline: "border bg-card hover:bg-input", ghost: "hover:bg-input", destructive: "bg-primary text-white hover:bg-secondary" }, size: { default: "h-9 px-4", icon: "h-9 w-9 p-0", sm: "h-8 px-3" } },
+  defaultVariants: { variant: "default", size: "default" }
+});
+export function Button({ className, variant, size, asChild = false, ...props }) { const Comp = asChild ? Slot : "button"; return <Comp className={cn(buttonVariants({ variant, size }), className)} {...props} />; }
+export function Input({ className, ...props }) { return <input className={cn("flex h-9 w-full rounded-md border bg-input px-3 py-1 text-sm outline-none placeholder:text-muted-foreground focus:ring-2 focus:ring-secondary", className)} {...props} />; }
+export function Card({ className, ...props }) { return <section className={cn("rounded-lg border bg-card shadow-sm", className)} {...props} />; }
+export function CardHeader({ className, ...props }) { return <div className={cn("flex flex-col gap-1.5 p-6", className)} {...props} />; }
+export function CardTitle({ className, ...props }) { return <h2 className={cn("text-lg font-semibold", className)} {...props} />; }
+export function CardContent({ className, ...props }) { return <div className={cn("p-6 pt-0", className)} {...props} />; }
+export const Dialog = DialogPrimitive.Root;
+export const DialogTrigger = DialogPrimitive.Trigger;
+export const DialogClose = DialogPrimitive.Close;
+export function DialogContent({ className, children, ...props }) { return <DialogPrimitive.Portal><DialogPrimitive.Overlay className="fixed inset-0 z-40 bg-background/80 backdrop-blur-sm" /><DialogPrimitive.Content className={cn("fixed left-1/2 top-1/2 z-50 max-h-[90vh] w-[calc(100%-2rem)] max-w-2xl -translate-x-1/2 -translate-y-1/2 overflow-y-auto rounded-lg border bg-card p-6 shadow-xl", className)} {...props}>{children}<DialogPrimitive.Close className="absolute right-4 top-4 rounded-sm text-muted-foreground hover:text-foreground" aria-label="Close"><X className="h-4 w-4" /></DialogPrimitive.Close></DialogPrimitive.Content></DialogPrimitive.Portal>; }
+export function DialogHeader({ className, ...props }) { return <div className={cn("mb-4 space-y-1.5", className)} {...props} />; }
+export function DialogTitle({ className, ...props }) { return <DialogPrimitive.Title className={cn("text-lg font-semibold", className)} {...props} />; }
+export function Badge({ className, ...props }) { return <span className={cn("inline-flex rounded-full bg-primary px-2 py-0.5 text-xs font-medium text-white", className)} {...props} />; }

frontend/src/globals.css

@@ -0,0 +1,33 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+
+@layer base {
+  :root {
+    color-scheme: light;
+    --background: #F8FAFC;
+    --card: #FFFFFF;
+    --input: #FFFFFF;
+    --primary: #4A43EC;
+    --secondary: #7171FF;
+    --accent: #2AD1ED;
+    --foreground: #1A1D2E;
+    --muted-foreground: #64748B;
+    --border: #E2E8F0;
+  }
+  .dark {
+    color-scheme: dark;
+    --background: #252B42;
+    --card: #303753;
+    --input: #23283B;
+    --primary: #4A43EC;
+    --secondary: #7171FF;
+    --accent: #42ECF5;
+    --foreground: #FFFFFF;
+    --muted-foreground: #8B95B7;
+    --border: #3D4668;
+  }
+  * { @apply border-border; }
+  body { @apply m-0 min-w-0 bg-background text-foreground antialiased; }
+  button, input { font: inherit; }
+}

frontend/src/lib/utils.js

@@ -0,0 +1,3 @@
+import { clsx } from "clsx";
+import { twMerge } from "tailwind-merge";
+export const cn = (...inputs) => twMerge(clsx(inputs));

frontend/src/main.jsx

@@ -0,0 +1,51 @@
+import React, { useEffect, useState } from "react";
+import { createRoot } from "react-dom/client";
+import { AlertTriangle, Clock, Download, FolderPlus, History, Info, Menu, Moon, Pause, Play, RefreshCw, Settings, Square, Sun, Trash2, XCircle, Zap } from "lucide-react";
+import "./globals.css";
+import { Badge, Button, Card, CardContent, CardHeader, CardTitle, Dialog, DialogContent, DialogHeader, DialogTitle, DialogTrigger, Input } from "./components/ui";
+
+const groups = ["sab_processing", "ready", "importing", "failed", "ignored_category", "manual_batch", "completed"];
+const labels = { sab_processing: "SAB processing", ready: "Ready", importing: "Importing", failed: "Failed", ignored_category: "Ignored category", manual_batch: "Manual batch", completed: "Completed" };
+const bytes = value => { let n=Number(value||0), i=0; const units=["B","KB","MB","GB","TB"]; if(!n)return "size unknown"; while(n>=1024&&i<4){n/=1024;i++} return `${n.toFixed(n>=10||!i?0:1)} ${units[i]}`; };
+const duration = value => { const s=Math.max(0,Math.floor(Number(value||0))); return s>=60?`${Math.floor(s/60)}m ${String(s%60).padStart(2,"0")}s`:`${s}s`; };
+
+async function request(url, options={}) {
+  const response=await fetch(url, options.body ? {...options,headers:{"content-type":"application/json",...options.headers},body:JSON.stringify(options.body)} : options);
+  if(!response.ok){ const error=await response.json().catch(()=>({detail:response.statusText})); throw new Error(typeof error.detail==="string"?error.detail:"Request failed"); }
+  return response.status===204?null:response.json();
+}
+
+function Modal({ trigger, title, children }) { return <Dialog><DialogTrigger asChild>{trigger}</DialogTrigger><DialogContent><DialogHeader><DialogTitle>{title}</DialogTitle></DialogHeader>{children}</DialogContent></Dialog>; }
+function Field({ label, ...props }) { return <label className="grid gap-2 text-sm font-medium">{label}<Input {...props}/></label>; }
+
+export function SettingsDialog({ status, refresh }) {
+  const [result,setResult]=useState({});
+  const [urls,setUrls]=useState({sab_url:"",radarr_url:"",sonarr_url:""});
+  useEffect(()=>setUrls({sab_url:status?.sab_url||"",radarr_url:status?.radarr_url||"",sonarr_url:status?.sonarr_url||""}),[status?.sab_url,status?.radarr_url,status?.sonarr_url]);
+  const submit=async e=>{ e.preventDefault(); try { await request("/api/settings",{method:"POST",body:Object.fromEntries(new FormData(e.currentTarget))}); e.currentTarget.reset(); await refresh(); } catch(error){ alert(error.message); } };
+  const test=async (service,form)=>{ const prefix=service==="sabnzbd"?"sab":service; setResult(r=>({...r,[service]:"Testing…"})); try { const data=await request("/api/settings/test-connection",{method:"POST",body:{service,url:form.elements[`${prefix}_url`].value,api_key:form.elements[`${prefix}_api_key`].value}}); setResult(r=>({...r,[service]:data.message})); } catch(error){setResult(r=>({...r,[service]:error.message}))} };
+  return <><Modal title="Settings" trigger={<Button variant="ghost" className="w-full justify-start"><Settings/> Settings</Button>}><form onSubmit={submit} className="grid gap-6">{[["sab","sabnzbd","SABnzbd"],["radarr","radarr","Radarr"],["sonarr","sonarr","Sonarr"]].map(([prefix,service,label])=><fieldset className="grid gap-3 rounded-md border p-4" key={service}><legend className="px-2 font-semibold">{label}</legend><Field label={`${label} URL`} name={`${prefix}_url`} type="url" required={prefix==="sab"} value={urls[`${prefix}_url`]} onChange={e=>setUrls(current=>({...current,[e.target.name]:e.target.value}))}/><Field label="API token" name={`${prefix}_api_key`} type="password" autoComplete="off" placeholder={status?.[`${prefix}_api_key_configured`]?"Configured; enter replacement":"API token"}/><div className="flex items-center gap-3"><Button type="button" variant="outline" onClick={e=>test(service,e.currentTarget.form)}>Test connection</Button><span className="text-sm text-muted-foreground">{result[service]}</span></div></fieldset>)}<p className="text-sm text-muted-foreground">Blank token fields clear stored tokens.</p><Button>Save settings</Button></form></Modal><Button variant="ghost" className="w-full justify-start" onClick={async()=>{try{await request("/api/import/run-now",{method:"POST",body:{force:true}});await refresh()}catch(error){alert(error.message)}}}><Zap/> Force run now</Button></>;
+}
+
+function ManualBatches({ refresh }) { const [batches,setBatches]=useState([]); const load=()=>request("/api/manual-batches").then(setBatches).catch(()=>{}); return <Modal title="Manual batches" trigger={<Button variant="ghost" className="w-full justify-start" onClick={load}><FolderPlus/> Manual batches</Button>}><form className="flex flex-col gap-3 sm:flex-row" onSubmit={async e=>{e.preventDefault();try{await request("/api/manual-batches",{method:"POST",body:{path:e.currentTarget.path.value}});e.currentTarget.reset();load();refresh()}catch(error){alert(error.message)}}}><Input name="path" required placeholder="Folder under download root"/><Button>Add batch</Button></form><div className="mt-4 grid gap-2">{batches.length?batches.map(b=><div className="rounded-md border p-3 text-sm" key={b.id}><strong>#{b.id} · {b.status}</strong><p className="break-all text-muted-foreground">{b.path}</p></div>):<p className="text-muted-foreground">No manual batches.</p>}</div></Modal>; }
+
+export function App(){
+  const [status,setStatus]=useState(null), [jobs,setJobs]=useState([]), [update,setUpdate]=useState(null), [menu,setMenu]=useState(false);
+  const [dark,setDark]=useState(()=>localStorage.getItem("importarr-theme")!=="light" && (localStorage.getItem("importarr-theme")==="dark"||matchMedia("(prefers-color-scheme: dark)").matches));
+  const refresh=async()=>{ try { const [s,j]=await Promise.all([request("/api/status"),request("/api/jobs")]); setStatus(s);setJobs((j.jobs||[]).map(job=>({...job,reason:[job.reason,job.source_type==="sab"&&`SAB ${job.sab_status||"—"}${job.sab_category?` · ${job.sab_category}`:""}`,job.batch_id&&`batch ${job.batch_id}`].filter(Boolean).join(" · ")})));document.title=`${j.jobs?.length?`${j.jobs.length} jobs`:"Idle"} · Importarr`; } catch(error){ console.error(error); } };
+  useEffect(()=>{document.documentElement.classList.toggle("dark",dark);localStorage.setItem("importarr-theme",dark?"dark":"light")},[dark]);
+  useEffect(()=>{refresh();const id=setInterval(refresh,2000);request("/api/control/update-check").then(setUpdate).catch(()=>{});return()=>clearInterval(id)},[]);
+  const post=async(url,body)=>{try{await request(url,{method:"POST",body});await refresh()}catch(error){alert(error.message)}};
+  const control=action=>{if(action==="cancel-current"&&!confirm("Cancel the current import job?"))return;post(`/api/control/${action}`)};
+  const current=status?.current, currentName=typeof current==="object"?(current.file||current.name):current;
+  return <div className="min-h-screen bg-background">
+    <header className="sticky top-0 z-30 border-b bg-card/95 backdrop-blur"><div className="mx-auto flex max-w-7xl items-center gap-3 p-4"><Download className="h-7 w-7 text-accent"/><div><h1 className="text-xl font-bold">Importarr</h1><p className="text-xs capitalize text-muted-foreground">{status?.control?.queue_mode||"Connecting"}</p></div><div className="ml-auto hidden max-w-md truncate text-sm text-muted-foreground sm:block">{currentName||"No active import"}</div><Button size="icon" aria-label="Start imports" onClick={()=>control("start")}><Play/></Button><Button size="icon" variant="outline" aria-label="Pause imports" onClick={()=>control("pause")}><Pause/></Button><div className="relative"><Button size="icon" variant="outline" aria-label="Open menu" onClick={()=>setMenu(!menu)}><Menu/></Button>{menu&&<Card className="absolute right-0 mt-2 w-60 p-2"><SettingsDialog status={status} refresh={refresh}/><ManualBatches refresh={refresh}/><Modal title="Service info" trigger={<Button variant="ghost" className="w-full justify-start"><Info/> Service info</Button>}><dl className="grid grid-cols-[auto_1fr] gap-x-4 gap-y-2 text-sm">{status&&Object.entries({Version:status.build.version,"Build date":status.build.build_date,"Git SHA":status.build.git_sha,"SAB URL":status.sab_url,"Download root":status.download_root,"Movies root":status.movies_root,"TV root":status.tv_root,"Write auth":status.auth_enabled?"enabled":"disabled"}).map(([k,v])=><React.Fragment key={k}><dt className="font-medium">{k}</dt><dd className="break-all text-muted-foreground">{String(v)}</dd></React.Fragment>)}</dl></Modal><Button variant="ghost" className="w-full justify-start" onClick={()=>setDark(!dark)}>{dark?<Sun/>:<Moon/>}{dark?"Light":"Dark"} theme</Button><Button variant="ghost" className="w-full justify-start" onClick={()=>control("stop")}><Square/> Stop queue</Button><Button variant="ghost" className="w-full justify-start" onClick={()=>control("cancel-current")}><XCircle/> Cancel current</Button><Button variant="ghost" className="w-full justify-start" onClick={()=>post("/api/import/run-now",{force:true})}><Zap/> Force run now</Button></Card>}</div></div></header>
+    <main className="mx-auto grid max-w-7xl gap-4 p-4 sm:p-6">
+      {update?.update_available&&<Card className="border-secondary"><CardContent className="flex flex-wrap items-center gap-3 p-4"><AlertTriangle className="text-accent"/><strong>Version {update.latest_version} is available</strong><Button className="ml-auto" onClick={()=>confirm("Update Importarr now?")&&post("/api/control/update")}>Update now</Button></CardContent></Card>}
+      <div className="grid grid-cols-2 gap-4 lg:grid-cols-5">{[["Queue mode",status?.control?.queue_mode],["Current import",currentName||"Idle"],["Imported",status?.imported_total],["Failed",status?.failed_total],["Queue items",status?.queue_total]].map(([label,value])=><Card key={label}><CardContent className="p-4"><strong className="block truncate text-lg capitalize">{value??"—"}</strong><span className="text-sm text-muted-foreground">{label}</span></CardContent></Card>)}</div>
+      <Card><CardHeader className="flex-row items-center justify-between"><div><CardTitle>Current import</CardTitle><p className="text-sm text-muted-foreground">{currentName?`Running ${duration(current.elapsed_seconds)}`:"Waiting for an active import"}</p></div><Clock className="text-accent"/></CardHeader><CardContent><p className="mb-3 break-all text-sm">{currentName||"No active copy."}</p><progress className="h-2 w-full accent-accent" max="100" value={typeof current==="object"?current.percent||0:0}/>{currentName&&<p className="mt-2 text-xs text-muted-foreground">{Number(current.percent||0).toFixed(1)}% · {bytes(current.bytes_copied)} / {bytes(current.total_bytes)}</p>}</CardContent></Card>
+      <Card><CardHeader className="flex-row items-center gap-3"><History className="text-accent"/><div><CardTitle>Queue and history</CardTitle><p className="text-sm text-muted-foreground">Grouped by processing state</p></div></CardHeader><CardContent className="grid gap-6">{jobs.length?groups.map(group=>{const items=jobs.filter(j=>j.group===group);return items.length?<section key={group}><h3 className="mb-3 flex items-center gap-2 font-semibold">{labels[group]} <Badge>{items.length}</Badge></h3><div className="grid gap-2">{items.map(j=><article className="grid gap-3 rounded-md border bg-input p-4 lg:grid-cols-[minmax(0,1fr)_auto] lg:items-center" key={j.id}><div className="min-w-0"><strong className="block break-words">{j.name}</strong><p className="break-all text-xs text-muted-foreground">{j.source_type} · attempts {j.attempt_count||0} · {j.relative_path||j.storage||j.source_id}</p><div className="mt-2 flex flex-wrap items-center gap-2"><Badge>{j.state}</Badge><span className="text-xs text-muted-foreground">{j.reason}</span></div></div><div className="flex gap-2">{j.can_run_now&&<Button size="icon" title="Run now" onClick={()=>post(`/api/queue-items/${j.id}/action`,{action:"run-now"})}><Play/></Button>}{j.can_retry&&<Button size="icon" variant="outline" title="Retry" onClick={()=>post(`/api/queue-items/${j.id}/action`,{action:"retry"})}><RefreshCw/></Button>}{j.can_ignore&&<Button size="icon" variant="outline" title="Ignore" onClick={()=>confirm("Ignore this queue item?")&&post(`/api/queue-items/${j.id}/action`,{action:"ignore"})}><XCircle/></Button>}{j.can_remove&&<Button size="icon" variant="outline" title="Remove" onClick={()=>confirm("Remove this queue item?")&&post(`/api/queue-items/${j.id}/action`,{action:"remove"})}><Trash2/></Button>}</div></article>)}</div></section>:null}):<p className="text-muted-foreground">No queue items.</p>}</CardContent></Card>
+    </main></div>
+}
+const root=document.getElementById("root");
+if(root) createRoot(root).render(<React.StrictMode><App/></React.StrictMode>);

frontend/src/main.test.jsx

@@ -0,0 +1,29 @@
+import "@testing-library/jest-dom/vitest";
+import { fireEvent, render, screen, waitFor } from "@testing-library/react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { SettingsDialog } from "./main";
+
+describe("Importarr UI behavior", () => {
+  beforeEach(() => vi.stubGlobal("fetch", vi.fn()));
+  afterEach(() => vi.restoreAllMocks());
+
+  it("hydrates settings URLs when status arrives asynchronously", async () => {
+    const { rerender } = render(<SettingsDialog status={null} refresh={vi.fn()} />);
+    fireEvent.click(screen.getByRole("button", { name: "Settings" }));
+    expect(screen.getByLabelText("SABnzbd URL")).toHaveValue("");
+
+    rerender(<SettingsDialog status={{ sab_url: "http://sab", radarr_url: "http://radarr", sonarr_url: "http://sonarr" }} refresh={vi.fn()} />);
+
+    await waitFor(() => expect(screen.getByLabelText("SABnzbd URL")).toHaveValue("http://sab"));
+    expect(screen.getByLabelText("Radarr URL")).toHaveValue("http://radarr");
+    expect(screen.getByLabelText("Sonarr URL")).toHaveValue("http://sonarr");
+  });
+
+  it("posts a forced global run", async () => {
+    fetch.mockResolvedValue({ ok: true, status: 200, json: async () => ({}) });
+    render(<SettingsDialog status={null} refresh={vi.fn()} />);
+    fireEvent.click(screen.getByRole("button", { name: "Force run now" }));
+
+    await waitFor(() => expect(fetch).toHaveBeenCalledWith("/api/import/run-now", expect.objectContaining({ method: "POST", body: JSON.stringify({ force: true }) })));
+  });
+});

frontend/tailwind.config.js

@@ -0,0 +1,16 @@
+/** @type {import('tailwindcss').Config} */
+export default {
+  darkMode: ["class"],
+  content: ["./index.html", "./src/**/*.{js,jsx}"],
+  theme: {
+    extend: {
+      colors: {
+        background: "var(--background)", foreground: "var(--foreground)",
+        card: "var(--card)", input: "var(--input)", primary: "var(--primary)",
+        secondary: "var(--secondary)", accent: "var(--accent)",
+        muted: { foreground: "var(--muted-foreground)" }, border: "var(--border)"
+      }
+    }
+  },
+  plugins: []
+};

frontend/vite.config.js

@@ -0,0 +1,14 @@
+import { defineConfig } from "vite";
+import react from "@vitejs/plugin-react";
+import { resolve } from "node:path";
+
+export default defineConfig({
+  plugins: [react()],
+  base: "/static/",
+  server: { proxy: { "/api": "http://127.0.0.1:8765", "/health": "http://127.0.0.1:8765" } },
+  build: {
+    outDir: resolve(import.meta.dirname, "../importarr/static"),
+    emptyOutDir: true,
+    rollupOptions: { output: { entryFileNames: "assets/app.js", assetFileNames: "assets/app.[ext]" } }
+  }
+});

importarr/config.py

@@ -22,7 +22,9 @@ 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"])
+    start_command: list[str] = Field(default_factory=lambda: ["systemctl", "start", "manual-media-import.service"])
+    stop_command: list[str] = Field(default_factory=lambda: ["systemctl", "stop", "manual-media-import.service"])
+    restart_command: list[str] = Field(default_factory=lambda: ["systemctl", "restart", "manual-media-import.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)
@@ -48,7 +50,9 @@ 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"]),
+            start_command=_env_command("IMPORTARR_START_COMMAND", ["systemctl", "start", "manual-media-import.service"]),
+            stop_command=_env_command("IMPORTARR_STOP_COMMAND", ["systemctl", "stop", "manual-media-import.service"]),
+            restart_command=_env_command("IMPORTARR_RESTART_COMMAND", ["systemctl", "restart", "manual-media-import.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")),

importarr/importer.py

@@ -27,10 +27,14 @@ class Importer:
         target_root = self.tv_root if _looks_like_tv(source) else self.movies_root
         return _unique_path(target_root / source.name)
 
-    def import_file(self, source: Path, should_cancel: Callable[[], bool] | None = None) -> ImportResult:
+    def import_file(self, source: Path, should_cancel: Callable[[], bool] | None = None, on_progress: Callable[[int, int], None] | None = None) -> ImportResult:
         target = self.target_for(source)
         target.parent.mkdir(parents=True, exist_ok=True)
         partial = target.with_name(target.name + ".partial")
+        total = source.stat().st_size
+        copied = 0
+        if on_progress:
+            on_progress(copied, total)
         try:
             with source.open("rb") as src, partial.open("wb") as dst:
                 while True:
@@ -40,12 +44,15 @@ class Importer:
                     if not chunk:
                         break
                     dst.write(chunk)
+                    copied += len(chunk)
+                    if on_progress:
+                        on_progress(copied, total)
                 dst.flush()
                 os.fsync(dst.fileno())
         except ImportCancelled:
             partial.unlink(missing_ok=True)
             raise
-        if partial.stat().st_size != source.stat().st_size:
+        if partial.stat().st_size != total:
             raise IOError("partial copy size mismatch")
         partial.rename(target)
         source.unlink()

importarr/main.py

@@ -1,15 +1,18 @@
 from __future__ import annotations
 
+import json
+import os
 from pathlib import Path
 import subprocess
+import threading
+import time
 from typing import Annotated
 
 import uvicorn
 import httpx
-from fastapi import Depends, FastAPI, Header, HTTPException, Request
+from fastapi import Depends, FastAPI, Header, HTTPException
-from fastapi.responses import HTMLResponse
+from fastapi.responses import FileResponse
 from fastapi.staticfiles import StaticFiles
-from fastapi.templating import Jinja2Templates
 from pydantic import BaseModel
 
 from .build_info import build_info
@@ -22,9 +25,15 @@ from .state import State
 
 settings = Settings.from_env()
 state = State(settings.state_path)
-templates = Jinja2Templates(directory=str(Path(__file__).parent / "templates"))
+STATIC_DIR = Path(__file__).parent / "static"
 app = FastAPI(title="Importarr")
-app.mount("/static", StaticFiles(directory=str(Path(__file__).parent / "static")), name="static")
+app.mount("/static", StaticFiles(directory=str(STATIC_DIR)), name="static")
+WORKER_ID = f"importarr-{os.getpid()}"
+WORKER_SHUTDOWN_TIMEOUT_SECONDS = 5.0
+_worker_thread: threading.Thread | None = None
+_worker_stop = threading.Event()
+MAX_RETRY_ATTEMPTS = 3
+RETRY_DELAY_SECONDS = 60
 
 
 class ManualBatchCreate(BaseModel):
@@ -96,15 +105,19 @@ def health() -> dict[str, str]:
     return {"status": "ok", "name": "Importarr", "version": build_info()["version"]}
 
 
-@app.get("/", response_class=HTMLResponse)
+@app.get("/", response_class=FileResponse)
-def index(request: Request) -> HTMLResponse:
+def index() -> FileResponse:
-    return templates.TemplateResponse(request, "index.html", {"status": status(), "batches": state.list_manual_batches()})
+    return FileResponse(STATIC_DIR / "index.html")
 
 
 @app.get("/api/status")
 def status() -> dict[str, object]:
     history = state.list_history()
     control = control_status()
+    queue_items = state.list_queue_items(active_only=False)
+    queue_counts: dict[str, int] = {}
+    for row in queue_items:
+        queue_counts[row["state"]] = queue_counts.get(row["state"], 0) + 1
     return {
         "app": "Importarr",
         "build": build_info(),
@@ -123,6 +136,8 @@ def status() -> dict[str, object]:
         "manual_batches": len(state.list_manual_batches(active_only=True)),
         "imported_total": sum(1 for row in history if row["status"] == "imported"),
         "failed_total": sum(1 for row in history if row["status"] == "failed"),
+        "queue_total": len(queue_items),
+        "queue_counts": queue_counts,
         "current": control["current"],
         "control": control,
     }
@@ -189,7 +204,7 @@ async def test_connection(payload: ConnectionTestRequest, _: None = Depends(requ
 
 def control_status() -> dict[str, object]:
     mode = state.get_app_state("queue_mode", "running") or "running"
-    current = state.get_app_state("current_job")
+    current = current_job_status()
     cancel_requested = (state.get_app_state("cancel_requested", "false") or "false") == "true"
     return {
         "queue_mode": mode,
@@ -199,6 +214,21 @@ def control_status() -> dict[str, object]:
     }
 
 
+def current_job_status() -> dict[str, object] | str:
+    raw = state.get_app_state("current_job") or ""
+    if not raw:
+        return ""
+    try:
+        data = json.loads(raw)
+    except json.JSONDecodeError:
+        return raw
+    if isinstance(data, dict):
+        started_at = float(data.get("started_at") or time.time())
+        data["elapsed_seconds"] = max(0, int(time.time() - started_at))
+        return data
+    return raw
+
+
 def queue_accepting_new_jobs() -> bool:
     return (state.get_app_state("queue_mode", "running") or "running") == "running"
 
@@ -214,8 +244,49 @@ def consume_cancel_request() -> bool:
     return True
 
 
-def set_current_job(name: str | None) -> None:
+def set_current_job(name: str | None, *, bytes_copied: int = 0, total_bytes: int = 0, started_at: float | None = None) -> float:
-    state.set_app_state("current_job", name or "")
+    started = started_at or time.time()
+    if not name:
+        state.set_app_state("current_job", "")
+        return started
+    percent = round((bytes_copied / total_bytes * 100), 2) if total_bytes else 0
+    state.set_app_state(
+        "current_job",
+        json.dumps({"file": name, "name": Path(name).name if name else name, "bytes_copied": bytes_copied, "total_bytes": total_bytes, "percent": percent, "started_at": started}),
+    )
+    return started
+
+
+def ensure_worker_running() -> None:
+    global _worker_thread
+    if _worker_thread and _worker_thread.is_alive():
+        return
+    _worker_stop.clear()
+    state.release_stale_claims()
+    _worker_thread = threading.Thread(target=_worker_loop, name="importarr-queue-worker", daemon=True)
+    _worker_thread.start()
+
+
+def stop_worker(*, wait: bool = False) -> bool:
+    _worker_stop.set()
+    thread = _worker_thread
+    if wait and thread and thread.is_alive() and thread is not threading.current_thread():
+        thread.join(WORKER_SHUTDOWN_TIMEOUT_SECONDS)
+    return not thread or not thread.is_alive()
+
+
+def _worker_loop() -> None:
+    importer = Importer(settings.movies_root, settings.tv_root)
+    while not _worker_stop.is_set():
+        try:
+            if queue_accepting_new_jobs():
+                sync_manual_queue()
+            item = state.claim_next_queue_item(WORKER_ID) if queue_accepting_new_jobs() else None
+            if item is not None:
+                _import_queue_item(item, importer, from_worker=True)
+        except Exception:
+            state.upsert_queue_item(source_type="system", source_id="queue-worker", name="Queue worker", state="failed", reason="worker loop error")
+        _worker_stop.wait(settings.poll_seconds)
 
 
 @app.post("/api/control/queue")
@@ -225,6 +296,9 @@ def set_queue_control(payload: QueueControlRequest, _: None = Depends(require_wr
     state.set_app_state("queue_mode", payload.mode)
     if payload.mode == "running":
         state.set_app_state("cancel_requested", "false")
+        ensure_worker_running()
+    elif payload.mode == "stopped":
+        stop_worker()
     return control_status()
 
 
@@ -232,7 +306,8 @@ def set_queue_control(payload: QueueControlRequest, _: None = Depends(require_wr
 def start_queue(_: None = Depends(require_write_auth)) -> dict[str, object]:
     state.set_app_state("queue_mode", "running")
     state.set_app_state("cancel_requested", "false")
-    return control_status()
+    ensure_worker_running()
+    return {"control": control_status(), "command_result": _run_control_command(settings.start_command)}
 
 
 @app.post("/api/control/pause")
@@ -244,7 +319,9 @@ def pause_queue(_: None = Depends(require_write_auth)) -> dict[str, object]:
 @app.post("/api/control/stop")
 def stop_queue(_: None = Depends(require_write_auth)) -> dict[str, object]:
     state.set_app_state("queue_mode", "stopped")
-    return control_status()
+    state.set_app_state("cancel_requested", "true")
+    stop_worker()
+    return {"control": control_status(), "command_result": _run_control_command(settings.stop_command)}
 
 
 @app.post("/api/control/cancel-current")
@@ -376,19 +453,25 @@ def queue_item_action(item_id: int, payload: QueueItemActionRequest, _: None = D
     if item is None:
         raise HTTPException(status_code=404, detail="queue item not found")
     if payload.action == "retry":
-        retry_state = "manual_batch" if item["source_type"] == "manual" else "ready"
+        retry_state = "ready" if item["source_type"] in {"manual", "sab"} else "detected"
-        state.mark_queue_item(item["source_type"], item["source_id"], retry_state, "retry requested")
+        if not state.transition_queue_item_if_unclaimed(item_id, {"failed", "skipped"}, retry_state, "retry requested"):
+            raise HTTPException(status_code=409, detail="queue item is currently being imported or changed")
     elif payload.action == "run-now":
-        imported = _import_queue_item(item, Importer(settings.movies_root, settings.tv_root))
+        claimed = state.claim_queue_item(item_id, WORKER_ID, {"ready", "failed", "retrying"})
+        if claimed is None:
+            raise HTTPException(status_code=409, detail="queue item is not available to run now")
+        imported = _import_queue_item(claimed, Importer(settings.movies_root, settings.tv_root), force=True, from_worker=True)
         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")
+        if not state.transition_queue_item_if_unclaimed(item_id, {str(item["state"])}, "skipped", "ignored by user"):
+            raise HTTPException(status_code=409, detail="queue item is currently being imported or changed")
     elif payload.action == "remove":
-        state.delete_queue_item(item_id)
+        if not state.delete_queue_item_if_unclaimed(item_id):
+            raise HTTPException(status_code=409, detail="queue item is currently being imported")
         return {"status": "removed", "id": item_id}
     else:
-        raise HTTPException(status_code=400, detail="action must be retry, ignore, or remove")
+        raise HTTPException(status_code=400, detail="action must be retry, run-now, ignore, or remove")
     updated = state.get_queue_item(item_id)
     return {"status": "updated", "item": serialize_queue_item(updated or item)}
 
@@ -416,7 +499,6 @@ 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, sab_storage_root=settings.sab_storage_root)
         job_id = str(item.get("nzo_id") or item.get("nzoid") or item.get("name") or "")
@@ -426,7 +508,8 @@ async def sync_queue() -> None:
             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, 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, sab_category=str(item.get("category") or item.get("cat") or ""))
+            pending_state = "waiting_for_sab" if readiness.state not in {"failed", "skipped"} else readiness.state
+            state.upsert_queue_item(source_type="sab", source_id=job_id, source_path=readiness.storage, name=str(item.get("name") or job_id), state=pending_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]]:
@@ -452,20 +535,27 @@ def serialize_queue_item(item: dict[str, object]) -> dict[str, object]:
         "first_seen_at": item["first_seen_at"],
         "updated_at": item["updated_at"],
         "completed_at": item["completed_at"],
+        "attempt_count": item.get("attempt_count", 0),
+        "claimed_by": item.get("claimed_by"),
+        "next_retry_at": item.get("next_retry_at"),
         "sab_status": state_name 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_run_now": state_name in {"ready", "failed", "retrying"} and not item.get("claimed_by"),
         "can_retry": state_name in {"failed", "skipped"},
-        "can_ignore": state_name not in {"imported", "skipped"},
+        "can_ignore": state_name not in {"imported", "skipped", "importing"} and not item.get("claimed_by"),
-        "can_remove": True,
+        "can_remove": not item.get("claimed_by"),
     }
 
 
 def job_group(state_name: str, source_type: str) -> str:
     if source_type == "manual":
         return "manual_batch"
+    if state_name in {"detected", "waiting_for_sab"}:
+        return "sab_processing"
     if state_name == "ready":
         return "ready"
+    if state_name == "retrying":
+        return "failed"
     if state_name in {"importing", "copying"}:
         return "importing"
     if state_name == "failed":
@@ -504,7 +594,7 @@ def sync_manual_queue() -> None:
         for video in scan_videos(Path(batch["path"])):
             source_id = str(video.path)
             seen.add(source_id)
-            state.upsert_queue_item(source_type="manual", source_id=source_id, source_path=video.path, name=video.path.name, state="manual_batch", relative_path=str(video.path.relative_to(root)), size=video.size, batch_id=batch["id"])
+            state.upsert_queue_item(source_type="manual", source_id=source_id, source_path=video.path, name=video.path.name, state="ready", reason="manual batch detected", relative_path=str(video.path.relative_to(root)), size=video.size, batch_id=batch["id"])
         state.remove_missing_manual_items(batch["id"], seen)
 
 
@@ -532,48 +622,50 @@ async def _import_ready_sab_jobs(importer: Importer, force: bool = False) -> int
         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
+        job_id = str(item.get("nzo_id") or item.get("nzoid") or item.get("name") or "")
+        sab_category = str(item.get("category") or item.get("cat") or "")
         for video in scan_videos(readiness.storage):
             if consume_cancel_request():
                 return imported
-            set_current_job(str(video.path))
+            row = 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=sab_category)
-            try:
+            claimed = state.claim_queue_item(row["id"], WORKER_ID, {"ready", "failed", "retrying"})
-                result = importer.import_file(video.path, should_cancel=consume_cancel_request)
+            if claimed is not None:
-                state.add_history(result.source, result.target, "imported", result.bytes)
+                imported += _import_queue_item(claimed, importer, force=force, from_worker=True)
-                state.mark_queue_item("sab", str(video.path), "imported")
-                imported += 1
-            except ImportCancelled:
-                state.add_history(video.path, video.path, "cancelled", 0, "cancelled")
-                state.mark_queue_item("sab", str(video.path), "skipped", "cancelled")
-                return imported
-            except Exception as exc:
-                state.add_history(video.path, video.path, "failed", 0, exc.__class__.__name__)
-                state.mark_queue_item("sab", str(video.path), "failed", exc.__class__.__name__)
-            finally:
-                set_current_job(None)
     return imported
 
 
-def _import_queue_item(item: dict[str, object], importer: Importer) -> int:
+def _import_queue_item(item: dict[str, object], importer: Importer, *, force: bool = False, from_worker: bool = False) -> int:
-    if item["source_type"] not in {"sab", "manual"} or item["state"] not in {"ready", "manual_batch", "failed"}:
+    if item["source_type"] not in {"sab", "manual"} or item["state"] not in {"ready", "manual_batch", "failed", "importing", "retrying", "waiting_for_sab"}:
         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")
+        state.mark_queue_item_result(str(item["source_type"]), str(item["source_id"]), "failed", "missing source path", increment_attempts=True)
         return 0
     source = Path(str(source_path))
-    set_current_job(str(source))
+    if not source.exists():
+        state.mark_queue_item_result(str(item["source_type"]), str(item["source_id"]), "failed", "missing source file", increment_attempts=True)
+        return 0
+    if not from_worker:
+        state.mark_queue_item(str(item["source_type"]), str(item["source_id"]), "importing", item.get("reason"))
+    started = set_current_job(str(source))
     try:
-        result = importer.import_file(source, should_cancel=consume_cancel_request)
+        result = importer.import_file(source, should_cancel=consume_cancel_request, on_progress=lambda copied, total: set_current_job(str(source), bytes_copied=copied, total_bytes=total, started_at=started))
         state.add_history(result.source, result.target, "imported", result.bytes)
-        state.mark_queue_item(str(item["source_type"]), str(item["source_id"]), "imported")
+        state.mark_queue_item_result(str(item["source_type"]), str(item["source_id"]), "imported", increment_attempts=True)
         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")
+        state.mark_queue_item_result(str(item["source_type"]), str(item["source_id"]), "skipped", "cancelled", increment_attempts=True)
         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__)
+        attempts = int(item.get("attempt_count") or 0) + 1
+        if attempts >= MAX_RETRY_ATTEMPTS:
+            state.mark_queue_item_result(str(item["source_type"]), str(item["source_id"]), "failed", exc.__class__.__name__, increment_attempts=True)
+        else:
+            next_state = "retrying" if from_worker or force else "failed"
+            retry_delay = RETRY_DELAY_SECONDS if next_state == "retrying" else None
+            state.mark_queue_item_result(str(item["source_type"]), str(item["source_id"]), next_state, exc.__class__.__name__, increment_attempts=True, next_retry_seconds=retry_delay)
         return 0
     finally:
         set_current_job(None)
@@ -589,26 +681,24 @@ def _import_manual_batches(importer: Importer) -> int:
         for item in items:
             if consume_cancel_request():
                 return imported
-            source = Path(item["source_path"])
+            claimed = state.claim_queue_item(item["id"], WORKER_ID, {"ready", "failed", "retrying"})
-            set_current_job(str(source))
+            if claimed is not None:
-            try:
+                imported += _import_queue_item(claimed, importer, force=True, from_worker=True)
-                result = importer.import_file(source, should_cancel=consume_cancel_request)
+        if not scan_videos(path) and not state.batch_has_active_items(batch["id"]):
-                state.add_history(result.source, result.target, "imported", result.bytes)
-                state.mark_queue_item("manual", item["source_id"], "imported")
-                imported += 1
-            except ImportCancelled:
-                state.add_history(source, source, "cancelled", 0, "cancelled")
-                state.mark_queue_item("manual", item["source_id"], "skipped", "cancelled")
-                return imported
-            except Exception as exc:
-                state.add_history(source, source, "failed", 0, exc.__class__.__name__)
-                state.mark_queue_item("manual", item["source_id"], "failed", exc.__class__.__name__)
-            finally:
-                set_current_job(None)
-        if not scan_videos(path):
             state.complete_manual_batch(batch["id"])
     return imported
 
 
+@app.on_event("startup")
+def startup_queue_worker() -> None:
+    ensure_worker_running()
+
+
+@app.on_event("shutdown")
+def shutdown_queue_worker() -> None:
+    if stop_worker(wait=True):
+        state.release_stale_claims()
+
+
 def run() -> None:
     uvicorn.run("importarr.main:app", host=settings.bind_host, port=settings.bind_port, reload=False)

importarr/state.py

@@ -1,19 +1,35 @@
 from __future__ import annotations
 
 import sqlite3
+import threading
 from pathlib import Path
 from typing import Any
 
 
+ACTIVE_QUEUE_STATES = {
+    "detected",
+    "waiting_for_sab",
+    "ready",
+    "importing",
+    "retrying",
+}
+
+TERMINAL_QUEUE_STATES = {"imported", "failed", "skipped"}
+
+
 class State:
     def __init__(self, path: Path):
         self.path = path
         self.path.parent.mkdir(parents=True, exist_ok=True)
+        self._lock = threading.RLock()
         self.conn = sqlite3.connect(self.path, check_same_thread=False)
         self.conn.row_factory = sqlite3.Row
+        self.conn.execute("pragma journal_mode=WAL")
+        self.conn.execute("pragma busy_timeout = 5000")
         self.migrate()
 
     def migrate(self) -> None:
+        with self._lock:
             self.conn.executescript(
                 """
             create table if not exists manual_batches (
@@ -47,6 +63,11 @@ class State:
               batch_id integer,
               job_id text,
               sab_category text,
+              attempt_count integer not null default 0,
+              next_retry_at text,
+              last_error text,
+              claimed_by text,
+              claimed_at text,
               first_seen_at text not null default current_timestamp,
               updated_at text not null default current_timestamp,
               completed_at text,
@@ -57,13 +78,25 @@ 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")
+            if "attempt_count" not in columns:
+                self.conn.execute("alter table import_queue_items add column attempt_count integer not null default 0")
+            if "next_retry_at" not in columns:
+                self.conn.execute("alter table import_queue_items add column next_retry_at text")
+            if "last_error" not in columns:
+                self.conn.execute("alter table import_queue_items add column last_error text")
+            if "claimed_by" not in columns:
+                self.conn.execute("alter table import_queue_items add column claimed_by text")
+            if "claimed_at" not in columns:
+                self.conn.execute("alter table import_queue_items add column claimed_at text")
             self.conn.commit()
 
     def get_app_state(self, key: str, default: str | None = None) -> str | None:
+        with self._lock:
             row = self.conn.execute("select value from app_state where key = ?", (key,)).fetchone()
             return row["value"] if row else default
 
     def set_app_state(self, key: str, value: str) -> None:
+        with self._lock:
             self.conn.execute(
                 "insert into app_state(key, value) values (?, ?) on conflict(key) do update set value=excluded.value",
                 (key, value),
@@ -71,11 +104,13 @@ class State:
             self.conn.commit()
 
     def add_manual_batch(self, path: Path) -> dict[str, Any]:
+        with self._lock:
             self.conn.execute("insert or ignore into manual_batches(path) values (?)", (str(path),))
             self.conn.commit()
         return self.get_manual_batch_by_path(path)
 
     def get_manual_batch_by_path(self, path: Path) -> dict[str, Any]:
+        with self._lock:
             row = self.conn.execute("select * from manual_batches where path = ?", (str(path),)).fetchone()
             return dict(row)
 
@@ -84,18 +119,22 @@ class State:
         if active_only:
             sql += " where status = 'active'"
         sql += " order by created_at desc"
+        with self._lock:
             return [dict(row) for row in self.conn.execute(sql)]
 
     def delete_manual_batch(self, batch_id: int) -> None:
+        with self._lock:
             self.conn.execute("delete from manual_batches where id = ?", (batch_id,))
             self.conn.execute("delete from import_queue_items where batch_id = ? and source_type = 'manual'", (batch_id,))
             self.conn.commit()
 
     def complete_manual_batch(self, batch_id: int) -> None:
+        with self._lock:
             self.conn.execute("update manual_batches set status='completed', completed_at=current_timestamp where id=?", (batch_id,))
             self.conn.commit()
 
     def add_history(self, source: Path, target: Path, status: str, bytes_count: int = 0, error: str | None = None) -> None:
+        with self._lock:
             self.conn.execute(
                 "insert into import_history(source,target,status,bytes,error,completed_at) values (?,?,?,?,?,case when ? in ('imported','failed') then current_timestamp else null end)",
                 (str(source), str(target), status, bytes_count, error, status),
@@ -116,7 +155,9 @@ class State:
         batch_id: int | None = None,
         job_id: str | None = None,
         sab_category: str | None = None,
+        preserve_finished_state: bool = True,
     ) -> dict[str, Any]:
+        with self._lock:
             self.conn.execute(
                 """
             insert into import_queue_items(source_type, source_id, source_path, name, state, reason, relative_path, size, batch_id, job_id, sab_category)
@@ -124,35 +165,140 @@ class State:
             on conflict(source_type, source_id) do update set
               source_path=excluded.source_path,
               name=excluded.name,
-              state=excluded.state,
+              state=case
-              reason=excluded.reason,
+                when ? and import_queue_items.state in ('imported','failed','skipped','importing','retrying') then import_queue_items.state
+                else excluded.state
+              end,
+              reason=case
+                when ? and import_queue_items.state in ('imported','failed','skipped','importing','retrying') then coalesce(import_queue_items.reason, excluded.reason)
+                else excluded.reason
+              end,
               relative_path=excluded.relative_path,
               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
+              next_retry_at=case
+                when excluded.state = 'retrying' then coalesce(import_queue_items.next_retry_at, excluded.next_retry_at)
+                when excluded.state = 'ready' then null
+                else import_queue_items.next_retry_at
+              end,
+              completed_at=case
+                when ? and import_queue_items.state in ('imported','failed','skipped') then import_queue_items.completed_at
+                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, sab_category),
+            (source_type, source_id, str(source_path) if source_path else None, name, state, reason, relative_path, size, batch_id, job_id, sab_category, preserve_finished_state, preserve_finished_state, preserve_finished_state),
             )
             self.conn.commit()
             row = self.conn.execute("select * from import_queue_items where source_type = ? and source_id = ?", (source_type, source_id)).fetchone()
             return dict(row)
 
     def mark_queue_item(self, source_type: str, source_id: str, state: str, reason: str | None = None) -> None:
+        with self._lock:
             self.conn.execute(
-            "update import_queue_items set state=?, reason=?, updated_at=current_timestamp, completed_at=case when ? in ('imported','failed','skipped') then current_timestamp else completed_at end where source_type=? and source_id=?",
+                "update import_queue_items set state=?, reason=?, updated_at=current_timestamp, claimed_by=null, claimed_at=null, next_retry_at=case when ?='ready' then null else next_retry_at end, completed_at=case when ? in ('imported','failed','skipped') then current_timestamp else completed_at end where source_type=? and source_id=?",
-            (state, reason, state, source_type, source_id),
+                (state, reason, state, state, source_type, source_id),
+            )
+            self.conn.commit()
+
+    def claim_next_queue_item(self, worker_id: str) -> dict[str, Any] | None:
+        with self._lock:
+            row = self.conn.execute(
+                """
+                update import_queue_items
+                set state='importing', claimed_by=?, claimed_at=current_timestamp, updated_at=current_timestamp
+                where id = (
+                  select id from import_queue_items
+                  where claimed_by is null
+                    and (state = 'ready' or (state = 'retrying' and (next_retry_at is null or next_retry_at <= current_timestamp)))
+                  order by case state when 'ready' then 0 else 1 end, updated_at asc, id asc
+                  limit 1
+                ) and claimed_by is null
+                returning *
+                """,
+                (worker_id,),
+            ).fetchone()
+            self.conn.commit()
+            return dict(row) if row else None
+
+    def release_stale_claims(self) -> int:
+        with self._lock:
+            cursor = self.conn.execute(
+                "update import_queue_items set state='retrying', claimed_by=null, claimed_at=null, updated_at=current_timestamp where state='importing'"
+            )
+            self.conn.commit()
+            return cursor.rowcount
+
+    def claim_queue_item(self, item_id: int, worker_id: str, allowed_states: set[str]) -> dict[str, Any] | None:
+        placeholders = ",".join("?" for _ in allowed_states)
+        with self._lock:
+            row = self.conn.execute(
+                f"update import_queue_items set state='importing', claimed_by=?, claimed_at=current_timestamp, updated_at=current_timestamp where id=? and state in ({placeholders}) and claimed_by is null returning *",
+                (worker_id, item_id, *allowed_states),
+            ).fetchone()
+            self.conn.commit()
+            return dict(row) if row else None
+
+    def transition_queue_item_if_unclaimed(self, item_id: int, allowed_states: set[str], new_state: str, reason: str) -> bool:
+        placeholders = ",".join("?" for _ in allowed_states)
+        with self._lock:
+            cursor = self.conn.execute(
+                f"update import_queue_items set state=?, reason=?, updated_at=current_timestamp, next_retry_at=null, completed_at=case when ? in ('failed','skipped') then current_timestamp else null end where id=? and state in ({placeholders}) and claimed_by is null",
+                (new_state, reason, new_state, item_id, *allowed_states),
+            )
+            self.conn.commit()
+            return cursor.rowcount > 0
+
+    def mark_queue_item_result(
+        self,
+        source_type: str,
+        source_id: str,
+        state: str,
+        reason: str | None = None,
+        *,
+        increment_attempts: bool = False,
+        next_retry_seconds: int | None = None,
+    ) -> None:
+        with self._lock:
+            self.conn.execute(
+                """
+            update import_queue_items
+            set state=?,
+                reason=?,
+                last_error=case when ? in ('failed','retrying','skipped') then ? else null end,
+                attempt_count=attempt_count + ?,
+                next_retry_at=case
+                  when ? = 'retrying' and ? is not null then datetime('now', '+' || ? || ' seconds')
+                  when ? in ('ready','imported','failed','skipped') then null
+                  else next_retry_at
+                end,
+                claimed_by=null,
+                claimed_at=null,
+                updated_at=current_timestamp,
+                completed_at=case when ? in ('imported','failed','skipped') then current_timestamp else null end
+            where source_type=? and source_id=?
+            """,
+                (state, reason, state, reason, 1 if increment_attempts else 0, state, next_retry_seconds, next_retry_seconds, state, state, source_type, source_id),
             )
             self.conn.commit()
 
     def delete_queue_item(self, item_id: int) -> bool:
+        with self._lock:
             cursor = self.conn.execute("delete from import_queue_items where id = ?", (item_id,))
             self.conn.commit()
             return cursor.rowcount > 0
 
+    def delete_queue_item_if_unclaimed(self, item_id: int) -> bool:
+        with self._lock:
+            cursor = self.conn.execute("delete from import_queue_items where id = ? and claimed_by is null", (item_id,))
+            self.conn.commit()
+            return cursor.rowcount > 0
+
     def delete_queue_items_by_state(self, source_type: str, state: str, reason: str | None = None) -> int:
+        with self._lock:
             if reason is None:
                 cursor = self.conn.execute("delete from import_queue_items where source_type = ? and state = ?", (source_type, state))
             else:
@@ -161,22 +307,34 @@ class State:
             return cursor.rowcount
 
     def get_queue_item(self, item_id: int) -> dict[str, Any] | None:
+        with self._lock:
             row = self.conn.execute("select * from import_queue_items where id = ?", (item_id,)).fetchone()
             return dict(row) if row else None
 
     def remove_missing_manual_items(self, batch_id: int, source_ids: set[str]) -> None:
-        rows = self.conn.execute("select source_id from import_queue_items where source_type='manual' and batch_id=?", (batch_id,)).fetchall()
+        with self._lock:
+            rows = self.conn.execute("select source_id, state, claimed_by from import_queue_items where source_type='manual' and batch_id=?", (batch_id,)).fetchall()
             for row in rows:
-            if row["source_id"] not in source_ids:
+                if row["source_id"] not in source_ids and row["state"] not in TERMINAL_QUEUE_STATES and not row["claimed_by"]:
-                self.conn.execute("delete from import_queue_items where source_type='manual' and source_id=?", (row["source_id"],))
+                    self.conn.execute("delete from import_queue_items where source_type='manual' and source_id=? and claimed_by is null", (row["source_id"],))
             self.conn.commit()
 
+    def batch_has_active_items(self, batch_id: int) -> bool:
+        with self._lock:
+            row = self.conn.execute(
+                "select 1 from import_queue_items where batch_id = ? and source_type='manual' and state not in ('imported','failed','skipped') limit 1",
+                (batch_id,),
+            ).fetchone()
+            return row is not None
+
     def list_queue_items(self, active_only: bool = True) -> list[dict[str, Any]]:
         sql = "select * from import_queue_items"
         if active_only:
             sql += " where state not in ('imported','failed','skipped')"
         sql += " order by updated_at desc, id desc"
+        with self._lock:
             return [dict(row) for row in self.conn.execute(sql)]
 
     def list_history(self, limit: int = 100) -> list[dict[str, Any]]:
+        with self._lock:
             return [dict(row) for row in self.conn.execute("select * from import_history order by id desc limit ?", (limit,))]

importarr/static/index.html

@@ -0,0 +1,12 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="theme-color" content="#252B42" />
+    <title>Importarr</title>
+    <script type="module" crossorigin src="/static/assets/app.js"></script>
+    <link rel="stylesheet" crossorigin href="/static/assets/app.css">
+  </head>
+  <body><div id="root"></div></body>
+</html>

importarr/templates/index.html

@@ -1,132 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>📥 - idle · Importarr {{ status.build.version }}</title>
-  <link rel="stylesheet" href="/static/importarr.css">
-</head>
-<body>
-  <header class="topbar">
-    <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="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>
-    <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>
-        <dt>Build date</dt><dd>{{ status.build.build_date }}</dd>
-        <dt>Git SHA</dt><dd>{{ status.build.git_sha }}</dd>
-        <dt>Started</dt><dd>{{ status.build.started_at }}</dd>
-        <dt>Python</dt><dd>{{ status.build.python }}</dd>
-        <dt>SAB URL</dt><dd>{{ status.sab_url }}</dd>
-        <dt>SAB API token</dt><dd id="sab-token-status">{{ 'configured' if status.sab_api_key_configured else 'not configured' }}</dd>
-        <dt>Radarr</dt><dd>{{ status.radarr_url or 'not configured' }}</dd>
-        <dt>Sonarr</dt><dd>{{ status.sonarr_url or 'not configured' }}</dd>
-        <dt>Download root</dt><dd>{{ status.download_root }}</dd>
-        <dt>Movies root</dt><dd>{{ status.movies_root }}</dd>
-        <dt>TV root</dt><dd>{{ status.tv_root }}</dd>
-        <dt>Write auth</dt><dd>{{ 'enabled' if status.auth_enabled else 'disabled' }}</dd>
-        <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>
-    </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>
-        <button type="button" data-control="pause">Pause</button>
-        <button type="button" data-control="stop">Stop</button>
-        <button type="button" data-control="cancel-current" class="danger">Cancel current job</button>
-      </div>
-    </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>
-      <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></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>
-  <dialog id="settings-dialog">
-    <form id="settings-form" method="dialog">
-      <div class="section-title"><h2>Settings</h2><button type="button" id="close-settings">Close</button></div>
-      <fieldset>
-        <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>
-    </form>
-  </dialog>
-  <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_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());
-  document.getElementById('batch-picker').addEventListener('change',e=>{ const f=e.target.files[0]; if(!f)return; const top=(f.webkitRelativePath||'').split('/')[0]; if(top) document.querySelector('#batch-form [name="path"]').value=top; });
-  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>
-</body>
-</html>

pyproject.toml

@@ -12,7 +12,6 @@ license = "MIT"
 dependencies = [
   "fastapi>=0.111",
   "httpx>=0.27",
-  "jinja2>=3.1",
   "pydantic>=2.7",
   "uvicorn[standard]>=0.30",
 ]

tests/test_manual_batches.py

@@ -48,7 +48,7 @@ def test_manual_queue_items_are_persisted_and_imported(tmp_path, monkeypatch):
     queued = main.state.list_queue_items()
     assert len(queued) == 1
     assert queued[0]["source_type"] == "manual"
-    assert queued[0]["state"] == "manual_batch"
+    assert queued[0]["state"] == "ready"
 
     assert main._import_manual_batches(main.Importer(movies, tv)) == 1
     assert main.state.list_queue_items() == []

tests/test_queue_controls.py

@@ -1,3 +1,6 @@
+import asyncio
+import threading
+
 from importarr.config import Settings
 from importarr.state import State
 
@@ -42,6 +45,57 @@ def test_start_reenables_manual_queue_sync(tmp_path, monkeypatch):
     assert len(main.state.list_queue_items()) == 1
 
 
+def test_default_control_commands_target_manual_import_service(monkeypatch):
+    monkeypatch.delenv("IMPORTARR_START_COMMAND", raising=False)
+    monkeypatch.delenv("IMPORTARR_STOP_COMMAND", raising=False)
+    monkeypatch.delenv("IMPORTARR_RESTART_COMMAND", raising=False)
+
+    settings = Settings.from_env()
+
+    assert settings.start_command == ["systemctl", "start", "manual-media-import.service"]
+    assert settings.stop_command == ["systemctl", "stop", "manual-media-import.service"]
+    assert settings.restart_command == ["systemctl", "restart", "manual-media-import.service"]
+
+
+def test_start_control_starts_manual_import_service(tmp_path, monkeypatch):
+    main, _download, _movies, _tv = configure_main(tmp_path, monkeypatch)
+    main.settings.start_command = ["systemctl", "start", "manual-media-import.service"]
+
+    calls = []
+
+    def fake_run(command, **kwargs):
+        calls.append(command)
+        return main.subprocess.CompletedProcess(command, 0, stdout="started", stderr="")
+
+    monkeypatch.setattr(main.subprocess, "run", fake_run)
+
+    result = main.start_queue()
+
+    assert result["control"]["queue_mode"] == "running"
+    assert result["command_result"]["command"] == ["systemctl", "start", "manual-media-import.service"]
+    assert calls == [["systemctl", "start", "manual-media-import.service"]]
+
+
+def test_stop_control_stops_manual_import_service(tmp_path, monkeypatch):
+    main, _download, _movies, _tv = configure_main(tmp_path, monkeypatch)
+    main.settings.stop_command = ["systemctl", "stop", "manual-media-import.service"]
+
+    calls = []
+
+    def fake_run(command, **kwargs):
+        calls.append(command)
+        return main.subprocess.CompletedProcess(command, 0, stdout="stopped", stderr="")
+
+    monkeypatch.setattr(main.subprocess, "run", fake_run)
+
+    result = main.stop_queue()
+
+    assert result["control"]["queue_mode"] == "stopped"
+    assert result["control"]["cancel_requested"] is True
+    assert result["command_result"]["command"] == ["systemctl", "stop", "manual-media-import.service"]
+    assert calls == [["systemctl", "stop", "manual-media-import.service"]]
+
+
 def test_queue_jobs_include_groups_and_manual_context(tmp_path, monkeypatch):
     main, download, _movies, _tv = configure_main(tmp_path, monkeypatch)
     batch = download / "Release" / "Season 1"
@@ -55,6 +109,7 @@ def test_queue_jobs_include_groups_and_manual_context(tmp_path, monkeypatch):
     assert jobs[0]["group"] == "manual_batch"
     assert jobs[0]["relative_path"] == "Release/Season 1/Episode.mkv"
     assert jobs[0]["can_run_now"] is True
+    assert jobs[0]["state"] == "ready"
 
 
 def test_queue_item_retry_ignore_and_remove_actions(tmp_path, monkeypatch):
@@ -81,8 +136,8 @@ def test_queue_item_run_now_imports_only_selected_item(tmp_path, monkeypatch):
     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")
+    selected_row = main.state.upsert_queue_item(source_type="manual", source_id=str(selected), source_path=selected, name=selected.name, state="ready")
-    main.state.upsert_queue_item(source_type="manual", source_id=str(waiting), source_path=waiting, name=waiting.name, state="manual_batch")
+    main.state.upsert_queue_item(source_type="manual", source_id=str(waiting), source_path=waiting, name=waiting.name, state="ready")
 
     result = main.queue_item_action(selected_row["id"], main.QueueItemActionRequest(action="run-now"))
 
@@ -92,7 +147,21 @@ def test_queue_item_run_now_imports_only_selected_item(tmp_path, monkeypatch):
     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"
+    assert rows["Waiting.mkv"]["state"] == "ready"
+
+
+def test_current_job_status_includes_progress(tmp_path, monkeypatch):
+    main, _download, _movies, _tv = configure_main(tmp_path, monkeypatch)
+    monkeypatch.setattr(main.time, "time", lambda: 110.0)
+
+    main.set_current_job("Movie.mkv", bytes_copied=50, total_bytes=200, started_at=100.0)
+
+    current = main.control_status()["current"]
+    assert current["file"] == "Movie.mkv"
+    assert current["bytes_copied"] == 50
+    assert current["total_bytes"] == 200
+    assert current["percent"] == 25
+    assert current["elapsed_seconds"] == 10
 
 
 def test_cancel_current_stops_before_next_manual_item(tmp_path, monkeypatch):
@@ -133,6 +202,257 @@ def test_cancel_current_stops_active_copy(tmp_path, monkeypatch):
     assert main.state.list_queue_items(active_only=False)[0]["state"] == "skipped"
 
 
+def test_status_includes_queue_counts(tmp_path, monkeypatch):
+    main, _download, _movies, _tv = configure_main(tmp_path, monkeypatch)
+    main.state.upsert_queue_item(source_type="manual", source_id="a", name="A.mkv", state="ready")
+    main.state.upsert_queue_item(source_type="manual", source_id="b", name="B.mkv", state="failed")
+
+    status = main.status()
+
+    assert status["queue_total"] == 2
+    assert status["queue_counts"]["ready"] == 1
+    assert status["queue_counts"]["failed"] == 1
+
+
+def test_worker_claimed_failure_retries_item(tmp_path, monkeypatch):
+    main, download, movies, tv = configure_main(tmp_path, monkeypatch)
+    batch = download / "Release"
+    batch.mkdir(parents=True)
+    source = batch / "A.mkv"
+    source.write_bytes(b"a")
+    row = main.state.upsert_queue_item(source_type="manual", source_id=str(source), source_path=source, name=source.name, state="ready")
+    claimed = main.state.claim_next_queue_item(main.WORKER_ID)
+
+    class BrokenImporter:
+        def import_file(self, *args, **kwargs):
+            raise RuntimeError("boom")
+
+    imported = main._import_queue_item(claimed, BrokenImporter(), from_worker=True)
+    updated = main.state.get_queue_item(row["id"])
+
+    assert imported == 0
+    assert updated["state"] == "retrying"
+    assert updated["attempt_count"] == 1
+    assert updated["next_retry_at"] is not None
+
+
+def test_startup_releases_stale_claims_from_previous_worker(tmp_path, monkeypatch):
+    main, _download, _movies, _tv = configure_main(tmp_path, monkeypatch)
+    row = main.state.upsert_queue_item(source_type="manual", source_id="a", name="A.mkv", state="ready")
+    main.state.claim_queue_item(row["id"], "old-worker", {"ready"})
+
+    main.ensure_worker_running()
+    updated = main.state.get_queue_item(row["id"])
+    main.stop_worker()
+
+    assert updated["state"] == "retrying"
+    assert updated["claimed_by"] is None
+
+
+def test_run_now_conflicts_when_item_is_claimed(tmp_path, monkeypatch):
+    main, _download, _movies, _tv = configure_main(tmp_path, monkeypatch)
+    row = main.state.upsert_queue_item(source_type="manual", source_id="a", name="A.mkv", state="ready")
+    main.state.claim_queue_item(row["id"], "other-worker", {"ready"})
+
+    try:
+        main.queue_item_action(row["id"], main.QueueItemActionRequest(action="run-now"))
+    except main.HTTPException as exc:
+        assert exc.status_code == 409
+    else:
+        raise AssertionError("expected HTTPException")
+
+
+def test_bulk_run_now_skips_item_claimed_by_worker(tmp_path, monkeypatch):
+    main, download, movies, tv = configure_main(tmp_path, monkeypatch)
+    batch = download / "Release"
+    batch.mkdir(parents=True)
+    source = batch / "A.mkv"
+    source.write_bytes(b"a")
+    created_batch = main.state.add_manual_batch(batch)
+    row = main.state.upsert_queue_item(source_type="manual", source_id=str(source), source_path=source, name=source.name, state="ready", batch_id=created_batch["id"])
+    main.state.claim_queue_item(row["id"], "worker", {"ready"})
+
+    assert main._import_manual_batches(main.Importer(movies, tv)) == 0
+    assert source.exists()
+    assert main.state.get_queue_item(row["id"])["claimed_by"] == "worker"
+
+
+def test_retry_loses_atomic_race_with_worker_claim(tmp_path, monkeypatch):
+    main, _download, _movies, _tv = configure_main(tmp_path, monkeypatch)
+    row = main.state.upsert_queue_item(source_type="manual", source_id="a", name="A.mkv", state="failed")
+    original = main.state.transition_queue_item_if_unclaimed
+
+    def claim_then_transition(*args, **kwargs):
+        main.state.claim_queue_item(row["id"], "worker", {"failed"})
+        return original(*args, **kwargs)
+
+    monkeypatch.setattr(main.state, "transition_queue_item_if_unclaimed", claim_then_transition)
+
+    try:
+        main.queue_item_action(row["id"], main.QueueItemActionRequest(action="retry"))
+    except main.HTTPException as exc:
+        assert exc.status_code == 409
+    else:
+        raise AssertionError("expected HTTPException")
+    assert main.state.get_queue_item(row["id"])["claimed_by"] == "worker"
+
+
+def test_ignore_loses_atomic_race_with_worker_claim(tmp_path, monkeypatch):
+    main, _download, _movies, _tv = configure_main(tmp_path, monkeypatch)
+    row = main.state.upsert_queue_item(source_type="manual", source_id="a", name="A.mkv", state="ready")
+    original = main.state.transition_queue_item_if_unclaimed
+
+    def claim_then_transition(*args, **kwargs):
+        main.state.claim_queue_item(row["id"], "worker", {"ready"})
+        return original(*args, **kwargs)
+
+    monkeypatch.setattr(main.state, "transition_queue_item_if_unclaimed", claim_then_transition)
+
+    try:
+        main.queue_item_action(row["id"], main.QueueItemActionRequest(action="ignore"))
+    except main.HTTPException as exc:
+        assert exc.status_code == 409
+    else:
+        raise AssertionError("expected HTTPException")
+    assert main.state.get_queue_item(row["id"])["claimed_by"] == "worker"
+
+
+def test_shutdown_timeout_does_not_release_live_worker_claim(tmp_path, monkeypatch):
+    main, download, _movies, _tv = configure_main(tmp_path, monkeypatch)
+    source = download / "A.mkv"
+    source.parent.mkdir(parents=True)
+    source.write_bytes(b"a")
+    row = main.state.upsert_queue_item(source_type="manual", source_id=str(source), source_path=source, name=source.name, state="ready")
+    started = threading.Event()
+    finish = threading.Event()
+
+    class BlockingImporter:
+        def import_file(self, *args, **kwargs):
+            started.set()
+            finish.wait()
+            raise RuntimeError("stopped")
+
+    def active_worker():
+        claimed = main.state.claim_queue_item(row["id"], main.WORKER_ID, {"ready"})
+        main._import_queue_item(claimed, BlockingImporter(), from_worker=True)
+
+    worker = threading.Thread(target=active_worker)
+    monkeypatch.setattr(main, "_worker_thread", worker)
+    monkeypatch.setattr(main, "WORKER_SHUTDOWN_TIMEOUT_SECONDS", 0.01)
+    worker.start()
+    assert started.wait(1)
+
+    main.shutdown_queue_worker()
+
+    assert worker.is_alive()
+    assert main.state.get_queue_item(row["id"])["claimed_by"] == main.WORKER_ID
+
+    finish.set()
+    worker.join(1)
+    assert not worker.is_alive()
+    assert main.state.get_queue_item(row["id"])["claimed_by"] is None
+
+
+def test_manual_sync_preserves_claim_after_source_is_unlinked(tmp_path, monkeypatch):
+    main, download, _movies, _tv = configure_main(tmp_path, monkeypatch)
+    batch = download / "Release"
+    batch.mkdir(parents=True)
+    source = batch / "A.mkv"
+    source.write_bytes(b"a")
+    created_batch = main.state.add_manual_batch(batch)
+    row = main.state.upsert_queue_item(source_type="manual", source_id=str(source), source_path=source, name=source.name, state="ready", batch_id=created_batch["id"])
+    main.state.claim_queue_item(row["id"], main.WORKER_ID, {"ready"})
+
+    source.unlink()
+    main.sync_manual_queue()
+
+    preserved = main.state.get_queue_item(row["id"])
+    assert preserved["state"] == "importing"
+    assert preserved["claimed_by"] == main.WORKER_ID
+
+
+def test_bulk_sab_import_preserves_job_metadata(tmp_path, monkeypatch):
+    main, download, movies, tv = configure_main(tmp_path, monkeypatch)
+    release = download / "Release"
+    release.mkdir(parents=True)
+    source = release / "Movie.mkv"
+    source.write_bytes(b"movie")
+
+    class FakeSabnzbdClient:
+        def __init__(self, *args, **kwargs):
+            pass
+
+        async def active_nzo_ids(self):
+            return set()
+
+        async def history(self):
+            return {"history": {"slots": [{"nzo_id": "SAB-123", "name": "Release", "category": "manual", "status": "Completed", "storage": str(release)}]}}
+
+    monkeypatch.setattr(main, "SabnzbdClient", FakeSabnzbdClient)
+
+    assert asyncio.run(main._import_ready_sab_jobs(main.Importer(movies, tv))) == 1
+    row = main.state.list_queue_items(active_only=False)[0]
+    assert row["job_id"] == "SAB-123"
+    assert row["sab_category"] == "manual"
+
+
+def test_remove_conflicts_when_item_is_claimed(tmp_path, monkeypatch):
+    main, _download, _movies, _tv = configure_main(tmp_path, monkeypatch)
+    row = main.state.upsert_queue_item(source_type="manual", source_id="a", name="A.mkv", state="ready")
+    main.state.claim_queue_item(row["id"], "other-worker", {"ready"})
+
+    try:
+        main.queue_item_action(row["id"], main.QueueItemActionRequest(action="remove"))
+    except main.HTTPException as exc:
+        assert exc.status_code == 409
+    else:
+        raise AssertionError("expected HTTPException")
+
+
+def test_manual_import_completion_persists_completed_row_and_batch_completion(tmp_path, monkeypatch):
+    main, download, movies, tv = configure_main(tmp_path, monkeypatch)
+    batch = download / "Release"
+    batch.mkdir(parents=True)
+    source = batch / "Done.mkv"
+    source.write_bytes(b"done")
+    created_batch = main.state.add_manual_batch(batch)
+
+    imported = main._import_manual_batches(main.Importer(movies, tv))
+    main.sync_manual_queue()
+
+    assert imported == 1
+    rows = {row["name"]: row for row in main.state.list_queue_items(active_only=False)}
+    assert rows["Done.mkv"]["state"] == "imported"
+    assert main.state.get_queue_item(rows["Done.mkv"]["id"])["state"] == "imported"
+    batch_row = next(batch for batch in main.state.list_manual_batches() if batch["id"] == created_batch["id"])
+    assert batch_row["status"] == "completed"
+
+
+def test_worker_failure_stops_retrying_after_limit(tmp_path, monkeypatch):
+    main, download, _movies, _tv = configure_main(tmp_path, monkeypatch)
+    batch = download / "Release"
+    batch.mkdir(parents=True)
+    source = batch / "A.mkv"
+    source.write_bytes(b"a")
+    row = main.state.upsert_queue_item(source_type="manual", source_id=str(source), source_path=source, name=source.name, state="ready")
+
+    class BrokenImporter:
+        def import_file(self, *args, **kwargs):
+            raise RuntimeError("boom")
+
+    for _ in range(main.MAX_RETRY_ATTEMPTS):
+        claimed = main.state.claim_queue_item(row["id"], main.WORKER_ID, {"ready", "retrying"})
+        assert claimed is not None
+        main._import_queue_item(claimed, BrokenImporter(), from_worker=True)
+        current = main.state.get_queue_item(row["id"])
+        if current["state"] == "retrying":
+            main.state.mark_queue_item("manual", current["source_id"], "ready", "retry window elapsed")
+
+    updated = main.state.get_queue_item(row["id"])
+    assert updated["state"] == "failed"
+    assert updated["attempt_count"] == main.MAX_RETRY_ATTEMPTS
+
+
 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"]

tests/test_state.py

@@ -11,3 +11,69 @@ def test_delete_queue_items_by_state_can_target_reason(tmp_path):
     rows = state.list_queue_items()
     assert len(rows) == 1
     assert rows[0]["source_id"] == "other"
+
+
+def test_upsert_preserves_terminal_state_by_default(tmp_path):
+    state = State(tmp_path / "state.db")
+    state.upsert_queue_item(source_type="manual", source_id="a", name="A.mkv", state="failed", reason="boom")
+
+    updated = state.upsert_queue_item(source_type="manual", source_id="a", name="A.mkv", state="ready", reason="rescanned")
+
+    assert updated["state"] == "failed"
+    assert updated["reason"] == "boom"
+
+
+def test_claim_next_queue_item_marks_importing(tmp_path):
+    state = State(tmp_path / "state.db")
+    state.upsert_queue_item(source_type="manual", source_id="a", name="A.mkv", state="ready")
+
+    row = state.claim_next_queue_item("worker-1")
+
+    assert row is not None
+    assert row["state"] == "importing"
+    assert row["claimed_by"] == "worker-1"
+
+
+def test_release_stale_claims_requeues_importing_items(tmp_path):
+    state = State(tmp_path / "state.db")
+    state.upsert_queue_item(source_type="manual", source_id="a", name="A.mkv", state="ready")
+    state.claim_next_queue_item("worker-1")
+
+    released = state.release_stale_claims()
+    row = state.get_queue_item(1)
+
+    assert released == 1
+    assert row["state"] == "retrying"
+    assert row["claimed_by"] is None
+
+
+def test_claim_queue_item_requires_unclaimed_allowed_state(tmp_path):
+    state = State(tmp_path / "state.db")
+    row = state.upsert_queue_item(source_type="manual", source_id="a", name="A.mkv", state="ready")
+
+    claimed = state.claim_queue_item(row["id"], "worker-1", {"ready"})
+    blocked = state.claim_queue_item(row["id"], "worker-2", {"ready", "importing"})
+
+    assert claimed is not None
+    assert claimed["claimed_by"] == "worker-1"
+    assert blocked is None
+
+
+def test_remove_missing_manual_items_keeps_terminal_rows(tmp_path):
+    state = State(tmp_path / "state.db")
+    state.upsert_queue_item(source_type="manual", source_id="done", name="Done.mkv", state="imported", batch_id=1)
+    state.upsert_queue_item(source_type="manual", source_id="pending", name="Pending.mkv", state="ready", batch_id=1)
+
+    state.remove_missing_manual_items(1, set())
+
+    rows = {row["source_id"]: row for row in state.list_queue_items(active_only=False)}
+    assert "done" in rows
+    assert "pending" not in rows
+
+
+def test_retry_item_respects_next_retry_at(tmp_path):
+    state = State(tmp_path / "state.db")
+    state.upsert_queue_item(source_type="manual", source_id="a", name="A.mkv", state="ready")
+    state.mark_queue_item_result("manual", "a", "retrying", "boom", increment_attempts=True, next_retry_seconds=60)
+
+    assert state.claim_next_queue_item("worker-1") is None

tests/test_status.py

@@ -33,7 +33,7 @@ def test_status_contains_service_configuration(tmp_path, monkeypatch):
     assert "auth_enabled" in payload
 
 
-def test_index_renders_queue_controls(tmp_path, monkeypatch):
+def test_index_serves_react_application(tmp_path, monkeypatch):
     monkeypatch.setenv("IMPORTARR_STATE_PATH", str(tmp_path / "state.db"))
     import importarr.main as main
 
@@ -42,83 +42,31 @@ def test_index_renders_queue_controls(tmp_path, monkeypatch):
     response = TestClient(main.app).get("/")
 
     assert response.status_code == 200
-    assert "Queue controls" in response.text
+    assert '<div id="root"></div>' in response.text
-    assert "cancel-current" in response.text
+    assert '/static/assets/app.js' in response.text
+    assert '/static/assets/app.css' in response.text
 
 
-def test_index_packs_secondary_controls_into_menu(tmp_path, monkeypatch):
+def test_frontend_uses_required_stack_and_capabilities():
-    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
-
-    from fastapi.testclient import TestClient
-
-    response = TestClient(main.app).get("/")
-
-    assert response.status_code == 200
-    assert "settings-dialog" in response.text
-    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()
+    app = Path("frontend/src/main.jsx").read_text()
+    package = Path("frontend/package.json").read_text()
 
-    assert "@media (max-width:640px)" in css
+    assert "lucide-react" in package
-    assert ".table-scroll" in css
+    assert "@radix-ui/react-dialog" in package
-    assert "overflow-x:auto" in css
+    assert "tailwindcss" in package
-    assert "flex-direction:column" in css
+    for endpoint in ("/api/jobs", "/api/settings", "/api/manual-batches", "/api/control/update", "/api/import/run-now"):
-    assert ".jobs-table{display:none}" in css
+        assert endpoint in app
-    assert ".job-cards{display:block}" in css
+
-    assert "word-break:break-word" in css
+
-    assert "max-width:1280px" in css
+def test_frontend_defines_exact_light_and_dark_tokens():
-    assert ".jobs-table table{table-layout:fixed;min-width:0}" in css
+    from pathlib import Path
-    assert ".jobs-table th:nth-child(1){width:66%}" in css
+
-    assert ".row-actions button{width:1.85rem" in css
+    css = Path("frontend/src/globals.css").read_text()
-    assert ".summary-strip" in css
+    for value in ("#F8FAFC", "#FFFFFF", "#4A43EC", "#7171FF", "#2AD1ED", "#1A1D2E", "#64748B", "#E2E8F0", "#252B42", "#303753", "#23283B", "#42ECF5", "#8B95B7", "#3D4668"):
-    assert ".menu-panel" in css
+        assert value in css
-    assert "@media (prefers-color-scheme:dark)" in css
+    assert ".dark" in css
-    assert "--primary:#4b42b8" in css
-    assert "--cyan:#50dce5" in css
 
 
 def test_settings_endpoint_persists_arr_connection_values(tmp_path, monkeypatch):