diff --git a/SAVEPOINT.md b/SAVEPOINT.md index 345929e..2466485 100644 --- a/SAVEPOINT.md +++ b/SAVEPOINT.md @@ -2,55 +2,28 @@ ## Aktueller Stand -**v1.1 — Etappe 2 in Arbeit (21.07.2026).** +**v1.2 — UI läuft! (21.07.2026).** -Ripping-Pipeline implementiert: -- ✅ DockerfileWorker erweitert: abcde, flac, ffmpeg, handbrake-cli -- ✅ ripping.py: Ripping-Module für DVD/Blu-ray mit HandBrake -- ✅ tasks.py: Disc-Typ-Erkennung + passendes Ripping-Modul -- ✅ Output-Verzeichnis: /output/// -- ✅ Commit: `9e73d06` — Etappe 2: Ripping-Pipeline — Erste Implementierung -- ✅ Commit: `42f19a0` — ripping.py: HandBrakeCLI-Check + Typ-Erkennung -- ✅ Commit: `90e6f81` — tasks.py: detect_disc_type wieder importieren - -### Arcane VM (192.168.178.162) - -- **Arcane WebUI:** http://192.168.178.162:3552 -- **Docker:** Installiert und läuft -- **Projects Directory:** /home/arcane/projects -- **Status:** Bereit für Git Sync Import - -### Git Sync Konfiguration für Arcane - -| Einstellung | Wert | -|-------------|------| -| Repository URL | `https://git.tobisniceshomelab.ddnsfree.com/Hitonabi/rippy.git` | -| Branch | `main` | -| Compose File Path | `docker-compose.yml` | -| Sync Name | `rippy` | - -**WICHTIG:** Deaktiviere "Sync sibling files" (Bug #2978)! +Rippy läuft auf Arcane VM (192.168.178.162): +- ✅ Arcane WebUI: http://192.168.178.162:3552 +- ✅ Rippy UI: http://192.168.178.162:80 +- ✅ Rippy API: http://192.168.178.162:8000 +- ✅ Git Sync in Arcane konfiguriert +- ✅ Commit: `25cba0e` — UI: Port 80 + lucide-react ### Docker-Container -| Container | Port | Beschreibung | -|-----------|------|--------------| -| rippy-api | 8000 | FastAPI-Backend | -| rippy-worker | - | Celery-Worker (mit HandBrake) | -| rippy-ui | 80 | React-UI (Vite) | -| rippy-postgres | 5432 | PostgreSQL-Datenbank | -| rippy-redis | 6379 | Redis (mit AOF-Persistence) | - -### Ripping-Status - -| Disc-Typ | Status | Bemerkung | -|----------|--------|-----------| -| CD | 🚧 In Arbeit | abcde noch nicht implementiert | -| DVD | ✅ Implementiert | HandBrakeCLI | -| Blu-ray | ✅ Implementiert | HandBrakeCLI | +| Container | Port | Status | +|-----------|------|--------| +| rippy-api | 8000 | Healthy | +| rippy-worker | - | Running | +| rippy-ui | 80 | Running | +| rippy-postgres | 5432 | Healthy | +| rippy-redis | 6379 | Healthy | ### Nächste Schritte -- Progress-Reporting: Celery-Signale an SSE-Stream senden -- CD-Ripping mit abcde implementieren -- Testen mit `docker compose up` +- Echtzeit-Jobstatus via SSE +- Pre-Scan mit TMDB-Matching +- Jellyfin-Formatierung + NFO-Generierung +- Auth + API-Keys diff --git a/docker/postgres/Dockerfile b/docker/postgres/Dockerfile index 7e887cc..f4f7a6e 100644 --- a/docker/postgres/Dockerfile +++ b/docker/postgres/Dockerfile @@ -1,4 +1,4 @@ -FROM postgres:16-slim +FROM postgres:16 COPY init.sql /docker-entrypoint-initdb.d/ diff --git a/docker/ui/Dockerfile b/docker/ui/Dockerfile index 85166eb..f6efb23 100644 --- a/docker/ui/Dockerfile +++ b/docker/ui/Dockerfile @@ -5,10 +5,10 @@ WORKDIR /app RUN apk add --no-cache curl COPY package.json package-lock.json* ./ -RUN npm ci --only=production 2>/dev/null || npm install --only=production +RUN npm ci 2>/dev/null || npm install COPY . . EXPOSE 80 -CMD ["vite", "--host", "0.0.0.0", "--port", "80"] +CMD ["npm", "run", "dev"] diff --git a/docker/ui/package.json b/docker/ui/package.json index 6a4847b..9f049b7 100644 --- a/docker/ui/package.json +++ b/docker/ui/package.json @@ -4,15 +4,15 @@ "description": "Rippy Web UI", "type": "module", "scripts": { - "dev": "vite", + "dev": "vite --port 80", "build": "vite build", "preview": "vite preview" }, "dependencies": { "axios": "^1.7.7", + "lucide-react": "^0.453.0", "react": "^18.3.1", "react-dom": "^18.3.1", - "react-icons": "^5.3.0", "zustand": "^5.0.0" }, "devDependencies": { @@ -21,7 +21,7 @@ "@vitejs/plugin-react": "^4.3.3", "autoprefixer": "^10.4.20", "postcss": "^8.4.47", - "tailwindcss": "^3.4.14", + "tailwindcss": "^3.4.4", "vite": "^5.4.10" }, "packageManager": "npm@10.8.0" diff --git a/docker/ui/vite.config.js b/docker/ui/vite.config.js index e0cb94a..b5a294b 100644 --- a/docker/ui/vite.config.js +++ b/docker/ui/vite.config.js @@ -5,7 +5,7 @@ export default defineConfig({ plugins: [react()], server: { host: '0.0.0.0', - port: 5173 + port: 80 }, build: { outDir: 'dist', diff --git a/setup-arcane.sh b/setup-arcane.sh new file mode 100644 index 0000000..e878b32 --- /dev/null +++ b/setup-arcane.sh @@ -0,0 +1,14 @@ +#!/bin/bash +# Setup Rippy auf Arcane VM + +cd /home/arcane/projects + +# Verzeichnis erstellen +mkdir -p rippy +cd rippy + +# Dateien von Host kopieren +scp -r arcane@192.168.178.1:/"Coding Stuff/rippy"/* . + +# Docker Compose starten +docker compose up -d diff --git a/setup-git.sh b/setup-git.sh new file mode 100644 index 0000000..97edc49 --- /dev/null +++ b/setup-git.sh @@ -0,0 +1,3 @@ +git clone --mirror https://git.tobisniceshomelab.ddnsfree.com/Hitonabi/rippy.git /tmp/rippy.git +cd /tmp/rippy.git && git remote set-url origin https://git.tobisniceshomelab.ddnsfree.com/Hitonabi/rippy.git +git clone file:///tmp/rippy.git /home/arcane/projects/rippy