Merge pull request #8 from Masutayunikon/release-please--branches--main

chore(main): release 1.1.0

CHANGELOG.md

@@ -1,5 +1,60 @@
 # Changelog
 
+## [1.1.0](https://github.com/Masutayunikon/FanKarr/compare/v1.0.6...v1.1.0) (2026-03-10)
+
+
+### Features
+
+* make the organizer threaded to not consumme api main thread ([14c0e56](https://github.com/Masutayunikon/FanKarr/commit/14c0e567525e179da82c6b58d9886cc3d544a98d))
+
+
+### Bug Fixes
+
+* skip excluded folders ([edf806d](https://github.com/Masutayunikon/FanKarr/commit/edf806d9bc48d4de1c3609a4b0405442305d546e))
+
+## [1.0.6](https://github.com/Masutayunikon/FanKarr/compare/v1.0.5...v1.0.6) (2026-03-10)
+
+
+### Bug Fixes
+
+* remove user creation in entrypoint.sh ([92d9fa6](https://github.com/Masutayunikon/FanKarr/commit/92d9fa6b01f1e2de1ceb13528afd309b21f9d4cb))
+
+## [1.0.5](https://github.com/Masutayunikon/FanKarr/compare/v1.0.4...v1.0.5) (2026-03-10)
+
+
+### Bug Fixes
+
+* add user permissions when the scripts is launched ([501bbfc](https://github.com/Masutayunikon/FanKarr/commit/501bbfcf18c236f7ac382c50d90482b1f51244c1))
+
+## [1.0.4](https://github.com/Masutayunikon/FanKarr/compare/v1.0.3...v1.0.4) (2026-03-10)
+
+
+### Bug Fixes
+
+* add log for debug ([6876c5e](https://github.com/Masutayunikon/FanKarr/commit/6876c5ee6c7734e664a6da4e4bc721cc7c5abdf7))
+* add log for debug ([d8cdeae](https://github.com/Masutayunikon/FanKarr/commit/d8cdeae675bc73b5842d18d01eff9d5bb0e0a7e8))
+
+## [1.0.3](https://github.com/Masutayunikon/FanKarr/compare/v1.0.2...v1.0.3) (2026-03-10)
+
+
+### Bug Fixes
+
+* organize file ([d6550e9](https://github.com/Masutayunikon/FanKarr/commit/d6550e9961789073be1583e03d599afb6d295004))
+
+## [1.0.2](https://github.com/Masutayunikon/FanKarr/compare/v1.0.1...v1.0.2) (2026-03-10)
+
+
+### Bug Fixes
+
+* organize use torrent hash and not name ([61901f9](https://github.com/Masutayunikon/FanKarr/commit/61901f9014a759e2950311cd96266ea8201fa902))
+
+## [1.0.1](https://github.com/Masutayunikon/FanKarr/compare/v1.0.0...v1.0.1) (2026-03-10)
+
+
+### Bug Fixes
+
+* docker errors ([2702764](https://github.com/Masutayunikon/FanKarr/commit/27027642eb55b75adb04446a88e5007e88f75948))
+
 ## 1.0.0 (2026-03-10)
 
 

Dockerfile

@@ -15,13 +15,17 @@ RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile
 RUN pnpm run build
 
 # ── Production ─────────────────────────────────────────────────
-FROM base
+FROM node:20-slim
+RUN apt-get update && apt-get install -y gosu && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /app
 COPY --from=prod-deps /app/node_modules /app/node_modules
 COPY --from=build /app/dist/server /app/dist/server
 COPY --from=build /app/dist/client /app/public
-
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
 RUN mkdir -p /app/data
 
 EXPOSE 3001
 ENV NODE_ENV=production
-CMD ["node", "dist/server/index.js"]
+ENTRYPOINT ["/entrypoint.sh"]

entrypoint.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+PUID=${PUID:-1000}
+PGID=${PGID:-1000}
+
+echo "[fankarr] Running as UID=${PUID} GID=${PGID}"
+
+# Corriger les permissions du dossier data
+chown -R "$PUID:$PGID" /app/data
+
+exec gosu "$PUID:$PGID" node dist/server/index.js

server/index.ts

@@ -8,7 +8,7 @@ import {
     registerDriver, getDriver, getAvailableClients,
     listClients, addClient, removeClient, getClient,
     sanitizeClient, dispatchDownload, dispatchList
-} from './torrent-clients'
+} from './torrent-clients/index.js'
 import qbittorrentDriver from './torrent-clients/qbittorrent.js'
 import { organizeTorrent, autoOrganizeAll } from './organize.js'
 
@@ -19,7 +19,7 @@ const PORT = 3001
 const FANKAI_API    = 'https://metadata.fankai.fr'
 const TORRENTS_PATH = path.join(process.cwd(), 'data', 'torrent_final.json')
 const GITHUB_RAW_URL = process.env.GITHUB_RAW_URL
-    ?? 'https://raw.githubusercontent.com/CHANGE_ME/fankarr-scraper/main/data/torrent_final.json'
+    ?? 'https://raw.githubusercontent.com/masutayunikon/fankarr-scraper/main/data/torrent_final.json'
 
 app.use(express.json())
 app.use(cookieParser())
@@ -50,7 +50,7 @@ app.get('/api/torrent-clients/available', requireAuth, (_req, res) => {
     res.json(getAvailableClients())
 })
 app.get('/api/torrent-clients', requireAuth, (_req, res) => {
-    res.json(listClients().map(c => sanitizeClient(c)))
+    res.json(listClients().map((c: any) => sanitizeClient(c)))
 })
 app.post('/api/torrent-clients', requireAuth, (req, res) => {
     const { name, type, config } = req.body
@@ -222,7 +222,7 @@ app.post('/api/download', requireAuth, async (req, res) => {
     const url = req.body.torrent_url ?? req.body.magnet
     if (!url) { res.status(400).json({ error: 'torrent_url ou magnet requis' }); return }
     const results = await dispatchDownload(url)
-    res.status(results.every(r => r.ok) ? 200 : 207).json({ results })
+    res.status(results.every((r: any) => r.ok) ? 200 : 207).json({ results })
 })
 
 // ── Downloads — liste torrents Fankai ──────────────────────────

server/organize-worker.ts

@@ -0,0 +1,263 @@
+/**
+ * organize-worker.ts
+ * ==================
+ * Worker thread dédié à l'organisation des fichiers.
+ * Tourne dans un thread séparé pour ne pas bloquer le event loop Express.
+ *
+ * Messages reçus  (parentPort.on) : { type: 'run', torrents: TorrentInfo[] }
+ * Messages envoyés (parentPort.postMessage) :
+ *   { type: 'log',    level: 'info'|'warn'|'error', msg: string }
+ *   { type: 'result', hash: string, name: string, done, skipped, errors }
+ *   { type: 'done' }
+ */
+
+import fs   from 'fs'
+import fsp  from 'fs/promises'
+import path from 'path'
+import { parentPort } from 'worker_threads'
+
+const TORRENTS_PATH  = path.join(process.cwd(), 'data', 'torrent_final.json')
+const ORGANIZED_PATH = path.join(process.cwd(), 'data', 'organized.json')
+
+// ─── Utils log ────────────────────────────────────────────────
+
+function log(msg: string)   { parentPort?.postMessage({ type: 'log', level: 'info',  msg }) }
+function warn(msg: string)  { parentPort?.postMessage({ type: 'log', level: 'warn',  msg }) }
+function error(msg: string) { parentPort?.postMessage({ type: 'log', level: 'error', msg }) }
+
+// ─── Settings (lu directement, pas d'import circulaire) ──────
+
+function readSettings(): { mediaPath: string; completePath: string; organizeMode: string } {
+    try {
+        const p = path.join(process.cwd(), 'data', 'settings.json')
+        if (!fs.existsSync(p)) return { mediaPath: '/media/Kai', completePath: '/downloads/complete', organizeMode: 'hardlink' }
+        return JSON.parse(fs.readFileSync(p, 'utf-8'))
+    } catch { return { mediaPath: '/media/Kai', completePath: '/downloads/complete', organizeMode: 'hardlink' } }
+}
+
+// ─── Organized log ────────────────────────────────────────────
+
+function loadOrganized(): Record<string, Record<string, string>> {
+    try {
+        if (!fs.existsSync(ORGANIZED_PATH)) return {}
+        return JSON.parse(fs.readFileSync(ORGANIZED_PATH, 'utf-8'))
+    } catch { return {} }
+}
+
+function markOrganized(hash: string, filename: string) {
+    const data = loadOrganized()
+    if (!data[hash]) data[hash] = {}
+    data[hash][filename] = new Date().toISOString()
+    fs.writeFileSync(ORGANIZED_PATH, JSON.stringify(data, null, 2), 'utf-8')
+}
+
+function isOrganized(hash: string, filename: string): boolean {
+    return !!loadOrganized()[hash]?.[filename]
+}
+
+// ─── Torrent lookup ───────────────────────────────────────────
+
+function findTorrentByHash(hash: string): any | null {
+    try {
+        if (!fs.existsSync(TORRENTS_PATH)) return null
+        const torrents = JSON.parse(fs.readFileSync(TORRENTS_PATH, 'utf-8'))
+        return torrents.find((t: any) => t.infohash?.toLowerCase() === hash.toLowerCase()) ?? null
+    } catch { return null }
+}
+
+// ─── Dossiers exclus (bonus, musique, images) ────────────────
+
+const EXCLUDED_FOLDERS = new Set([
+    'endings', 'ending', 'openings', 'opening', 'ost', 'artworks', 'artwork',
+    'bonus', 'extras', 'extra', 'specials', 'special', 'ncop', 'nced',
+    'images', 'image', 'scans', 'scan', 'soundtrack', 'music',
+])
+
+function isInExcludedFolder(filePath: string[]): boolean {
+    for (const folder of filePath.slice(0, -1)) {
+        const f = folder.toLowerCase().trim()
+        if (EXCLUDED_FOLDERS.has(f)) return true
+        for (const excl of EXCLUDED_FOLDERS) {
+            if (f.startsWith(excl)) return true
+        }
+    }
+    return false
+}
+
+// ─── Filesystem ops ───────────────────────────────────────────
+
+function seasonFolder(n: number): string {
+    return `Saison ${String(n).padStart(3, '0')}`
+}
+
+function tryHardlink(src: string, dest: string): boolean {
+    try { fs.linkSync(src, dest); return true }
+    catch (err) {
+        warn(`[organize] hardlink échoué (${err instanceof Error ? err.message : err})`)
+        return false
+    }
+}
+
+// ─── Organise un torrent ──────────────────────────────────────
+
+async function organizeTorrent(hash: string, name: string, savePath: string) {
+    const { mediaPath, completePath, organizeMode } = readSettings()
+    const result = { total: 0, skipped: 0, done: 0, errors: [] as { file: string; error: string }[] }
+
+    log(`[organize] ── ${name} ──`)
+    log(`[organize] hash=${hash} save_path=${savePath} mode=${organizeMode}`)
+
+    const torrent = findTorrentByHash(hash)
+    if (!torrent) {
+        error(`[organize] ✗ Hash ${hash} introuvable dans torrent_final.json`)
+        throw new Error(`Torrent introuvable : ${hash}`)
+    }
+    log(`[organize] ✓ Trouvé : ${torrent.raw}`)
+
+    const serieTitle   = torrent.serie_title || torrent.show_title || name
+    const torrentFiles: any[] = torrent.torrent_files ?? []
+    log(`[organize] serie=${serieTitle} fichiers=${torrentFiles.length}`)
+
+    // ── Cas fichier unique ────────────────────────────────────
+    if (torrentFiles.length === 0) {
+        log(`[organize] torrent_files vide → tentative fichier unique`)
+        const candidates = [path.join(savePath, name), path.join(completePath, name)]
+        let src: string | null = null
+        for (const c of candidates) {
+            log(`[organize]   candidate: ${c} → ${fs.existsSync(c) ? '✓' : '✗'}`)
+            if (fs.existsSync(c)) { src = c; break }
+        }
+        if (!src) throw new Error(`Source introuvable pour "${name}"`)
+
+        const seasonNum = torrent.resolved_episodes?.[0]?.season_number ?? 1
+        const destDir   = path.join(mediaPath, serieTitle, seasonFolder(seasonNum))
+        const dest      = path.join(destDir, name)
+        log(`[organize]   dest: ${dest}`)
+
+        if (!fs.existsSync(dest)) {
+            fs.mkdirSync(destDir, { recursive: true })
+            if (organizeMode === 'hardlink') {
+                if (!tryHardlink(src, dest)) await fsp.copyFile(src, dest)
+            } else {
+                await fsp.copyFile(src, dest)
+                await fsp.unlink(src)
+            }
+            log(`[organize]   ✓ ${organizeMode} OK`)
+        } else {
+            log(`[organize]   → dest existe déjà, skip`)
+        }
+        markOrganized(hash, name)
+        return { ...result, total: 1, done: 1 }
+    }
+
+    // ── Map filename → season ─────────────────────────────────
+    const filenameSeasonMap = new Map<string, number>()
+    for (const ep of torrent.resolved_episodes ?? []) {
+        if (ep.filename && ep.season_number !== undefined)
+            filenameSeasonMap.set(ep.filename, ep.season_number)
+    }
+
+    result.total = torrentFiles.length
+
+    for (const tf of torrentFiles) {
+        const filename = tf.filename
+        const filePath: string[] = tf.path
+
+        // Skip les fichiers dans des dossiers bonus/musique/images
+        if (isInExcludedFolder(filePath)) {
+            log(`[organize] skip bonus: ${filename}`)
+            result.skipped++
+            continue
+        }
+
+        if (isOrganized(hash, filename)) { result.skipped++; continue }
+
+        const candidates = [
+            path.join(savePath, name, ...filePath.slice(0, -1), filename),
+            path.join(savePath, ...filePath.slice(0, -1), filename),
+            path.join(savePath, name, filename),
+            path.join(savePath, filename),
+            path.join(completePath, name, ...filePath.slice(0, -1), filename),
+            path.join(completePath, name, filename),
+            path.join(completePath, filename),
+        ]
+
+        let src: string | null = null
+        for (const c of candidates) {
+            if (fs.existsSync(c)) { src = c; break }
+        }
+
+        if (!src) {
+            const tried = candidates.map(c => `  • ${c}`).join('\n')
+            error(`[organize] ✗ ${filename} introuvable:\n${tried}`)
+            result.errors.push({ file: filename, error: 'Source introuvable' })
+            continue
+        }
+
+        const seasonNum = filenameSeasonMap.get(filename) ?? 1
+        const destDir   = path.join(mediaPath, serieTitle, seasonFolder(seasonNum))
+        const dest      = path.join(destDir, filename)
+
+        if (fs.existsSync(dest)) {
+            markOrganized(hash, filename)
+            result.skipped++
+            continue
+        }
+
+        try {
+            fs.mkdirSync(destDir, { recursive: true })
+            if (organizeMode === 'hardlink') {
+                if (!tryHardlink(src, dest)) await fsp.copyFile(src, dest)
+            } else {
+                await fsp.copyFile(src, dest)
+                await fsp.unlink(src)
+            }
+            markOrganized(hash, filename)
+            result.done++
+            log(`[organize] ✓ ${filename} → Saison ${String(seasonNum).padStart(3,'0')}`)
+        } catch (err) {
+            const msg = err instanceof Error ? err.message : 'Erreur inconnue'
+            error(`[organize] ✗ ${filename}: ${msg}`)
+            result.errors.push({ file: filename, error: msg })
+        }
+    }
+
+    log(`[organize] ── Résultat ${name}: ${result.done} OK, ${result.skipped} skippés, ${result.errors.length} erreurs`)
+    return result
+}
+
+// ─── Boucle principale du worker ─────────────────────────────
+
+parentPort?.on('message', async (msg: any) => {
+    if (msg.type !== 'run') return
+
+    const torrents: any[] = msg.torrents
+    const organized = loadOrganized()
+
+    for (const t of torrents) {
+        if (t.state !== 'seeding') continue
+
+        const torrent = findTorrentByHash(t.hash)
+        if (!torrent) {
+            warn(`[organize] hash ${t.hash} (${t.name}) non trouvé`)
+            continue
+        }
+
+        const files: any[] = torrent.torrent_files ?? []
+        // Pour fichier unique : vérifier via le name directement
+        const allDone = files.length > 0
+            ? files.every((f: any) => organized[t.hash]?.[f.filename])
+            : !!organized[t.hash]?.[t.name]
+
+        if (allDone) continue
+
+        try {
+            const result = await organizeTorrent(t.hash, t.name, t.save_path)
+            parentPort?.postMessage({ type: 'result', hash: t.hash, name: t.name, ...result })
+        } catch (err) {
+            error(`[organize] Erreur ${t.name}: ${err instanceof Error ? err.message : err}`)
+        }
+    }
+
+    parentPort?.postMessage({ type: 'done' })
+})

server/organize.ts

@@ -1,83 +1,15 @@
 /**
- * Organizer
- * =========
- * Déplace ou hardlinke les fichiers téléchargés vers la médiathèque Jellyfin.
- * Incrémental : skip les fichiers déjà organisés.
- *
- * Structure dest :
- *   mediaPath / serie_title / Saison 001 / filename.mkv
+ * organize.ts
+ * ===========
+ * Lance l'organizer dans un Worker Thread dédié pour ne pas bloquer Express.
+ * Le worker gère tout le filesystem (copy, hardlink, move).
  */
 
-import fs   from 'fs'
-import path from 'path'
-import { readSettings } from './settings.js'
+import path   from 'path'
+import { Worker } from 'worker_threads'
 
-const TORRENTS_PATH  = path.join(process.cwd(), 'data', 'torrent_final.json')
-const ORGANIZED_PATH = path.join(process.cwd(), 'data', 'organized.json')
-
-// ─── Organized log ────────────────────────────────────────────
-
-function loadOrganized(): Record<string, Record<string, string>> {
-    try {
-        if (!fs.existsSync(ORGANIZED_PATH)) return {}
-        return JSON.parse(fs.readFileSync(ORGANIZED_PATH, 'utf-8'))
-    } catch { return {} }
-}
-
-function saveOrganized(data: Record<string, Record<string, string>>) {
-    fs.writeFileSync(ORGANIZED_PATH, JSON.stringify(data, null, 2), 'utf-8')
-}
-
-function markOrganized(hash: string, filename: string) {
-    const data = loadOrganized()
-    if (!data[hash]) data[hash] = {}
-    data[hash][filename] = new Date().toISOString()
-    saveOrganized(data)
-}
-
-function isOrganized(hash: string, filename: string): boolean {
-    const data = loadOrganized()
-    return !!data[hash]?.[filename]
-}
-
-// ─── Torrent lookup ───────────────────────────────────────────
-
-function readTorrents(): any[] {
-    try {
-        if (!fs.existsSync(TORRENTS_PATH)) return []
-        return JSON.parse(fs.readFileSync(TORRENTS_PATH, 'utf-8'))
-    } catch { return [] }
-}
-
-function findTorrentByName(name: string): any | null {
-    const torrents = readTorrents()
-    return torrents.find(t => t.raw === name) ?? null
-}
-
-// ─── Filesystem ops ───────────────────────────────────────────
-
-function ensureDir(dir: string) {
-    fs.mkdirSync(dir, { recursive: true })
-}
-
-function seasonFolder(n: number): string {
-    return `Saison ${String(n).padStart(3, '0')}`
-}
-
-function tryHardlink(src: string, dest: string): boolean {
-    try {
-        fs.linkSync(src, dest)
-        return true
-    } catch {
-        return false
-    }
-}
-
-function copyFile(src: string, dest: string) {
-    fs.copyFileSync(src, dest)
-}
-
-// ─── Résultat d'organisation ──────────────────────────────────
+// Un seul worker à la fois
+let workerRunning = false
 
 export interface OrganizeResult {
     total   : number
@@ -86,163 +18,103 @@ export interface OrganizeResult {
     errors  : { file: string; error: string }[]
 }
 
-// ─── Organise un torrent ──────────────────────────────────────
-
-export async function organizeTorrent(
-    hash    : string,
-    name    : string,  // nom du dossier torrent dans completePath
-    savePath: string   // save_path retourné par qBittorrent
-): Promise<OrganizeResult> {
-    const settings = readSettings()
-    const { mediaPath, completePath, organizeMode } = settings
-
-    const result: OrganizeResult = { total: 0, skipped: 0, done: 0, errors: [] }
-
-    // Trouver le torrent dans torrent_final.json
-    const torrent = findTorrentByName(name)
-    if (!torrent) {
-        throw new Error(`Torrent introuvable dans torrent_final.json : "${name}"`)
-    }
-
-    const serieTitle  = torrent.serie_title || torrent.show_title || name
-    const torrentFiles: any[] = torrent.torrent_files ?? []
-
-    if (torrentFiles.length === 0) {
-        throw new Error(`Aucun fichier trouvé dans le torrent "${name}"`)
-    }
-
-    // Résoudre season_number par episode_id
-    const epSeasonMap = new Map<number, number>()
-    for (const ep of torrent.resolved_episodes ?? []) {
-        if (ep.filename) {
-            epSeasonMap.set(ep.episode_number, ep.season_number)
-        }
-    }
-    // Map filename → season_number
-    const filenameSeasonMap = new Map<string, number>()
-    for (const ep of torrent.resolved_episodes ?? []) {
-        if (ep.filename && ep.season_number !== undefined) {
-            filenameSeasonMap.set(ep.filename, ep.season_number)
-        }
-    }
-
-    result.total = torrentFiles.length
-
-    for (const tf of torrentFiles) {
-        const filename = tf.filename
-        const filePath: string[] = tf.path  // ex: ["Saga 1 - ...", "file.mkv"]
-
-        // Skip si déjà organisé
-        if (isOrganized(hash, filename)) {
-            result.skipped++
-            continue
-        }
-
-        // Construire le chemin source
-        // save_path peut déjà contenir le nom du dossier ou pas selon le client
-        const torrentDir = path.join(savePath, name)
-        const torrentDirAlt = savePath  // au cas où save_path inclut déjà le nom
-
-        // Chemin source = dossier torrent + sous-dossiers + fichier
-        const subPath = filePath.length > 1
-            ? path.join(...filePath.slice(0, -1), filename)
-            : filename
-
-        let src = path.join(torrentDir, subPath)
-        if (!fs.existsSync(src)) {
-            // Fallback: save_path sans le nom du torrent
-            src = path.join(torrentDirAlt, subPath)
-        }
-        if (!fs.existsSync(src)) {
-            // Fallback: fichier directement dans save_path/name
-            src = path.join(torrentDir, filename)
-        }
-        if (!fs.existsSync(src)) {
-            result.errors.push({ file: filename, error: `Source introuvable : ${src}` })
-            continue
-        }
-
-        // Déterminer la saison
-        let seasonNum = filenameSeasonMap.get(filename)
-        if (seasonNum === undefined) {
-            // Fallback : season_number = 1
-            seasonNum = 1
-        }
-
-        // Construire le chemin destination
-        const destDir = path.join(mediaPath, serieTitle, seasonFolder(seasonNum))
-        const dest    = path.join(destDir, filename)
-
-        // Skip si dest existe déjà
-        if (fs.existsSync(dest)) {
-            markOrganized(hash, filename)
-            result.skipped++
-            continue
-        }
-
-        try {
-            ensureDir(destDir)
-
-            if (organizeMode === 'hardlink') {
-                const ok = tryHardlink(src, dest)
-                if (!ok) {
-                    // Hardlink impossible (filesystems différents) → copy
-                    console.warn(`[organize] hardlink échoué pour ${filename}, fallback copy`)
-                    copyFile(src, dest)
-                }
-            } else {
-                // move = copy + delete source
-                copyFile(src, dest)
-                fs.unlinkSync(src)
-            }
-
-            markOrganized(hash, filename)
-            result.done++
-            console.log(`[organize] ${organizeMode} ${filename} → ${dest}`)
-        } catch (err) {
-            result.errors.push({
-                file : filename,
-                error: err instanceof Error ? err.message : 'Erreur inconnue'
-            })
-        }
-    }
-
-    return result
-}
-
-// ─── Auto-organise polling ────────────────────────────────────
-// Appelé depuis index.ts au démarrage, toutes les 30s
-// Détecte les torrents "seeding" non encore organisés
-
+/**
+ * Lance l'auto-organisation dans un worker thread.
+ * listFn est appelée dans le thread principal (accès qBittorrent),
+ * puis les données sont passées au worker.
+ */
 export async function autoOrganizeAll(
     listFn: () => Promise<any[]>
 ): Promise<void> {
+    if (workerRunning) {
+        console.log('[organize] Worker déjà en cours, skip')
+        return
+    }
+
     let torrents: any[]
     try {
         torrents = await listFn()
-    } catch { return }
-
-    const organized = loadOrganized()
-
-    for (const t of torrents) {
-        if (t.state !== 'seeding') continue
-
-        // Vérifier si tous les fichiers sont déjà organisés
-        const torrent = findTorrentByName(t.name)
-        if (!torrent) continue
-
-        const files: any[] = torrent.torrent_files ?? []
-        if (files.length === 0) continue
-
-        const allDone = files.every(f => organized[t.hash]?.[f.filename])
-        if (allDone) continue
-
-        console.log(`[organize] Auto-organisation : ${t.name}`)
-        try {
-            const result = await organizeTorrent(t.hash, t.name, t.save_path)
-            console.log(`[organize] ${t.name} → ${result.done} fichiers, ${result.skipped} skippés, ${result.errors.length} erreurs`)
-        } catch (err) {
-            console.error(`[organize] Erreur pour ${t.name}:`, err)
-        }
+    } catch (err) {
+        console.error('[organize] Impossible de récupérer la liste des torrents:', err)
+        return
     }
+
+    if (torrents.length === 0) return
+
+    const seedingCount = torrents.filter(t => t.state === 'seeding').length
+    if (seedingCount === 0) return
+
+    console.log(`[organize] Lancement worker (${seedingCount} torrents en seeding)`)
+    workerRunning = true
+
+    const workerPath = path.join(path.dirname(new URL(import.meta.url).pathname), 'organize-worker.js')
+
+    const worker = new Worker(workerPath)
+
+    worker.on('message', (msg: any) => {
+        if (msg.type === 'log') {
+            if (msg.level === 'error') console.error(msg.msg)
+            else if (msg.level === 'warn') console.warn(msg.msg)
+            else console.log(msg.msg)
+        } else if (msg.type === 'result') {
+            console.log(`[organize] ${msg.name} → ${msg.done} OK, ${msg.skipped} skippés, ${msg.errors.length} erreurs`)
+        } else if (msg.type === 'done') {
+            console.log('[organize] Worker terminé')
+            workerRunning = false
+            worker.terminate()
+        }
+    })
+
+    worker.on('error', (err) => {
+        console.error('[organize] Worker erreur:', err)
+        workerRunning = false
+    })
+
+    worker.on('exit', (code) => {
+        if (code !== 0) console.error(`[organize] Worker exit code ${code}`)
+        workerRunning = false
+    })
+
+    // Envoyer les torrents au worker
+    worker.postMessage({ type: 'run', torrents })
+}
+
+/**
+ * Organisation manuelle d'un torrent (appelée depuis l'API /organize).
+ * Lance aussi dans un worker thread.
+ */
+export async function organizeTorrent(
+    hash    : string,
+    name    : string,
+    savePath: string
+): Promise<OrganizeResult> {
+    return new Promise((resolve, reject) => {
+        const workerPath = path.join(path.dirname(new URL(import.meta.url).pathname), 'organize-worker.js')
+        const worker = new Worker(workerPath)
+
+        // On envoie un seul torrent "fictif seeding"
+        const fakeTorrent = { hash, name, save_path: savePath, state: 'seeding' }
+        const result: OrganizeResult = { total: 0, skipped: 0, done: 0, errors: [] }
+
+        worker.on('message', (msg: any) => {
+            if (msg.type === 'log') {
+                if (msg.level === 'error') console.error(msg.msg)
+                else if (msg.level === 'warn') console.warn(msg.msg)
+                else console.log(msg.msg)
+            } else if (msg.type === 'result') {
+                result.total   = msg.total
+                result.skipped = msg.skipped
+                result.done    = msg.done
+                result.errors  = msg.errors
+            } else if (msg.type === 'done') {
+                worker.terminate()
+                resolve(result)
+            }
+        })
+
+        worker.on('error', (err) => { worker.terminate(); reject(err) })
+        worker.on('exit',  (code) => { if (code !== 0) reject(new Error(`Worker exit ${code}`)) })
+
+        worker.postMessage({ type: 'run', torrents: [fakeTorrent] })
+    })
 }