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

chore(main): release 1.11.10

CHANGELOG.md

@@ -1,5 +1,62 @@
 # Changelog
 
+## [1.11.10](https://github.com/Masutayunikon/FanKarr/compare/v1.11.9...v1.11.10) (2026-03-21)
+
+
+### Bug Fixes
+
+* improve torrent organization and cleanup logic ([1908cb3](https://github.com/Masutayunikon/FanKarr/commit/1908cb3e8c5b99e91e26735f7cfa3dcd23709df7))
+* season 0 not clonficting anymore ([635082d](https://github.com/Masutayunikon/FanKarr/commit/635082de00bb42bdeaf20b1654f742ad1c4addbe))
+
+## [1.11.9](https://github.com/Masutayunikon/FanKarr/compare/v1.11.8...v1.11.9) (2026-03-20)
+
+
+### Bug Fixes
+
+* season 0 resolved is no longer skipped in the worker ([c48ec76](https://github.com/Masutayunikon/FanKarr/commit/c48ec769ba7725327e657366e882498846d0c63f))
+
+## [1.11.8](https://github.com/Masutayunikon/FanKarr/compare/v1.11.7...v1.11.8) (2026-03-20)
+
+
+### Bug Fixes
+
+* config path /config/config to /config ([7518191](https://github.com/Masutayunikon/FanKarr/commit/75181910244621a8eca989067fd4777922914d8e))
+
+## [1.11.7](https://github.com/Masutayunikon/FanKarr/compare/v1.11.6...v1.11.7) (2026-03-20)
+
+
+### Bug Fixes
+
+* worker path ([3df8def](https://github.com/Masutayunikon/FanKarr/commit/3df8defa5e46b09722a345c7c3a94e91aa16e4d8))
+
+## [1.11.6](https://github.com/Masutayunikon/FanKarr/compare/v1.11.5...v1.11.6) (2026-03-20)
+
+
+### Bug Fixes
+
+* path ([0329ee2](https://github.com/Masutayunikon/FanKarr/commit/0329ee27a34038456eb297f07b808de3157d88f4))
+
+## [1.11.5](https://github.com/Masutayunikon/FanKarr/compare/v1.11.4...v1.11.5) (2026-03-20)
+
+
+### Bug Fixes
+
+* export _isBunBinary ([3d43de3](https://github.com/Masutayunikon/FanKarr/commit/3d43de3eb223ec0338e0b9aebffff35e116e00a0))
+
+## [1.11.4](https://github.com/Masutayunikon/FanKarr/compare/v1.11.3...v1.11.4) (2026-03-20)
+
+
+### Bug Fixes
+
+* add config.ts with config variable (BASE_DIR...) ([a3eb67c](https://github.com/Masutayunikon/FanKarr/commit/a3eb67c9a0944500142a6636d57cae0acfd7543d))
+
+## [1.11.3](https://github.com/Masutayunikon/FanKarr/compare/v1.11.2...v1.11.3) (2026-03-20)
+
+
+### Bug Fixes
+
+* entrypoint.sh config directory ([7e4b2fa](https://github.com/Masutayunikon/FanKarr/commit/7e4b2fa60a5946d3220618f13420a07fa57e8e1b))
+
 ## [1.11.2](https://github.com/Masutayunikon/FanKarr/compare/v1.11.1...v1.11.2) (2026-03-20)
 
 

entrypoint.sh

@@ -7,6 +7,6 @@ PGID=${PGID:-1000}
 echo "[fankarr] Running as UID=${PUID} GID=${PGID}"
 
 # Corriger les permissions du dossier data
-chown -R "$PUID:$PGID" /app/data
+chown -R "$PUID:$PGID" /config
 
 exec gosu "$PUID:$PGID" node dist/server/index.js

server/auth.ts

@@ -4,8 +4,9 @@ import bcrypt from 'bcryptjs'
 import jwt from 'jsonwebtoken'
 import type { Request, Response, NextFunction } from 'express'
 import { JWT_SECRET } from './secret.js'
+import { DATA_DIR } from './config.js'
 
-const DATA_PATH = path.join(process.cwd(), 'config', 'auth.json')
+const DATA_PATH = path.join(DATA_DIR, 'auth.json')
 const SALT_ROUNDS = 10
 
 interface AuthData {

server/config.ts

@@ -0,0 +1,13 @@
+import fs from 'fs'
+import path from 'path'
+
+export const _isBunBinary = typeof (globalThis as any).Bun !== 'undefined'
+    && path.dirname((process as any).execPath) !== process.cwd()
+
+export const BASE_DIR = _isBunBinary
+    ? path.dirname((process as any).execPath)
+    : process.cwd()
+
+export const DATA_DIR = fs.existsSync('/.dockerenv')
+    ? '/config'
+    : path.join(BASE_DIR, 'config')

server/index.ts

@@ -12,23 +12,10 @@ import {
 import qbittorrentDriver from './torrent-clients/qbittorrent.js'
 import { organizeTorrent, autoOrganizeAll, scanMediaPath } from './organize.js'
 import { logger, readLogs, clearLogs, logsFileSize } from './logger.js'
+import { DATA_DIR, BASE_DIR }  from './config.js'
 
 registerDriver(qbittorrentDriver)
 
-// ── Base directory ─────────────────────────────────────────────
-// Binaire Bun compilé : data/ et public/ sont à côté de l'exécutable
-// Docker / dev        : relatif au cwd (comportement inchangé)
-const _isBunBinary = typeof (globalThis as any).Bun !== 'undefined'
-    && path.dirname((process as any).execPath) !== process.cwd()
-export const BASE_DIR = _isBunBinary
-    ? path.dirname((process as any).execPath)
-    : process.cwd()
-
-// DATA_DIR : /config
-export const DATA_DIR = fs.existsSync('/.dockerenv')
-    ? '/config'
-    : path.join(BASE_DIR, 'config')
-
 const app = express()
 const PORT = Number(process.env.PORT) || 9898
 const FANKAI_API    = 'https://metadata.fankai.fr'
@@ -148,21 +135,18 @@ function indexByNormalizedTitle(torrents: any[]): Map<string, any[]> {
 function computeSerieDownloadState(
     serieTorrents : any[],
     organized     : Record<string, Record<string, string>>,
-    activeTorrents: Set<string>  // hashes actuellement dans qB en downloading
+    activeTorrents: Set<string>
 ): 'none' | 'downloading' | 'partial' | 'complete' {
     if (serieTorrents.length === 0) return 'none'
 
-    // Un torrent de la série est en cours de téléchargement ?
     const hasActive = serieTorrents.some(t => activeTorrents.has(t.infohash?.toLowerCase()))
     if (hasActive) return 'downloading'
 
-    // Compter les fichiers attendus vs organisés
     let totalFiles = 0
     let doneFiles  = 0
     for (const t of serieTorrents) {
         const files: any[] = t.torrent_files ?? []
         if (files.length === 0) {
-            // Fichier unique
             totalFiles++
             if (organized[t.infohash?.toLowerCase()]?.[t.raw]) doneFiles++
         } else {
@@ -204,7 +188,7 @@ app.get('/api/series', requireAuth, async (_req, res) => {
 
         const seriesRaw = Array.isArray(apiData) ? apiData : (apiData.series ?? [])
 
-        // Dédupliquer les séries Kaï/Kai — garder celle qui a des torrents, sinon la plus récente (ID le plus grand)
+        // Dédupliquer les séries Kaï/Kai — garder celle qui a des torrents, sinon la plus récente
         const seenTitles = new Map<string, any>()
         for (const serie of seriesRaw) {
             const key = normalizeTitle(serie.title ?? serie.show_title ?? '')
@@ -214,7 +198,6 @@ app.get('/api/series', requireAuth, async (_req, res) => {
                 const existing = seenTitles.get(key)!
                 const existingHasTorrents = (byId.get(existing.id) ?? byNormTitle.get(key) ?? []).length > 0
                 const newHasTorrents      = (byId.get(serie.id)    ?? byNormTitle.get(key) ?? []).length > 0
-                // Préférer celle qui a des torrents, sinon la plus récente
                 if (!existingHasTorrents && newHasTorrents) seenTitles.set(key, serie)
                 else if (existingHasTorrents === newHasTorrents && serie.id > existing.id) seenTitles.set(key, serie)
             }
@@ -249,7 +232,6 @@ app.get('/api/series/:id', requireAuth, async (req, res) => {
         }))
 
         const allTorrents  = readTorrents()
-        const serieMeta    = allTorrents.find(t => t.serie_id === id)
         const normApiTitle = normalizeTitle(serie.title ?? serie.show_title ?? '')
         const torrents     = allTorrents.filter(t =>
             t.serie_id === id ||
@@ -257,7 +239,6 @@ app.get('/api/series/:id', requireAuth, async (req, res) => {
         )
         const allSeasonIds = new Set<number>(seasonsWithEpisodes.filter((s: any) => s.season_number !== 0).map((s: any) => s.id))
         const availableEpisodeIds  = new Set<number>()
-        // Fallback par season_number+episode_number pour les séries migrées Kaï→Kai
         const availableBySnEn      = new Set<string>()  // "sn:en"
         const episodeTorrentMap: Record<number, any> = {}
         const episodeTorrentMapBySnEn: Record<string, any> = {}
@@ -332,8 +313,6 @@ app.get('/api/series/:id', requireAuth, async (req, res) => {
                 organized = JSON.parse(fs.readFileSync(orgPath, 'utf-8'))
         } catch {}
 
-        // Construire un set des episode_id organisés
-        // On croise resolved_episodes de chaque torrent avec organized.json
         const organizedEpisodeIds = new Set<number>()
         const organizedBySnEn     = new Set<string>()
         for (const t of torrents) {
@@ -341,9 +320,7 @@ app.get('/api/series/:id', requireAuth, async (req, res) => {
             const files = t.torrent_files ?? []
             const orgFiles = organized[hash] ?? {}
             if (Object.keys(orgFiles).length === 0) continue
-            // Au moins un fichier organisé pour ce torrent → on marque les épisodes résolus
             for (const ep of t.resolved_episodes ?? []) {
-                // Vérifier si le fichier de cet épisode est organisé
                 const epFile = files.find((f: any) =>
                     f.episode_ids?.includes(ep.episode_id) || f.episode_number === ep.episode_number
                 )
@@ -365,7 +342,6 @@ app.get('/api/series/:id', requireAuth, async (req, res) => {
                 organized : organizedEpisodeIds.has(ep.id)
                     || organizedBySnEn.has(`${season.season_number}:${ep.episode_number}`),
             }))
-            // State saison : none / partial / complete
             const total    = eps.filter((e: any) => e.available).length
             const orgCount = eps.filter((e: any) => e.organized).length
             const seasonOrganizedState =
@@ -406,7 +382,6 @@ app.get('/api/downloads', requireAuth, async (_req, res) => {
         const { category } = readSettings()
         const torrents = await dispatchList(category ?? 'fankai')
 
-        // Enrichir avec l'état d'organisation
         let organized: Record<string, Record<string, string>> = {}
         try {
             const orgPath = path.join(DATA_DIR, 'organized.json')
@@ -416,7 +391,7 @@ app.get('/api/downloads', requireAuth, async (_req, res) => {
 
         let torrentFinal: any[] = []
         try {
-            const tfPath = path.join(process.cwd(), 'config', 'torrent_final.json')
+            const tfPath = path.join(DATA_DIR, 'torrent_final.json')
             if (fs.existsSync(tfPath))
                 torrentFinal = JSON.parse(fs.readFileSync(tfPath, 'utf-8'))
         } catch {}
@@ -432,7 +407,6 @@ app.get('/api/downloads', requireAuth, async (_req, res) => {
             if (doneFiles >= totalFiles) organizeState = 'done'
             else if (doneFiles > 0)      organizeState = 'partial'
 
-            // Récupérer les erreurs depuis recentOrganized
             const notif = recentOrganized.find(n => n.hash === t.hash)
             const errorFiles = notif?.errorFiles ?? []
 
@@ -445,7 +419,7 @@ app.get('/api/downloads', requireAuth, async (_req, res) => {
     }
 })
 
-// ── Résultats d'organisation récents (pour notifications frontend) ──
+// ── Résultats d'organisation récents ──────────────────────────
 interface OrganizeNotif {
     hash       : string
     name       : string
@@ -467,13 +441,11 @@ app.get('/api/organize/recent', requireAuth, (_req, res) => {
     res.json(recentOrganized)
 })
 
-// Vider les notifs lues
 app.post('/api/organize/recent/clear', requireAuth, (_req, res) => {
     recentOrganized.length = 0
     res.json({ ok: true })
 })
 
-
 app.post('/api/organize', requireAuth, async (req, res) => {
     const { hash, name, save_path } = req.body
     if (!hash || !name || !save_path) {
@@ -488,7 +460,6 @@ app.post('/api/organize', requireAuth, async (req, res) => {
     }
 })
 
-// ── Torrents status ────────────────────────────────────────────
 // ── Logs ──────────────────────────────────────────────────────
 app.get('/api/logs', requireAuth, (req, res) => {
     const limit  = Number(req.query.limit)  || 100
@@ -564,7 +535,7 @@ app.post('/api/scan', requireAuth, async (_req, res) => {
     }
 })
 
-// ── SPA fallback (prod) — doit être après toutes les routes API ─
+// ── SPA fallback (prod) ────────────────────────────────────────
 if (fs.existsSync(PUBLIC_PATH)) {
     app.get('*path', (_req, res) => {
         res.sendFile(path.join(PUBLIC_PATH, 'index.html'))
@@ -604,7 +575,8 @@ app.listen(PORT, async () => {
         logger.error('organize', `scanMediaPath échoué: ${err}`)
     )
 
-    // Auto-organise toutes les 30s
+    // Auto-organise — polling différentiel toutes les 5 minutes
+    // Le worker ne se lance que si un torrent vient de passer en seeding
     const autoOrganize = async () => {
         try {
             const { category } = readSettings()
@@ -620,9 +592,9 @@ app.listen(PORT, async () => {
             console.error('[organize] Erreur auto-organise:', err)
         }
     }
-    // Premier run 30s après démarrage, puis toutes les 30s
+    // Premier run 10s après démarrage, puis toutes les 5 minutes
     setTimeout(() => {
         autoOrganize()
-        setInterval(autoOrganize, 30_000)
-    }, 30_000)
+        setInterval(autoOrganize, 5 * 60_000)
+    }, 10_000)
 })

server/logger.ts

@@ -8,6 +8,7 @@
 
 import fs   from 'fs'
 import path from 'path'
+import { DATA_DIR } from './config.js'
 
 export type LogLevel = 'debug' | 'info' | 'warn' | 'error'
 
@@ -19,7 +20,7 @@ export interface LogEntry {
     meta?   : Record<string, any>
 }
 
-const LOGS_PATH    = path.join(process.cwd(), 'config', 'logs.jsonl')
+const LOGS_PATH    = path.join(DATA_DIR, 'logs.jsonl')
 const MAX_LINES    = 2000   // rotation auto au-delà
 const IS_PROD      = process.env.NODE_ENV === 'production'
 

server/organize-worker.ts

@@ -15,16 +15,10 @@ import fs   from 'fs'
 import fsp  from 'fs/promises'
 import path from 'path'
 import { parentPort } from 'worker_threads'
+import { DATA_DIR } from './config.js'
 
-// Base directory : binaire Bun ou cwd (Docker/dev)
-const _isBunBinary = typeof (globalThis as any).Bun !== 'undefined'
-    && path.dirname((process as any).execPath) !== process.cwd()
-const BASE_DIR = _isBunBinary
-    ? path.dirname((process as any).execPath)
-    : process.cwd()
-
-const TORRENTS_PATH  = path.join(BASE_DIR, 'config', 'torrent_final.json')
-const ORGANIZED_PATH = path.join(BASE_DIR, 'config', 'organized.json')
+const TORRENTS_PATH  = path.join(DATA_DIR, 'torrent_final.json')
+const ORGANIZED_PATH = path.join(DATA_DIR, 'organized.json')
 
 // ─── Utils log ────────────────────────────────────────────────
 // Le worker tourne dans un thread séparé — il passe les logs au thread principal
@@ -39,7 +33,7 @@ function debug(msg: string) { parentPort?.postMessage({ type: 'log', level: 'deb
 
 function readSettings(): { mediaPath: string; completePath: string; organizeMode: string; nfoSupport: boolean } {
     try {
-        const p = path.join(process.cwd(), 'config', 'settings.json')
+        const p = path.join(DATA_DIR, 'settings.json')
         if (!fs.existsSync(p)) return { mediaPath: '', completePath: '', organizeMode: 'hardlink', nfoSupport: false }
         return JSON.parse(fs.readFileSync(p, 'utf-8'))
     } catch { return { mediaPath: '', completePath: '', organizeMode: 'hardlink', nfoSupport: false } }
@@ -295,21 +289,23 @@ async function organizeTorrent(hash: string, name: string, savePath: string) {
     const filenameSeasonMap = new Map<string, number>()
 
     // Index resolved_episodes par episode_number pour lookup rapide
-    const epByNum = new Map<number, number>()  // ep_number → season_number
+    const filenameToSeason = new Map<string, number>()
     for (const ep of torrent.resolved_episodes ?? []) {
-        if (ep.episode_number !== undefined && ep.season_number !== undefined)
-            epByNum.set(Number(ep.episode_number), ep.season_number)
+        if (ep.filename && ep.season_number !== undefined)
+            filenameToSeason.set(ep.filename, ep.season_number)
     }
 
     for (const tf of torrentFiles) {
-        const sn: number | null = tf.season_number != null ? Number(tf.season_number) : null
-        const tfNum = tf.num !== undefined ? Number(tf.num) : undefined
+        const sn = tf.season_number != null ? Number(tf.season_number) : null
         if (sn !== null) {
             filenameSeasonMap.set(tf.filename, sn)
-        } else if (tfNum !== undefined && epByNum.has(tfNum)) {
-            filenameSeasonMap.set(tf.filename, epByNum.get(tfNum)!)
-        } else if (torrent.season_number !== undefined) {
-            filenameSeasonMap.set(tf.filename, torrent.season_number)
+        } else {
+            const fromResolved = filenameToSeason.get(tf.filename)
+            if (fromResolved !== undefined) {
+                filenameSeasonMap.set(tf.filename, fromResolved)
+            } else if (torrent.season_number !== undefined) {
+                filenameSeasonMap.set(tf.filename, torrent.season_number)
+            }
         }
     }
 
@@ -320,7 +316,8 @@ async function organizeTorrent(hash: string, name: string, savePath: string) {
         const filePath: string[] = tf.path
 
         // Skip les fichiers dans des dossiers bonus/musique/images
-        if (isInExcludedFolder(filePath)) {
+        const tfMeta = torrentFiles.find((tf: any) => tf.filename === filename)
+        if (isInExcludedFolder(filePath) && tfMeta?.season_number == null) {
             log(`[organize] skip bonus: ${filename}`)
             result.skipped++
             continue

server/organize.ts

@@ -13,6 +13,9 @@ import { logger } from './logger.js'
 // Un seul worker à la fois
 let workerRunning = false
 
+// État précédent des torrents pour détecter les passages downloading → seeding
+const _prevStates = new Map<string, string>()  // hash → state
+
 // Résolution du chemin du worker
 // En binaire Bun compilé : le worker est à côté de l'exécutable
 // En Docker/dev : à côté du fichier courant
@@ -81,6 +84,9 @@ export async function scanMediaPath(
             organized = JSON.parse(fs.readFileSync(organizedPath, 'utf-8'))
     } catch {}
 
+    // Construire le set des fichiers présents sur le disque (pour nettoyage)
+    const presentFiles = new Set<string>()  // "hash:filename"
+
     // Parcourir récursivement mediaPath
     function walk(dir: string) {
         let entries: fs.Dirent[]
@@ -94,6 +100,7 @@ export async function scanMediaPath(
                 result.found++
                 const hash = filenameIndex.get(entry.name)
                 if (!hash) continue
+                presentFiles.add(`${hash}:${entry.name}`)
                 if (organized[hash]?.[entry.name]) continue  // déjà connu
                 // Marquer comme organisé
                 if (!organized[hash]) organized[hash] = {}
@@ -105,9 +112,28 @@ export async function scanMediaPath(
 
     walk(mediaPath)
 
-    if (result.added > 0) {
+    // Nettoyer les entrées orphelines (fichiers supprimés)
+    let removed = 0
+    for (const [hash, files] of Object.entries(organized)) {
+        for (const filename of Object.keys(files)) {
+            if (!presentFiles.has(`${hash}:${filename}`)) {
+                // Vérifier que ce hash est bien dans le filenameIndex
+                // (évite de supprimer des entrées de torrents non-scannés)
+                if (filenameIndex.get(filename) === hash) {
+                    delete organized[hash][filename]
+                    removed++
+                }
+            }
+        }
+        // Supprimer l'entrée du torrent si elle est vide
+        if (Object.keys(organized[hash]).length === 0) {
+            delete organized[hash]
+        }
+    }
+
+    if (result.added > 0 || removed > 0) {
         fs.writeFileSync(organizedPath, JSON.stringify(organized, null, 2), 'utf-8')
-        logger.info('organize', `scanMediaPath: ${result.found} fichiers scannés, ${result.added} ajoutés à organized.json`)
+        logger.info('organize', `scanMediaPath: ${result.found} fichiers scannés, ${result.added} ajoutés, ${removed} entrées orphelines supprimées`)
     } else {
         logger.info('organize', `scanMediaPath: ${result.found} fichiers scannés, rien de nouveau`)
     }
@@ -139,10 +165,27 @@ export async function autoOrganizeAll(
 
     if (torrents.length === 0) return
 
+    const isFirstRun = _prevStates.size === 0
     const seedingCount = torrents.filter(t => t.state === 'seeding').length
+
+    // Détecter les torrents qui viennent de passer en seeding (downloading → seeding)
+    const newlySeeding = torrents.filter(t => {
+        const prev = _prevStates.get(t.hash)
+        return t.state === 'seeding' && (prev === undefined || prev !== 'seeding')
+    })
+
+    // Mettre à jour l'état précédent
+    for (const t of torrents) _prevStates.set(t.hash, t.state)
+
+    // Lancer seulement si : premier run avec des seeders, ou nouveau torrent terminé
+    if (!isFirstRun && newlySeeding.length === 0) return
     if (seedingCount === 0) return
 
-    console.log(`[organize] Lancement worker (${seedingCount} torrents en seeding)`)
+    if (newlySeeding.length > 0 && !isFirstRun) {
+        console.log(`[organize] ${newlySeeding.length} nouveau(x) torrent(s) terminé(s) → lancement worker`)
+    } else {
+        console.log(`[organize] Lancement worker (${seedingCount} torrents en seeding)`)
+    }
     workerRunning = true
 
     const workerPath = resolveWorkerPath()

server/secret.ts

@@ -9,8 +9,9 @@
 import fs       from 'fs'
 import path     from 'path'
 import crypto   from 'crypto'
+import { DATA_DIR } from './config.js'
 
-const SECRET_PATH = path.join(process.cwd(), 'config', 'secret.key')
+const SECRET_PATH = path.join(DATA_DIR, 'secret.key')
 
 function generateSecret(): string {
     return crypto.randomBytes(48).toString('hex')

server/settings.ts

@@ -1,12 +1,8 @@
 import fs from 'fs'
 import path from 'path'
+import { DATA_DIR } from './config.js'
 
-const _isBunBinary = typeof (globalThis as any).Bun !== 'undefined'
-    && path.dirname((process as any).execPath) !== process.cwd()
-const BASE_DIR = _isBunBinary
-    ? path.dirname((process as any).execPath)
-    : process.cwd()
-const DATA_PATH = path.join(BASE_DIR, 'config', 'settings.json')
+const DATA_PATH = path.join(DATA_DIR, 'settings.json')
 
 export interface Settings {
     mediaPath     : string

server/torrent-clients/index.ts

@@ -9,6 +9,7 @@
 import { randomUUID } from 'crypto'
 import fs from 'fs'
 import path from 'path'
+import { DATA_DIR } from '../config.js'
 
 // ─── Types ────────────────────────────────────────────────────────────────────
 
@@ -77,7 +78,7 @@ export function getAvailableClients(): TorrentClientDefinition[] {
 
 // ─── Persistence (clients enregistrés) ────────────────────────────────────────
 
-const CLIENTS_PATH = path.join(process.cwd(), 'config', 'torrent_clients.json')
+const CLIENTS_PATH = path.join(DATA_DIR, 'torrent_clients.json')
 
 function loadClients(): SavedClient[] {
     try {