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

chore(main): release 2.1.1

CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## [2.1.1](https://github.com/Masutayunikon/FanKarr/compare/v2.1.0...v2.1.1) (2026-03-23)
+
+
+### Bug Fixes
+
+* torrent path to hash ([d9e453b](https://github.com/Masutayunikon/FanKarr/commit/d9e453b486b9fd85b69ee134bee2bd6a1a6d3702))
+
+## [2.1.0](https://github.com/Masutayunikon/FanKarr/compare/v2.0.0...v2.1.0) (2026-03-23)
+
+
+### ⚠ BREAKING CHANGES
+
+* **organize:** le format paths[] dans series/{id}.json passe de string[] à { infohash: string, path: string }[] — nécessite une mise à jour du scraper.
+
+### Bug Fixes
+
+* **organize:** buildFileMap matche par infohash au lieu d'index ou titre ([43ac2ed](https://github.com/Masutayunikon/FanKarr/commit/43ac2ed2e85d9e769735547817f19100d3d7f980))
+* **organize:** migration vers paths { infohash, path } pour le matching fichiers ([43ac2ed](https://github.com/Masutayunikon/FanKarr/commit/43ac2ed2e85d9e769735547817f19100d3d7f980))
+* **organize:** scanMediaPath adapté au nouveau format paths[] ([43ac2ed](https://github.com/Masutayunikon/FanKarr/commit/43ac2ed2e85d9e769735547817f19100d3d7f980))
+* **organize:** source fichier via save_path qBittorrent + fullPath relatif ([43ac2ed](https://github.com/Masutayunikon/FanKarr/commit/43ac2ed2e85d9e769735547817f19100d3d7f980))
+* remove logo ([48416c4](https://github.com/Masutayunikon/FanKarr/commit/48416c4fef3a964b05aa135ffd9e80d5dec9a81a))
+
 ## [2.0.0](https://github.com/Masutayunikon/FanKarr/compare/v1.14.0...v2.0.0) (2026-03-23)
 
 

server/index.ts

@@ -192,22 +192,36 @@ function extractTorrentsFromSerieData(sd: any): any[] {
 }
 
 // Construit resolved_episodes pour un torrent à partir des paths[torrentIdx]
-// paths[i] = chemin du fichier dans le torrent i → on extrait le filename
-function buildResolvedEpisodes(sd: any, torrentIdx: number, seasonFilter?: number): any[] {
+// Construit les épisodes résolus pour un torrent donné par son infohash
+function buildResolvedEpisodes(sd: any, hash: string, seasonFilter?: number): any[] {
     const resolved: any[] = []
+    const h = hash.toLowerCase()
+
     for (const season of sd.seasons ?? []) {
         if (seasonFilter !== undefined && season.season_number !== seasonFilter) continue
         for (const ep of season.episodes ?? []) {
-            const filePath = (ep.paths ?? [])[torrentIdx]
+            const paths: any[] = ep.paths ?? []
+
+            // Nouveau format { infohash, path } ou legacy string
+            let filePath: string | null = null
+            for (const p of paths) {
+                if (typeof p === 'string') {
+                    if (!filePath) filePath = p  // legacy fallback
+                } else if (p?.infohash?.toLowerCase() === h) {
+                    filePath = p.path
+                    break
+                }
+            }
             if (!filePath) continue
+
             const filename = filePath.split('/').pop() ?? filePath
             resolved.push({
-                episode_id    : ep.id,
-                episode_number: ep.episode_number,
-                season_number : season.season_number,
-                season_id     : season.id,
+                episode_id       : ep.id,
+                episode_number   : ep.episode_number,
+                season_number    : season.season_number,
+                season_id        : season.id,
                 filename,
-                original_filename: filename, // sera enrichi depuis l'API si besoin
+                original_filename: filename,
             })
         }
     }
@@ -331,7 +345,7 @@ function computeSerieDownloadState(
         if (!hash) continue
         const orgFiles = organized[hash] ?? {}
         if (Object.keys(orgFiles).length === 0) continue
-        const resolved = buildResolvedEpisodes(serieData, t._torrentIdx, t.season_number)
+        const resolved = buildResolvedEpisodes(serieData, hash, t.season_number)
         for (const ep of resolved) {
             if (orgFiles[ep.filename]) organizedEpisodeIds.add(ep.episode_id)
         }
@@ -433,15 +447,13 @@ app.get('/api/series/:id', requireAuth, async (req, res) => {
 
         if (serieData) {
             // ── Torrents niveau série (pack_integrale) ──────────────────
-            for (const [i, t] of (serieData.torrents ?? []).entries()) {
+            for (const t of (serieData.torrents ?? [])) {
                 const ref = { torrent_url: t.torrent_url, magnet: t.magnet, type: 'pack_integrale', raw: t.title, manual: t.manual ?? false }
-                integraleTorrents.push({ ...t, raw: t.title, _torrentIdx: i })
+                integraleTorrents.push({ ...t, raw: t.title })
 
-                // Marquer les épisodes disponibles via paths[i]
-                const resolved = buildResolvedEpisodes(serieData, i)
+                const resolved = buildResolvedEpisodes(serieData, t.infohash)
                 for (const ep of resolved) availableEpisodeIds.add(ep.episode_id)
 
-                // Vérifier organisés
                 const orgFiles = organized[t.infohash?.toLowerCase()] ?? {}
                 for (const ep of resolved) {
                     if (orgFiles[ep.filename]) organizedEpisodeIds.add(ep.episode_id)
@@ -450,11 +462,11 @@ app.get('/api/series/:id', requireAuth, async (req, res) => {
 
             // ── Torrents niveau saison (pack_saison) ────────────────────
             for (const season of serieData.seasons ?? []) {
-                for (const [i, t] of (season.torrents ?? []).entries()) {
+                for (const t of (season.torrents ?? [])) {
                     const ref = { torrent_url: t.torrent_url, magnet: t.magnet, type: 'pack_saison', raw: t.title, manual: t.manual ?? false }
                     seasonTorrentMapBySn[season.season_number] = ref
 
-                    const resolved = buildResolvedEpisodes(serieData, i, season.season_number)
+                    const resolved = buildResolvedEpisodes(serieData, t.infohash, season.season_number)
                     for (const ep of resolved) availableEpisodeIds.add(ep.episode_id)
 
                     const orgFiles = organized[t.infohash?.toLowerCase()] ?? {}
@@ -465,13 +477,15 @@ app.get('/api/series/:id', requireAuth, async (req, res) => {
 
                 // ── Torrents niveau épisode ─────────────────────────────
                 for (const ep of season.episodes ?? []) {
-                    for (const [i, t] of (ep.torrents ?? []).entries()) {
+                    for (const t of (ep.torrents ?? [])) {
                         const ref = { torrent_url: t.torrent_url, magnet: t.magnet, type: 'episode', raw: t.title, manual: t.manual ?? false }
                         episodeTorrentMap[ep.id] = ref
                         availableEpisodeIds.add(ep.id)
 
                         const orgFiles = organized[t.infohash?.toLowerCase()] ?? {}
-                        const filename = (ep.paths ?? [])[i]?.split('/').pop()
+                        const paths: any[] = ep.paths ?? []
+                        const match = paths.find((p: any) => typeof p === 'object' && p.infohash?.toLowerCase() === t.infohash?.toLowerCase())
+                        const filename = match ? match.path.split('/').pop() : null
                         if (filename && orgFiles[filename]) organizedEpisodeIds.add(ep.id)
                     }
                 }
@@ -562,7 +576,7 @@ app.get('/api/downloads', requireAuth, async (_req, res) => {
                     const allT = extractTorrentsFromSerieData(sd)
                     const match = allT.find((st: any) => st.infohash?.toLowerCase() === t.hash?.toLowerCase())
                     if (match) {
-                        const resolved = buildResolvedEpisodes(sd, match._torrentIdx, match.season_number)
+                        const resolved = buildResolvedEpisodes(sd, match.infohash, match.season_number)
                         totalFiles = resolved.length || 1
                         break
                     }

server/organize-worker.ts

@@ -79,19 +79,28 @@ function findTorrentByHash(hash: string, seriesData: any[]): { torrent: any; ser
     return null
 }
 
-// Construit la map filename → { season_number, original_filename }
-// depuis les paths[] de la série en utilisant l'index du torrent
-function buildFileMap(serieData: any, torrentIdx: number, seasonFilter?: number): Map<string, { season_number: number; original_filename: string }> {
-    const map = new Map<string, { season_number: number; original_filename: string }>()
+// Construit la map filename → { season_number, original_filename, fullPath }
+// en matchant par infohash dans ep.paths[]
+function buildFileMap(
+    serieData    : any,
+    hash         : string,
+    seasonFilter?: number
+): Map<string, { season_number: number; original_filename: string; fullPath: string }> {
+    const map = new Map<string, { season_number: number; original_filename: string; fullPath: string }>()
+    const h = hash.toLowerCase()
+
     for (const season of serieData.seasons ?? []) {
         if (seasonFilter !== undefined && season.season_number !== seasonFilter) continue
         for (const ep of season.episodes ?? []) {
-            const filePath = (ep.paths ?? [])[torrentIdx]
-            if (!filePath) continue
-            const filename = filePath.split('/').pop() ?? filePath
-            // original_filename vient de l'API Fankai (passé dans ep directement si disponible)
+            const match = (ep.paths ?? []).find((p: any) => p.infohash?.toLowerCase() === h)
+            if (!match) continue
+            const filename = match.path.split('/').pop() ?? match.path
             const original = ep.original_filename ?? filename
-            map.set(filename, { season_number: season.season_number, original_filename: original })
+            map.set(filename, {
+                season_number    : season.season_number,
+                original_filename: original,
+                fullPath         : match.path,
+            })
         }
     }
     return map
@@ -202,37 +211,21 @@ async function organizeTorrent(hash: string, name: string, savePath: string, ser
     }
 
     const { torrent, serieData } = found
-    const serieTitle = serieData.title ?? serieData.show_title ?? name
-    log(`[organize] ✓ Trouvé : ${torrent.title ?? name} — série: ${serieTitle}`)
-
-    // Déterminer l'index du torrent dans sa hiérarchie
-    let torrentIdx = 0
-    let seasonFilter: number | undefined
-    if (torrent._episode) {
-        // Torrent niveau épisode : paths[0] est le seul fichier
-        torrentIdx    = (torrent._episode.torrents ?? []).findIndex((t: any) => t.infohash?.toLowerCase() === hash.toLowerCase())
-        seasonFilter  = torrent._season?.season_number
-    } else if (torrent._season) {
-        torrentIdx    = (torrent._season.torrents ?? []).findIndex((t: any) => t.infohash?.toLowerCase() === hash.toLowerCase())
-        seasonFilter  = torrent._season.season_number
-    } else {
-        torrentIdx    = (serieData.torrents ?? []).findIndex((t: any) => t.infohash?.toLowerCase() === hash.toLowerCase())
-    }
-
-    // Construire la map filename → { season_number, original_filename }
-    const fileMap = buildFileMap(serieData, torrentIdx, seasonFilter)
+    const serieTitle    = serieData.title ?? serieData.show_title ?? name
+    const torrentTitle  = torrent.title ?? name
+    log(`[organize] ✓ Trouvé : ${torrentTitle} — série: ${serieTitle}`)
 
     // ── NFO/images depuis GitLab ──────────────────────────────
     if (nfoSupport) {
-        const serieDestRoot = path.join(mediaPath, serieTitle)
-        await downloadGitlabFolder(serieTitle, serieDestRoot)
+        await downloadGitlabFolder(serieTitle, path.join(mediaPath, serieTitle))
     }
 
     // ── Cas torrent épisode unique ────────────────────────────
     if (torrent._episode) {
-        const ep       = torrent._episode
-        const season   = torrent._season
-        const filePath = (ep.paths ?? [])[torrentIdx]
+        const ep      = torrent._episode
+        const season  = torrent._season
+        const match   = (ep.paths ?? []).find((p: any) => p.infohash?.toLowerCase() === hash.toLowerCase())
+        const filePath = match?.path ?? null
         const filename = filePath?.split('/').pop() ?? name
         const original = ep.original_filename ?? filename
         const destDir  = path.join(mediaPath, serieTitle, seasonFolder(season.season_number ?? 1))
@@ -240,12 +233,16 @@ async function organizeTorrent(hash: string, name: string, savePath: string, ser
 
         if (isOrganized(hash, filename)) return { ...result, total: 1, skipped: 1 }
 
-        const candidates = [
-            path.join(savePath, name, filename),
+        const candidates = filePath ? [
+            path.join(savePath, filePath),
+            path.join(completePath, filePath),
+            path.join(savePath, filename),
+            path.join(completePath, filename),
+        ] : [
             path.join(savePath, 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 } }
 
@@ -268,7 +265,10 @@ async function organizeTorrent(hash: string, name: string, savePath: string, ser
         return { ...result, total: 1, done: 1 }
     }
 
-    // ── Pack saison / intégrale : itérer sur les fichiers ─────
+    // ── Pack saison / intégrale ───────────────────────────────
+    const seasonFilter = torrent._season?.season_number
+    const fileMap = buildFileMap(serieData, hash, seasonFilter)
+
     if (fileMap.size === 0) {
         warn(`[organize] Aucun fichier mappé pour ${name}`)
         return result
@@ -276,13 +276,15 @@ async function organizeTorrent(hash: string, name: string, savePath: string, ser
 
     result.total = fileMap.size
 
-    for (const [filename, { season_number, original_filename }] of fileMap) {
+    for (const [filename, { season_number, original_filename, fullPath }] of fileMap) {
         if (isOrganized(hash, filename)) { result.skipped++; continue }
 
+        // Source : on utilise save_path + fullPath (chemin relatif exact dans le torrent)
+        // save_path vient de qBittorrent → résiste aux renommages de dossier
         const candidates = [
-            path.join(savePath, name, filename),
+            path.join(savePath, fullPath),
+            path.join(completePath, fullPath),
             path.join(savePath, filename),
-            path.join(completePath, name, filename),
             path.join(completePath, filename),
         ]
         let src: string | null = null
@@ -339,9 +341,9 @@ parentPort?.on('message', async (msg: any) => {
         }
 
         // Vérifier si déjà tout organisé
-        const { serieData } = found
-        const torrentIdx = (serieData.torrents ?? []).findIndex((st: any) => st.infohash?.toLowerCase() === t.hash.toLowerCase())
-        const fileMap = buildFileMap(serieData, torrentIdx)
+        const { torrent, serieData } = found
+        const seasonFilter   = torrent._season?.season_number
+        const fileMap        = buildFileMap(serieData, t.hash, seasonFilter)
         const allDone = fileMap.size > 0
             ? [...fileMap.keys()].every(f => organized[t.hash]?.[f])
             : !!organized[t.hash]?.[t.name]

server/organize.ts

@@ -51,39 +51,12 @@ export async function scanMediaPath(
     // Construire index filename → infohash depuis les seriesData
     const filenameIndex = new Map<string, string>()  // filename → infohash
     for (const sd of seriesData) {
-        // Torrents niveau série
-        for (const [i, t] of (sd.torrents ?? []).entries()) {
-            const hash = t.infohash?.toLowerCase()
-            if (!hash) continue
-            for (const season of sd.seasons ?? []) {
-                for (const ep of season.episodes ?? []) {
-                    const filePath = (ep.paths ?? [])[i]
-                    if (!filePath) continue
-                    const filename = filePath.split('/').pop()
-                    if (filename) filenameIndex.set(filename, hash)
-                }
-            }
-        }
-        // Torrents niveau saison
         for (const season of sd.seasons ?? []) {
-            for (const [i, t] of (season.torrents ?? []).entries()) {
-                const hash = t.infohash?.toLowerCase()
-                if (!hash) continue
-                for (const ep of season.episodes ?? []) {
-                    const filePath = (ep.paths ?? [])[i]
-                    if (!filePath) continue
-                    const filename = filePath.split('/').pop()
-                    if (filename) filenameIndex.set(filename, hash)
-                }
-            }
-            // Torrents niveau épisode
             for (const ep of season.episodes ?? []) {
-                for (const [i, t] of (ep.torrents ?? []).entries()) {
-                    const hash = t.infohash?.toLowerCase()
-                    if (!hash) continue
-                    const filePath = (ep.paths ?? [])[i]
-                    if (!filePath) continue
-                    const filename = filePath.split('/').pop()
+                for (const p of ep.paths ?? []) {
+                    const hash = p.infohash?.toLowerCase()
+                    if (!hash || !p.path) continue
+                    const filename = p.path.split('/').pop()
                     if (filename) filenameIndex.set(filename, hash)
                 }
             }