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

chore(main): release 1.11.1

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [1.11.1](https://github.com/Masutayunikon/FanKarr/compare/v1.11.0...v1.11.1) (2026-03-13)
+
+
+### Bug Fixes
+
+* worker now work on multiple github files pages ([71784cd](https://github.com/Masutayunikon/FanKarr/commit/71784cd8bd8f3ea5dc7423687b080c1588d70854))
+
+## [1.11.0](https://github.com/Masutayunikon/FanKarr/compare/v1.10.3...v1.11.0) (2026-03-13)
+
+
+### Features
+
+* fix worker for multiple series in integral (one piece fix ?) ([2c773f8](https://github.com/Masutayunikon/FanKarr/commit/2c773f83ffd76d82c77a50a9c5729f20ea22b450))
+
 ## [1.10.3](https://github.com/Masutayunikon/FanKarr/compare/v1.10.2...v1.10.3) (2026-03-13)
 
 

server/organize-worker.ts

@@ -139,18 +139,25 @@ async function downloadGitlabFolder(serieTitle: string, destRoot: string): Promi
 
     log(`[nfo] Récupération dossier GitLab: ${gitlabTitle}`)
 
-    // Lister récursivement tous les fichiers du dossier
-    let files: any[]
+    // Lister récursivement tous les fichiers du dossier (pagination GitLab)
+    let files: any[] = []
     try {
-        files = await fetchJson(
-            `${GITLAB_API}/tree?path=${encodeURIComponent(folderPath)}&recursive=true&per_page=100&ref=main`
-        )
+        let page = 1
+        while (true) {
+            const batch = await fetchJson(
+                `${GITLAB_API}/tree?path=${encodeURIComponent(folderPath)}&recursive=true&per_page=100&page=${page}&ref=main`
+            )
+            if (!Array.isArray(batch) || batch.length === 0) break
+            files.push(...batch)
+            if (batch.length < 100) break
+            page++
+        }
     } catch (err) {
         warn(`[nfo] Dossier GitLab introuvable pour "${gitlabTitle}": ${err instanceof Error ? err.message : err}`)
         return
     }
 
-    if (!Array.isArray(files) || files.length === 0) {
+    if (files.length === 0) {
         warn(`[nfo] Aucun fichier trouvé sur GitLab pour "${gitlabTitle}"`)
         return
     }
@@ -218,8 +225,35 @@ async function organizeTorrent(hash: string, name: string, savePath: string) {
 
     // ── Téléchargement NFO/images depuis GitLab ───────────────
     if (nfoSupport) {
-        const serieDestRoot = path.join(mediaPath, serieTitle)
-        await downloadGitlabFolder(serieTitle, serieDestRoot)
+        // Collecter tous les titres de séries distincts depuis resolved_episodes
+        // (un pack_integrale peut mélanger plusieurs séries, ex: One Piece Yabai + Kaï)
+        const serieTitlesMap = new Map<number, string>()
+
+        // Titre principal du torrent
+        serieTitlesMap.set(torrent.serie_id ?? 0, serieTitle)
+
+        // Titres alternatifs depuis resolved_episodes
+        // resolved_episodes n'a pas toujours serie_title → on cherche dans torrent_final.json
+        const allTorrents: any[] = (() => {
+            try { return JSON.parse(fs.readFileSync(TORRENTS_PATH, 'utf-8')) } catch { return [] }
+        })()
+        const serieIdToTitle = new Map<number, string>()
+        for (const t of allTorrents) {
+            if (t.serie_id && t.serie_title) serieIdToTitle.set(t.serie_id, t.serie_title)
+        }
+
+        for (const ep of torrent.resolved_episodes ?? []) {
+            if (ep.serie_id && !serieTitlesMap.has(ep.serie_id)) {
+                const title = ep.serie_title ?? serieIdToTitle.get(ep.serie_id)
+                if (title) serieTitlesMap.set(ep.serie_id, title)
+            }
+        }
+
+        // Télécharger NFO pour chaque série distincte
+        for (const title of serieTitlesMap.values()) {
+            const serieDestRoot = path.join(mediaPath, title)
+            await downloadGitlabFolder(title, serieDestRoot)
+        }
     }
 
     // ── Cas fichier unique ────────────────────────────────────
@@ -264,15 +298,16 @@ async function organizeTorrent(hash: string, name: string, savePath: string) {
     const epByNum = new Map<number, number>()  // ep_number → season_number
     for (const ep of torrent.resolved_episodes ?? []) {
         if (ep.episode_number !== undefined && ep.season_number !== undefined)
-            epByNum.set(ep.episode_number, ep.season_number)
+            epByNum.set(Number(ep.episode_number), ep.season_number)
     }
 
     for (const tf of torrentFiles) {
-        const sn: number | null = tf.season_number ?? null
+        const sn: number | null = tf.season_number != null ? Number(tf.season_number) : null
+        const tfNum = tf.num !== undefined ? Number(tf.num) : undefined
         if (sn !== null) {
             filenameSeasonMap.set(tf.filename, sn)
-        } else if (tf.num !== undefined && epByNum.has(tf.num)) {
-            filenameSeasonMap.set(tf.filename, epByNum.get(tf.num)!)
+        } 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)
         }