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

chore(main): release 1.11.3
2026-03-20 16:08:46 +01:00 · 2026-03-20 15:41:14 +01:00 · 2026-03-20 15:40:40 +01:00 · 2026-03-20 15:40:28 +01:00 · 2026-03-20 02:11:37 +01:00 · 2026-03-20 02:11:01 +01:00
17 changed files with 296 additions and 90 deletions
@@ -2,7 +2,7 @@ node_modules
 .git
 .gitignore
 *.md
-data
+config
 .env
 .env.*
 !.env.example
@@ -98,7 +98,7 @@ jobs:
        shell: pwsh

      - name: Build worker
-        run: bun build server/organize-worker.ts --target ${{ matrix.bun-target }} --outfile organize-worker.js
+        run: bun build server/organize-worker.ts --target node --outfile organize-worker.js

      - name: Package archive (Windows)
        if: matrix.target == 'windows-x64'
@@ -1,5 +1,106 @@
 # Changelog

+## [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)
+
+
+### Bug Fixes
+
+* port 9898, /config volume, Kaï→Kai matching, NFO pagination GitLab, saison 0 specials, JoJo/Hokuto strict season resolve ([3a278ba](https://github.com/Masutayunikon/FanKarr/commit/3a278ba33388d6ff6f33413d7696d58d0172c953))
+
+## [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)
+
+
+### Bug Fixes
+
+* worker path ([360572b](https://github.com/Masutayunikon/FanKarr/commit/360572b8be64dafbb452dfcb849a40305bf1b8cf))
+
+## [1.10.2](https://github.com/Masutayunikon/FanKarr/compare/v1.10.1...v1.10.2) (2026-03-13)
+
+
+### Bug Fixes
+
+* add target node ([58b09f2](https://github.com/Masutayunikon/FanKarr/commit/58b09f2267345c60ed589c160f7e47698e9be9a4))
+
+## [1.10.1](https://github.com/Masutayunikon/FanKarr/compare/v1.10.0...v1.10.1) (2026-03-13)
+
+
+### Bug Fixes
+
+* add target node ([6c629e0](https://github.com/Masutayunikon/FanKarr/commit/6c629e0f6b4d38453cfb22fd315e02d9e8750c45))
+
+## [1.10.0](https://github.com/Masutayunikon/FanKarr/compare/v1.9.5...v1.10.0) (2026-03-13)
+
+
+### Features
+
+* add favicon ([dc4a2d4](https://github.com/Masutayunikon/FanKarr/commit/dc4a2d48f5c0cddd8e431ce33a69fc9146143fb6))
+* add README.md ([4eb487a](https://github.com/Masutayunikon/FanKarr/commit/4eb487a96beed8c82cb19d9a9b63c3b69d841386))
+* add windows / linux / macos binaries on build ([f17a73b](https://github.com/Masutayunikon/FanKarr/commit/f17a73b9591fb49a75bd5fcdadf1970585877dab))
+* **auth:** génération automatique du JWT secret au démarrage ([eaa52e9](https://github.com/Masutayunikon/FanKarr/commit/eaa52e90900ff0e198beae190d7ad0298a702482))
+* cache images ([da460de](https://github.com/Masutayunikon/FanKarr/commit/da460de60c4eec6851ea58ce0ae646a1208f6018))
+* initial project ([eaf01cf](https://github.com/Masutayunikon/FanKarr/commit/eaf01cfc591dd72f9b093b533ced6c12a6c490a1))
+* make the organizer threaded to not consumme api main thread ([14c0e56](https://github.com/Masutayunikon/FanKarr/commit/14c0e567525e179da82c6b58d9886cc3d544a98d))
+* **organize:** scan initial mediaPath + logs fichier centralisés ([807f786](https://github.com/Masutayunikon/FanKarr/commit/807f786b038579ca9d7cd136998f759cecae2255))
+* **organize:** worker thread + badges statut + notifications ([b7242bc](https://github.com/Masutayunikon/FanKarr/commit/b7242bc95f59d259ab1a636aa304bf149f895041))
+* **serie:** badges état organisation sur épisodes et saisons ([4d3a6bd](https://github.com/Masutayunikon/FanKarr/commit/4d3a6bd276907f793452429d62693fafc1d804db))
+* **ui:** états catalogue + logs + badges erreurs downloads ([5326828](https://github.com/Masutayunikon/FanKarr/commit/5326828d89aa10a53bbe1ac4016a5eee4d5dbc97))
+* UX improvements, folder picker, download state & NFO support ([20771fc](https://github.com/Masutayunikon/FanKarr/commit/20771fc31c187fd1fea8aa9b07093b15621a5b85))
+
+
+### 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))
+* add user permissions when the scripts is launched ([501bbfc](https://github.com/Masutayunikon/FanKarr/commit/501bbfcf18c236f7ac382c50d90482b1f51244c1))
+* CatalogView.vue badge deleted ([d897192](https://github.com/Masutayunikon/FanKarr/commit/d8971920462efd8d1d99eb867016c96713dfef58))
+* docker errors ([2702764](https://github.com/Masutayunikon/FanKarr/commit/27027642eb55b75adb04446a88e5007e88f75948))
+* docker is able to change directory ([af08f7d](https://github.com/Masutayunikon/FanKarr/commit/af08f7d9d4fb2e23c5feac6d33b2ef495f9d91b2))
+* empty docker-compose.yml ([303dfd8](https://github.com/Masutayunikon/FanKarr/commit/303dfd85b5d033e2b247fd064ae1ae612fdb49e1))
+* logger third args ([5abac1e](https://github.com/Masutayunikon/FanKarr/commit/5abac1e11236ed1e8f7f0de7f0cff881d1b60f10))
+* nfo settings and add json file when not existing ([0b6bfa6](https://github.com/Masutayunikon/FanKarr/commit/0b6bfa6a81d99353be877ed6d99687ad3d55adbc))
+* organize file ([d6550e9](https://github.com/Masutayunikon/FanKarr/commit/d6550e9961789073be1583e03d599afb6d295004))
+* organize use torrent hash and not name ([61901f9](https://github.com/Masutayunikon/FanKarr/commit/61901f9014a759e2950311cd96266ea8201fa902))
+* path ([314f817](https://github.com/Masutayunikon/FanKarr/commit/314f817280f39d10eb21c4784f2aea41b9a6d32c))
+* remove user creation in entrypoint.sh ([92d9fa6](https://github.com/Masutayunikon/FanKarr/commit/92d9fa6b01f1e2de1ceb13528afd309b21f9d4cb))
+* rename if the torrent name is not the same as the api ([b8fcf71](https://github.com/Masutayunikon/FanKarr/commit/b8fcf71f54ab14e5572a7553d8554b617b4981b7))
+* season fallback ([e9b5091](https://github.com/Masutayunikon/FanKarr/commit/e9b5091242d73be77bf6fb525ce2865554e336cc))
+* skip excluded folders ([edf806d](https://github.com/Masutayunikon/FanKarr/commit/edf806d9bc48d4de1c3609a4b0405442305d546e))
+* title readme align ([8ba3b37](https://github.com/Masutayunikon/FanKarr/commit/8ba3b370d1e2cd1565f9c2453be8706e3c198243))
+* use bcryptjs for compilation ([6a6981e](https://github.com/Masutayunikon/FanKarr/commit/6a6981e10a3a9019f49982d7680e562872ee95a5))
+* worker outside the exe ([c2ab58e](https://github.com/Masutayunikon/FanKarr/commit/c2ab58e7b2c34aae09b50dbdfde3277da4c276ff))
+* worker outside the exe ([a47c3a4](https://github.com/Masutayunikon/FanKarr/commit/a47c3a43fb5dbbedd87c9ac2d584c3290fcc6097))
+* workflow directory ([baebd8f](https://github.com/Masutayunikon/FanKarr/commit/baebd8fae146db70ee1cce0c876d2d3bc0f9bf4e))
+* workflow directory ([d8405c1](https://github.com/Masutayunikon/FanKarr/commit/d8405c1589f277cd8fdd3e1fd15cc02d98834aa6))
+* workflow permmisions ([3620bfb](https://github.com/Masutayunikon/FanKarr/commit/3620bfb71d8c2774b23c097e5e01326099c2f180))
+
+## [1.9.5](https://github.com/Masutayunikon/FanKarr/compare/v1.9.4...v1.9.5) (2026-03-13)
+
+
+### Bug Fixes
+
+* worker outside the exe ([c2ab58e](https://github.com/Masutayunikon/FanKarr/commit/c2ab58e7b2c34aae09b50dbdfde3277da4c276ff))
+
 ## [1.9.4](https://github.com/Masutayunikon/FanKarr/compare/v1.9.3...v1.9.4) (2026-03-13)


@@ -24,7 +24,7 @@ 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
+RUN mkdir -p /config

 EXPOSE 3001
 ENV NODE_ENV=production
@@ -2,7 +2,6 @@

 # Fankarr

-
 ![Version](https://img.shields.io/github/v/release/masutayunikon/fankarr?style=flat-square&color=e8513a&label=version)
 ![Docker Image Size](https://img.shields.io/docker/image-size/masutayunikon/fankarr/latest?style=flat-square&color=1e2d3d&label=image)
 ![Docker Pulls](https://img.shields.io/docker/pulls/masutayunikon/fankarr?style=flat-square&color=1e2d3d)
@@ -11,7 +10,7 @@
 ![Node](https://img.shields.io/badge/node-20-5a7a94?style=flat-square)
 ![Vue](https://img.shields.io/badge/vue-3-42b883?style=flat-square)

-**Gestionnaire de téléchargements pour le catalogue [Fankai](https://fankai.fr)**  
+**Gestionnaire de téléchargements pour le catalogue [Fankai](https://fankai.fr)**
 Inspiré de Radarr/Sonarr — interface dédiée aux éditions Kai & Yabai

 </div>
@@ -83,11 +82,10 @@ services:
      - PGID=1000        # GID de votre utilisateur (id -g)
      - TZ=Europe/Paris  # Votre timezone
    volumes:
-      - ./data:/app/data                            # Config, logs, base de données
-      - /votre/chemin/media:/media/Kai              # Destination Jellyfin
-      - /votre/chemin/complete:/downloads/complete  # Dossier complétés qBittorrent
+      - ./config:/config  # Config, logs, base de données
+      - /votre/chemin:/media  # Racine de votre médiathèque (voir note hardlinks)
    ports:
-      - 3001:3001
+      - 9898:9898
    restart: unless-stopped
 ```

@@ -95,15 +93,19 @@ services:
 docker compose up -d
 ```

+> **⚠️ Note sur les hardlinks** : Pour que le mode `hardlink` fonctionne, vos dossiers de téléchargement complets et votre médiathèque doivent être sur le **même filesystem**. La solution recommandée est de monter un seul volume racine (ex: `/votre/chemin:/media`) et de configurer vos chemins à l'intérieur — comme le font Radarr et Sonarr.
+>
+> Vous pouvez tout à fait monter plusieurs volumes si vous le souhaitez, mais dans ce cas les hardlinks ne seront pas possibles entre deux volumes différents et Fankarr basculera automatiquement en copie.
+
 ### Binaire autonome (Windows / Linux / macOS)

 Téléchargez l'archive correspondant à votre système depuis les [Releases GitHub](https://github.com/masutayunikon/fankarr/releases/latest) :

-| Système | Archive |
-|---|---|
-| Windows x64 | `fankarr-windows-x64.zip` |
-| Linux x64 | `fankarr-linux-x64.zip` |
-| macOS (Apple Silicon) | `fankarr-macos.zip` |
+| Système               | Archive                   |
+| --------------------- | ------------------------- |
+| Windows x64           | `fankarr-windows-x64.zip` |
+| Linux x64             | `fankarr-linux-x64.zip`   |
+| macOS (Apple Silicon) | `fankarr-macos.zip`       |

 Extrayez l'archive — elle contient le binaire **et** le dossier `public/` qui doivent rester ensemble :

@@ -120,22 +122,22 @@ chmod +x fankarr
 ./fankarr
 ```

-Fankarr sera accessible sur `http://localhost:3001`. Les données (config, logs, base de données) sont sauvegardées dans un dossier `data/` créé automatiquement à côté du binaire.
+Fankarr sera accessible sur `http://localhost:9898`. Les données (config, logs, base de données) sont sauvegardées dans un dossier `data/` créé automatiquement à côté du binaire.

 ### Variables d'environnement

-| Variable | Défaut | Description |
-|---|---|---|
-| `PUID` | `1000` | UID utilisateur pour les permissions fichiers (Docker) |
-| `PGID` | `1000` | GID utilisateur pour les permissions fichiers (Docker) |
-| `TZ` | — | Timezone (ex: `Europe/Paris`) |
-| `PORT` | `3001` | Port d'écoute du serveur |
-| `JWT_SECRET` | auto-généré | Secret JWT — généré automatiquement dans `data/secret.key` si absent |
-| `GITHUB_RAW_URL` | repo scraper | URL du `torrent_final.json` à utiliser |
+| Variable         | Défaut       | Description                                                             |
+| ---------------- | ------------ | ----------------------------------------------------------------------- |
+| `PUID`           | `1000`       | UID utilisateur pour les permissions fichiers (Docker)                  |
+| `PGID`           | `1000`       | GID utilisateur pour les permissions fichiers (Docker)                  |
+| `TZ`             | —            | Timezone (ex: `Europe/Paris`)                                           |
+| `PORT`           | `9898`       | Port d'écoute du serveur                                                |
+| `JWT_SECRET`     | auto-généré  | Secret JWT — généré automatiquement dans `/config/secret.key` si absent |
+| `GITHUB_RAW_URL` | repo scraper | URL du `torrent_final.json` à utiliser                                  |

 ### Premier démarrage

-1. Ouvrir `http://localhost:3001`
+1. Ouvrir `http://localhost:9898`
 2. Créer un mot de passe à la première connexion
 3. Aller dans **Paramètres** → ajouter votre client qBittorrent
 4. Vérifier les chemins `completePath` et `mediaPath`
@@ -173,12 +175,12 @@ Fankarr est disponible dans l'appstore personnalisé. Pour l'installer :

 ## Stack technique

-| Couche | Technologie |
-|---|---|
-| Frontend | Vue 3 + Vite + Tailwind CSS |
-| Backend | Express 5 + TypeScript |
-| Auth | JWT + bcrypt |
-| Packaging Docker | `node:20-slim` + pnpm + gosu (PUID/PGID) |
+| Couche            | Technologie                              |
+| ----------------- | ---------------------------------------- |
+| Frontend          | Vue 3 + Vite + Tailwind CSS              |
+| Backend           | Express 5 + TypeScript                   |
+| Auth              | JWT + bcrypt                             |
+| Packaging Docker  | `node:20-slim` + pnpm + gosu (PUID/PGID) |
 | Packaging binaire | Bun (self-contained, pas de Node requis) |

 ---
@@ -1,15 +1,14 @@
-services:
-  fankarr:
-    image: masutayunikon/fankarr:latest
-    container_name: fankarr
-    environment:
-      - PUID=1000        # UID de votre utilisateur (id -u)
-      - PGID=1000        # GID de votre utilisateur (id -g)
-      - TZ=Europe/Paris  # Votre timezone
-    volumes:
-      - ./data:/app/data                        # Config, logs, base de données
-      - /votre/chemin/media:/media/Kai          # Destination Jellyfin
-      - /votre/chemin/complete:/downloads/complete  # Dossier complétés qBittorrent
-    ports:
-      - 3001:3001
-    restart: unless-stopped
+fankarr:
+  image: masutayunikon/fankarr:latest
+  container_name: fankarr
+  environment:
+    - PUID=1000        # UID de votre utilisateur (id -u)
+    - PGID=1000        # GID de votre utilisateur (id -g)
+    - TZ=Europe/Paris  # Votre timezone
+  volumes:
+    - ./config:/config  # Config, logs, base de données
+    - /votre/chemin:/media  # Racine de votre mediatheque (hardlinks compatibles)
+  ports:
+    - 9898:9898
+  restart: unless-stopped
+ 
@@ -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
@@ -8,9 +8,9 @@
    "dev:server": "tsx watch server/index.ts",
    "dev:client": "vite",
    "build": "vite build && tsc -p tsconfig.server.json",
-    "build:bun:linux": "bun build server/index.ts --compile --target bun-linux-x64    --outfile binaries/fankarr-linux-x64 && bun build server/organize-worker.ts --target bun-linux-x64    --outfile binaries/organize-worker.js",
-    "build:bun:windows": "bun build server/index.ts --compile --target bun-windows-x64  --outfile binaries/fankarr-windows-x64.exe && bun build server/organize-worker.ts --target bun-windows-x64  --outfile binaries/organize-worker.js",
-    "build:bun:macos": "bun build server/index.ts --compile --target bun-darwin-arm64 --outfile binaries/fankarr-macos && bun build server/organize-worker.ts --target bun-darwin-arm64 --outfile binaries/organize-worker.js",
+    "build:bun:linux": "bun build server/index.ts --compile --target bun-linux-x64    --outfile binaries/fankarr-linux-x64 && bun build server/organize-worker.ts --target node --outfile binaries/organize-worker.js",
+    "build:bun:windows": "bun build server/index.ts --compile --target bun-windows-x64  --outfile binaries/fankarr-windows-x64.exe && bun build server/organize-worker.ts --target node --outfile binaries/organize-worker.js",
+    "build:bun:macos": "bun build server/index.ts --compile --target bun-darwin-arm64 --outfile binaries/fankarr-macos && bun build server/organize-worker.ts --target node --outfile binaries/organize-worker.js",
    "build:bun:all": "pnpm build:bun:linux && pnpm build:bun:windows && pnpm build:bun:macos",
    "start": "node dist/server/index.js",
    "preview": "vite preview"
@@ -5,7 +5,7 @@ import jwt from 'jsonwebtoken'
 import type { Request, Response, NextFunction } from 'express'
 import { JWT_SECRET } from './secret.js'

-const DATA_PATH = path.join(process.cwd(), 'data', 'auth.json')
+const DATA_PATH = path.join(process.cwd(), 'config', 'auth.json')
 const SALT_ROUNDS = 10

 interface AuthData {
@@ -24,10 +24,15 @@ 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) || 3001
+const PORT = Number(process.env.PORT) || 9898
 const FANKAI_API    = 'https://metadata.fankai.fr'
-const TORRENTS_PATH = path.join(BASE_DIR, 'data', 'torrent_final.json')
+const TORRENTS_PATH = path.join(DATA_DIR, 'torrent_final.json')
 const GITHUB_RAW_URL = process.env.GITHUB_RAW_URL
    ?? 'https://raw.githubusercontent.com/masutayunikon/fankarr-scraper/main/data/torrent_final.json'

@@ -107,6 +112,15 @@ async function fankaiGet(endpoint: string): Promise<any> {
    if (!res.ok) throw new Error(`Fankai API ${res.status}: ${endpoint}`)
    return res.json()
 }
+function normalizeTitle(s: string): string {
+    return s.toLowerCase()
+        .normalize('NFD')
+        .replace(/[\u0300-\u036f]/g, '')  // strip accents (ï→i, é→e...)
+        .replace(/[^a-z0-9]/g, ' ')
+        .replace(/\s+/g, ' ')
+        .trim()
+}
+
 function indexBySerie(torrents: any[]): Map<number, any[]> {
    const map = new Map<number, any[]>()
    for (const t of torrents) {
@@ -117,6 +131,18 @@ function indexBySerie(torrents: any[]): Map<number, any[]> {
    return map
 }

+function indexByNormalizedTitle(torrents: any[]): Map<string, any[]> {
+    const map = new Map<string, any[]>()
+    for (const t of torrents) {
+        const title = t.serie_title || t.show_title
+        if (!title) continue
+        const key = normalizeTitle(title)
+        if (!map.has(key)) map.set(key, [])
+        map.get(key)!.push(t)
+    }
+    return map
+}
+
 // ── Series ─────────────────────────────────────────────────────

 function computeSerieDownloadState(
@@ -154,12 +180,13 @@ function computeSerieDownloadState(
 app.get('/api/series', requireAuth, async (_req, res) => {
    try {
        const [apiData, torrents] = await Promise.all([fankaiGet('/series'), Promise.resolve(readTorrents())])
-        const byId = indexBySerie(torrents)
+        const byId        = indexBySerie(torrents)
+        const byNormTitle = indexByNormalizedTitle(torrents)

        // Charger organized.json
        let organized: Record<string, Record<string, string>> = {}
        try {
-            const orgPath = path.join(process.cwd(), 'data', 'organized.json')
+            const orgPath = path.join(DATA_DIR, 'organized.json')
            if (fs.existsSync(orgPath))
                organized = JSON.parse(fs.readFileSync(orgPath, 'utf-8'))
        } catch {}
@@ -175,9 +202,30 @@ app.get('/api/series', requireAuth, async (_req, res) => {
            }
        } catch {}

-        const seriesList = Array.isArray(apiData) ? apiData : (apiData.series ?? [])
+        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)
+        const seenTitles = new Map<string, any>()
+        for (const serie of seriesRaw) {
+            const key = normalizeTitle(serie.title ?? serie.show_title ?? '')
+            if (!seenTitles.has(key)) {
+                seenTitles.set(key, serie)
+            } else {
+                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)
+            }
+        }
+        const seriesList = [...seenTitles.values()]
+
        res.json({ series: seriesList.map((serie: any) => {
-                const serieTorrents = byId.get(serie.id) ?? []
+                // Fallback par titre normalisé si l'ID ne matche pas (Kaï→Kai migration)
+                const serieTorrents = byId.get(serie.id)
+                    ?? byNormTitle.get(normalizeTitle(serie.title ?? serie.show_title ?? ''))
+                    ?? []
                return {
                    ...serie,
                    torrent_count : serieTorrents.length,
@@ -200,10 +248,19 @@ app.get('/api/series/:id', requireAuth, async (req, res) => {
            return { ...season, episodes: Array.isArray(epsData) ? epsData : (epsData.episodes ?? []) }
        }))

-        const torrents = readTorrents().filter(t => t.serie_id === id)
+        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 ||
+            normalizeTitle(t.serie_title ?? t.show_title ?? '') === normApiTitle
+        )
        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> = {}
        const seasonTorrentMap : Record<number, any> = {}
        const integraleTorrents: any[] = []
        const packEpisodesTorrents: any[] = []
@@ -212,7 +269,12 @@ app.get('/api/series/:id', requireAuth, async (req, res) => {
            const ref = { torrent_url: t.torrent_url, magnet: t.magnet, type: t.type, raw: t.raw }
            for (const ep of t.resolved_episodes ?? []) {
                availableEpisodeIds.add(ep.episode_id)
-                if (t.type === 'episode') episodeTorrentMap[ep.episode_id] = ref
+                const snEnKey = `${ep.season_number}:${ep.episode_number}`
+                availableBySnEn.add(snEnKey)
+                if (t.type === 'episode') {
+                    episodeTorrentMap[ep.episode_id] = ref
+                    episodeTorrentMapBySnEn[snEnKey] = ref
+                }
            }
            if (t.type === 'pack_saison') {
                const rs: any[] = t.resolved_seasons ?? []
@@ -265,7 +327,7 @@ app.get('/api/series/:id', requireAuth, async (req, res) => {
        // Charger organized.json pour les badges d'état
        let organized: Record<string, Record<string, string>> = {}
        try {
-            const orgPath = path.join(process.cwd(), 'data', 'organized.json')
+            const orgPath = path.join(DATA_DIR, 'organized.json')
            if (fs.existsSync(orgPath))
                organized = JSON.parse(fs.readFileSync(orgPath, 'utf-8'))
        } catch {}
@@ -273,6 +335,7 @@ app.get('/api/series/:id', requireAuth, async (req, res) => {
        // 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) {
            const hash  = t.infohash?.toLowerCase()
            const files = t.torrent_files ?? []
@@ -286,6 +349,7 @@ app.get('/api/series/:id', requireAuth, async (req, res) => {
                )
                if (epFile ? orgFiles[epFile.filename] : Object.keys(orgFiles).length > 0) {
                    organizedEpisodeIds.add(ep.episode_id)
+                    organizedBySnEn.add(`${ep.season_number}:${ep.episode_number}`)
                }
            }
        }
@@ -293,9 +357,13 @@ app.get('/api/series/:id', requireAuth, async (req, res) => {
        const enrichedSeasons = seasonsWithEpisodes.map((season: any) => {
            const eps = season.episodes.map((ep: any) => ({
                ...ep,
-                available : availableEpisodeIds.has(ep.id),
-                torrent   : episodeTorrentMap[ep.id] ?? null,
-                organized : organizedEpisodeIds.has(ep.id),
+                available : availableEpisodeIds.has(ep.id)
+                    || availableBySnEn.has(`${season.season_number}:${ep.episode_number}`),
+                torrent   : episodeTorrentMap[ep.id]
+                    ?? episodeTorrentMapBySnEn[`${season.season_number}:${ep.episode_number}`]
+                    ?? null,
+                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
@@ -341,14 +409,14 @@ app.get('/api/downloads', requireAuth, async (_req, res) => {
        // Enrichir avec l'état d'organisation
        let organized: Record<string, Record<string, string>> = {}
        try {
-            const orgPath = path.join(process.cwd(), 'data', 'organized.json')
+            const orgPath = path.join(DATA_DIR, 'organized.json')
            if (fs.existsSync(orgPath))
                organized = JSON.parse(fs.readFileSync(orgPath, 'utf-8'))
        } catch {}

        let torrentFinal: any[] = []
        try {
-            const tfPath = path.join(process.cwd(), 'data', 'torrent_final.json')
+            const tfPath = path.join(process.cwd(), 'config', 'torrent_final.json')
            if (fs.existsSync(tfPath))
                torrentFinal = JSON.parse(fs.readFileSync(tfPath, 'utf-8'))
        } catch {}
@@ -487,7 +555,7 @@ app.post('/api/update', requireAuth, async (_req, res) => {
 app.post('/api/scan', requireAuth, async (_req, res) => {
    try {
        const { mediaPath } = readSettings()
-        const ORGANIZED_PATH = path.join(process.cwd(), 'data', 'organized.json')
+        const ORGANIZED_PATH = path.join(DATA_DIR, 'organized.json')
        const result = await scanMediaPath(mediaPath, TORRENTS_PATH, ORGANIZED_PATH)
        logger.info('api', `Scan manuel: ${result.found} fichiers scannés, ${result.added} ajoutés`)
        res.json({ ok: true, ...result })
@@ -530,7 +598,7 @@ app.listen(PORT, async () => {
    console.log(`[fankarr] Serveur sur http://localhost:${PORT}`)

    // Scan initial du mediaPath pour reconnaître les fichiers déjà présents
-    const ORGANIZED_PATH = path.join(process.cwd(), 'data', 'organized.json')
+    const ORGANIZED_PATH = path.join(DATA_DIR, 'organized.json')
    const { mediaPath } = readSettings()
    scanMediaPath(mediaPath, TORRENTS_PATH, ORGANIZED_PATH).catch(err =>
        logger.error('organize', `scanMediaPath échoué: ${err}`)
@@ -19,7 +19,7 @@ export interface LogEntry {
    meta?   : Record<string, any>
 }

-const LOGS_PATH    = path.join(process.cwd(), 'data', 'logs.jsonl')
+const LOGS_PATH    = path.join(process.cwd(), 'config', 'logs.jsonl')
 const MAX_LINES    = 2000   // rotation auto au-delà
 const IS_PROD      = process.env.NODE_ENV === 'production'

@@ -23,8 +23,8 @@ const BASE_DIR = _isBunBinary
    ? path.dirname((process as any).execPath)
    : process.cwd()

-const TORRENTS_PATH  = path.join(BASE_DIR, 'data', 'torrent_final.json')
-const ORGANIZED_PATH = path.join(BASE_DIR, 'data', 'organized.json')
+const TORRENTS_PATH  = path.join(BASE_DIR, 'config', 'torrent_final.json')
+const ORGANIZED_PATH = path.join(BASE_DIR, 'config', 'organized.json')

 // ─── Utils log ────────────────────────────────────────────────
 // Le worker tourne dans un thread séparé — il passe les logs au thread principal
@@ -39,7 +39,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(), 'data', 'settings.json')
+        const p = path.join(process.cwd(), 'config', '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 } }
@@ -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)
        }
@@ -17,9 +17,10 @@ let workerRunning = false
 // En binaire Bun compilé : le worker est à côté de l'exécutable
 // En Docker/dev : à côté du fichier courant
 function resolveWorkerPath(): string {
-    const _isBunBinary = typeof (globalThis as any).Bun !== 'undefined'
-        && path.dirname((process as any).execPath) !== process.cwd()
-    if (_isBunBinary) {
+    // Si Bun est présent → le worker est toujours à côté de l'exécutable
+    // (que ce soit un binaire compilé ou `bun run` en dev)
+    // En Node/tsx → on utilise import.meta.url
+    if (typeof (globalThis as any).Bun !== 'undefined') {
        return path.join(path.dirname((process as any).execPath), 'organize-worker.js')
    }
    return path.join(path.dirname(new URL(import.meta.url).pathname), 'organize-worker.js')
@@ -10,7 +10,7 @@ import fs       from 'fs'
 import path     from 'path'
 import crypto   from 'crypto'

-const SECRET_PATH = path.join(process.cwd(), 'data', 'secret.key')
+const SECRET_PATH = path.join(process.cwd(), 'config', 'secret.key')

 function generateSecret(): string {
    return crypto.randomBytes(48).toString('hex')
@@ -6,7 +6,7 @@ const _isBunBinary = typeof (globalThis as any).Bun !== 'undefined'
 const BASE_DIR = _isBunBinary
    ? path.dirname((process as any).execPath)
    : process.cwd()
-const DATA_PATH = path.join(BASE_DIR, 'data', 'settings.json')
+const DATA_PATH = path.join(BASE_DIR, 'config', 'settings.json')

 export interface Settings {
    mediaPath     : string
@@ -77,7 +77,7 @@ export function getAvailableClients(): TorrentClientDefinition[] {

 // ─── Persistence (clients enregistrés) ────────────────────────────────────────

-const CLIENTS_PATH = path.join(process.cwd(), 'data', 'torrent_clients.json')
+const CLIENTS_PATH = path.join(process.cwd(), 'config', 'torrent_clients.json')

 function loadClients(): SavedClient[] {
    try {
@@ -14,9 +14,9 @@ export default defineConfig({
    outDir: 'dist/client'
  },
  server: {
-    port: 3000,
+    port: 3000,  // ou autre port fixe
    proxy: {
-      '/api': 'http://localhost:3001'
+      '/api': 'http://localhost:9898'
    }
  }
 })
Author	SHA1	Message	Date
MasutaYunikon	88e2a0bc38	Merge pull request #35 from Masutayunikon/release-please--branches--main chore(main): release 1.11.3	2026-03-20 16:08:46 +01:00
MasutaYunikon	338e3f8547	chore(main): release 1.11.3	2026-03-20 15:41:14 +01:00
MasutaYunikon	d1ccc902da	Merge remote-tracking branch 'origin/main'	2026-03-20 15:40:40 +01:00
MasutaYunikon	5e54e24b60	fix: entrypoint.sh config directory	2026-03-20 15:40:28 +01:00
MasutaYunikon	aae2f592b5	Merge pull request #34 from Masutayunikon/release-please--branches--main chore(main): release 1.11.2	2026-03-20 02:11:37 +01:00
MasutaYunikon	bd94e6a460	chore(main): release 1.11.2	2026-03-20 02:11:01 +01:00
MasutaYunikon	cbe3e1a786	Merge remote-tracking branch 'origin/main'	2026-03-20 02:10:38 +01:00
MasutaYunikon	7a0917e053	fix: port 9898, /config volume, Kaï→Kai matching, NFO pagination GitLab, saison 0 specials, JoJo/Hokuto strict season resolve - Port par défaut 3001 → 9898 - Volume /app/data → /config (entrypoint, docker-compose, README) - Normalisation titres Kaï/Kai dans index.ts (catalogue + déduplication + serie detail) - Fix pagination GitLab NFO (per_page=100 → loop multi-pages) - Fix _is_bonus_filename avec word boundaries (\b) — évite faux positifs "national"→"ona" - Fix dossier Bonus/Specials exclus : récupère flottants (7,5/19,5) et S00Exx → saison 0 - _EP_FLOAT_PATTERN supporte virgules (7,5) en plus des points (7.5) - Ajout strict_season dans find_episode/resolve_ep — évite collision ep1 S1 vs ep1 S2 (JoJo Parties) - Ajout SEASON_EP_OFFSET pour Hokuto No Ken (saison 02 torrent → +16 offset API) - Fallback non-strict si strict_season échoue (Hokuto ep 5-16 S1) - Fix collect_covered_episodes : fallback torrent.serie_id si absent dans resolved_episodes - Fix s6_verify : get_all_specials + compteur S00 séparé, déduplication Kaï/Kai, format OK/TOTAL - Ajout MANUAL_TORRENTS dans s4 (MHA Film 4 You're Next URL Nyaa) - Injection torrents locaux manquants dans pipeline (Reborn! Kaï via fichier local) - Fix s5 : résolution directe torrents manuels season_number=0 - Fix s2 : pack_saga_slash et pack_partie_slash → pack_integrale, lookahead (?<!/) sur episode_num_tiret_apres - Fix s5 skip condition : re-résoudre si resolved_count < files_count (Fairy Tail) - README : note hardlinks volumes multiples, port, chemins config	2026-03-20 02:10:27 +01:00
MasutaYunikon	8ac4f7a65b	Merge pull request #33 from Masutayunikon/release-please--branches--main chore(main): release 1.11.1	2026-03-14 00:59:14 +01:00
MasutaYunikon	453cd47e85	chore(main): release 1.11.1	2026-03-14 00:58:57 +01:00
MasutaYunikon	d5679ec529	Merge remote-tracking branch 'origin/main'	2026-03-14 00:58:37 +01:00
MasutaYunikon	2f0be502c3	fix: worker now work on multiple github files pages	2026-03-14 00:58:29 +01:00
MasutaYunikon	ec971915b5	Merge pull request #32 from Masutayunikon/release-please--branches--main chore(main): release 1.11.0	2026-03-13 19:03:34 +01:00
MasutaYunikon	bb71b241d1	chore(main): release 1.11.0	2026-03-13 19:03:16 +01:00
MasutaYunikon	7aa01755ec	Merge remote-tracking branch 'origin/main'	2026-03-13 19:02:46 +01:00
MasutaYunikon	8ce0ca1f24	feat: fix worker for multiple series in integral (one piece fix ?)	2026-03-13 19:02:38 +01:00
MasutaYunikon	620aac6b38	Merge pull request #31 from Masutayunikon/release-please--branches--main chore(main): release 1.10.3	2026-03-13 04:35:00 +01:00
MasutaYunikon	e99e413e4e	chore(main): release 1.10.3	2026-03-13 04:34:21 +01:00
MasutaYunikon	fb578cf9f9	Merge remote-tracking branch 'origin/main'	2026-03-13 04:34:00 +01:00
MasutaYunikon	78e3055344	fix: worker path	2026-03-13 04:33:51 +01:00
MasutaYunikon	15f5847c97	Merge pull request #30 from Masutayunikon/release-please--branches--main chore(main): release 1.10.2	2026-03-13 04:25:54 +01:00
MasutaYunikon	8736b58d8c	chore(main): release 1.10.2	2026-03-13 04:25:39 +01:00
MasutaYunikon	12e8e2f93a	Merge remote-tracking branch 'origin/main'	2026-03-13 04:25:17 +01:00
MasutaYunikon	ed2306bb70	fix: add target node	2026-03-13 04:25:09 +01:00
MasutaYunikon	b3fd57c2c8	Merge pull request #29 from Masutayunikon/release-please--branches--main chore(main): release 1.10.1	2026-03-13 04:22:24 +01:00
MasutaYunikon	c2da12409a	chore(main): release 1.10.1	2026-03-13 04:22:06 +01:00
MasutaYunikon	178a57c444	Merge remote-tracking branch 'origin/main'	2026-03-13 04:21:42 +01:00
MasutaYunikon	1afe13c555	fix: add target node	2026-03-13 04:21:34 +01:00
MasutaYunikon	c8963cc4cf	Merge pull request #28 from Masutayunikon/release-please--branches--main chore(main): release 1.10.0	2026-03-13 04:19:01 +01:00
MasutaYunikon	391b793e39	chore(main): release 1.10.0	2026-03-13 04:18:23 +01:00
MasutaYunikon	9a1519e6cd	Merge pull request #27 from Masutayunikon/release-please--branches--main chore(main): release 1.9.5	2026-03-13 04:17:27 +01:00
MasutaYunikon	a12237af68	chore(main): release 1.9.5	2026-03-13 04:16:50 +01:00
MasutaYunikon	d304aa6a26	Merge remote-tracking branch 'origin/main'	2026-03-13 04:16:29 +01:00
MasutaYunikon	27092b3968	fix: worker outside the exe	2026-03-13 04:16:07 +01:00