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

chore(main): release 1.9.2

.github/workflows/build-binaries.yml

@@ -0,0 +1,116 @@
+name: Build Binaries
+
+on:
+  release:
+    types: [created]
+  workflow_dispatch:
+
+jobs:
+  build-frontend:
+    name: Build Frontend
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: pnpm/action-setup@v3
+        with:
+          version: latest
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: pnpm
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Build Vue frontend
+        run: pnpm build
+
+      - name: Upload frontend dist
+        uses: actions/upload-artifact@v4
+        with:
+          name: frontend-dist
+          path: dist/client/
+          retention-days: 1
+
+  build-binaries:
+    name: Build ${{ matrix.target }}
+    needs: build-frontend
+    runs-on: ${{ matrix.os }}
+    permissions:
+      contents: write
+    strategy:
+      matrix:
+        include:
+          - target: windows-x64
+            os: windows-latest
+            bun-target: bun-windows-x64
+            binary: binaries/fankarr.exe
+            archive: fankarr-windows-x64.zip
+          - target: linux-x64
+            os: ubuntu-latest
+            bun-target: bun-linux-x64
+            binary: binaries/fankarr
+            archive: fankarr-linux-x64.zip
+          - target: macos
+            os: macos-latest
+            bun-target: bun-darwin-arm64
+            binary: binaries/fankarr
+            archive: fankarr-macos.zip
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: latest
+
+      - uses: pnpm/action-setup@v3
+        with:
+          version: latest
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: pnpm
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Download frontend dist
+        uses: actions/download-artifact@v4
+        with:
+          name: frontend-dist
+          path: public/
+
+      - name: Build binary (Unix)
+        if: matrix.target != 'windows-x64'
+        run: |
+          mkdir -p binaries
+          bun build server/index.ts --compile --target ${{ matrix.bun-target }} --outfile ${{ matrix.binary }}
+
+      - name: Build binary (Windows)
+        if: matrix.target == 'windows-x64'
+        run: |
+          New-Item -ItemType Directory -Force -Path binaries
+          bun build server/index.ts --compile --target ${{ matrix.bun-target }} --outfile ${{ matrix.binary }}
+        shell: pwsh
+
+      - name: Package archive (Windows)
+        if: matrix.target == 'windows-x64'
+        run: Compress-Archive -Path ${{ matrix.binary }}, public -DestinationPath ${{ matrix.archive }}
+        shell: pwsh
+
+      - name: Package archive (Unix)
+        if: matrix.target != 'windows-x64'
+        run: |
+          chmod +x ${{ matrix.binary }}
+          zip -r ${{ matrix.archive }} ${{ matrix.binary }} public/
+
+      - name: Upload archive to Release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: ${{ matrix.archive }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -11,6 +11,7 @@ node_modules
 dist
 dist-ssr
 *.local
+binaries
 
 # Editor directories and files
 .vscode/*

CHANGELOG.md

@@ -1,5 +1,41 @@
 # Changelog
 
+## [1.9.2](https://github.com/Masutayunikon/FanKarr/compare/v1.9.1...v1.9.2) (2026-03-13)
+
+
+### Bug Fixes
+
+* workflow directory ([baebd8f](https://github.com/Masutayunikon/FanKarr/commit/baebd8fae146db70ee1cce0c876d2d3bc0f9bf4e))
+
+## [1.9.1](https://github.com/Masutayunikon/FanKarr/compare/v1.9.0...v1.9.1) (2026-03-13)
+
+
+### Bug Fixes
+
+* workflow directory ([d8405c1](https://github.com/Masutayunikon/FanKarr/commit/d8405c1589f277cd8fdd3e1fd15cc02d98834aa6))
+* workflow permmisions ([3620bfb](https://github.com/Masutayunikon/FanKarr/commit/3620bfb71d8c2774b23c097e5e01326099c2f180))
+
+## [1.9.0](https://github.com/Masutayunikon/FanKarr/compare/v1.8.2...v1.9.0) (2026-03-13)
+
+
+### Features
+
+* add windows / linux / macos binaries on build ([f17a73b](https://github.com/Masutayunikon/FanKarr/commit/f17a73b9591fb49a75bd5fcdadf1970585877dab))
+
+## [1.8.2](https://github.com/Masutayunikon/FanKarr/compare/v1.8.1...v1.8.2) (2026-03-13)
+
+
+### Bug Fixes
+
+* season fallback ([e9b5091](https://github.com/Masutayunikon/FanKarr/commit/e9b5091242d73be77bf6fb525ce2865554e336cc))
+
+## [1.8.1](https://github.com/Masutayunikon/FanKarr/compare/v1.8.0...v1.8.1) (2026-03-13)
+
+
+### Bug Fixes
+
+* nfo settings and add json file when not existing ([0b6bfa6](https://github.com/Masutayunikon/FanKarr/commit/0b6bfa6a81d99353be877ed6d99687ad3d55adbc))
+
 ## [1.8.0](https://github.com/Masutayunikon/FanKarr/compare/v1.7.3...v1.8.0) (2026-03-12)
 
 

README.md

@@ -69,14 +69,9 @@ Fankarr récupère ce fichier au démarrage et via le bouton **Mettre à jour**
 
 ## Installation
 
-### Prérequis
+### Docker Compose (recommandé)
 
-- Docker + Docker Compose
-- qBittorrent accessible en réseau
-- Un dossier de téléchargements complétés (`/downloads/complete` ou équivalent)
-- Un dossier médiathèque pour Jellyfin (`/media/Kai` ou équivalent)
-
-### Docker Compose
+**Prérequis** : Docker + Docker Compose, qBittorrent accessible en réseau.
 
 ```yaml
 services:
@@ -88,8 +83,8 @@ 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
+      - ./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
@@ -100,15 +95,41 @@ services:
 docker compose up -d
 ```
 
-Fankarr sera accessible sur `http://localhost:3001`.
+### 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` |
+
+Extrayez l'archive — elle contient le binaire **et** le dossier `public/` qui doivent rester ensemble :
+
+```
+fankarr-windows-x64/
+├── fankarr.exe   ← lancer ce fichier
+└── public/       ← ne pas déplacer séparément
+```
+
+**Linux / macOS** : rendre le binaire exécutable avant le premier lancement :
+
+```bash
+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.
 
 ### Variables d'environnement
 
 | Variable | Défaut | Description |
 |---|---|---|
-| `PUID` | `1000` | UID utilisateur pour les permissions fichiers |
-| `PGID` | `1000` | GID utilisateur pour les permissions fichiers |
+| `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 |
 
@@ -130,7 +151,7 @@ Fankarr organise automatiquement les fichiers terminés toutes les **30 secondes
 ```
 /media/Kai/
 └── Black Lagoon Henshū/
-    └── Saison 001/
+    └── Saison 1/
         ├── Black Lagoon Henshū S01E01.mkv
         ├── Black Lagoon Henshū S01E02.mkv
         └── ...
@@ -157,8 +178,8 @@ Fankarr est disponible dans l'appstore personnalisé. Pour l'installer :
 | Frontend | Vue 3 + Vite + Tailwind CSS |
 | Backend | Express 5 + TypeScript |
 | Auth | JWT + bcrypt |
-| Packaging | Docker (`node:20-slim`) + pnpm |
-| Permissions | gosu (PUID/PGID) |
+| Packaging Docker | `node:20-slim` + pnpm + gosu (PUID/PGID) |
+| Packaging binaire | Bun (self-contained, pas de Node requis) |
 
 ---
 

package.json

@@ -7,7 +7,12 @@
     "dev": "concurrently \"vite\" \"tsx watch server/index.ts\"",
     "dev:server": "tsx watch server/index.ts",
     "dev:client": "vite",
-    "build": "vite build --outDir dist/client && tsc -p tsconfig.server.json",
+    "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",
+    "build:bun:windows": "bun build server/index.ts --compile --target bun-windows-x64  --outfile binaries/fankarr-windows-x64.exe",
+    "build:bun:macos": "bun build server/index.ts --compile --target bun-darwin-arm64 --outfile binaries/fankarr-macos",
+    "build:bun:all": "pnpm build:bun:linux && pnpm build:bun:windows && pnpm build:bun:macos",
+    "start": "node dist/server/index.js",
     "preview": "vite preview"
   },
   "dependencies": {

server/index.ts

@@ -15,10 +15,19 @@ import { logger, readLogs, clearLogs, logsFileSize } from './logger.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()
+
 const app = express()
-const PORT = 3001
+const PORT = Number(process.env.PORT) || 3001
 const FANKAI_API    = 'https://metadata.fankai.fr'
-const TORRENTS_PATH = path.join(process.cwd(), 'data', 'torrent_final.json')
+const TORRENTS_PATH = path.join(BASE_DIR, 'data', 'torrent_final.json')
 const GITHUB_RAW_URL = process.env.GITHUB_RAW_URL
     ?? 'https://raw.githubusercontent.com/masutayunikon/fankarr-scraper/main/data/torrent_final.json'
 
@@ -26,7 +35,7 @@ app.use(express.json())
 app.use(cookieParser())
 
 // ── Static frontend (prod) ─────────────────────────────────────
-const PUBLIC_PATH = path.join(process.cwd(), 'public')
+const PUBLIC_PATH = path.join(BASE_DIR, 'public')
 if (fs.existsSync(PUBLIC_PATH)) {
     app.use(express.static(PUBLIC_PATH))
 }
@@ -42,8 +51,8 @@ app.get('/api/settings', requireAuth, (_req, res) => {
     res.json(readSettings())
 })
 app.post('/api/settings', requireAuth, (req, res) => {
-    const { mediaPath, completePath, organizeMode, category } = req.body
-    res.json(writeSettings({ mediaPath, completePath, organizeMode, category }))
+    const { mediaPath, completePath, organizeMode, category, nfoSupport } = req.body
+    res.json(writeSettings({ mediaPath, completePath, organizeMode, category, nfoSupport }))
 })
 
 // ── Torrent clients ────────────────────────────────────────────
@@ -495,7 +504,23 @@ if (fs.existsSync(PUBLIC_PATH)) {
 }
 
 // ── Start ──────────────────────────────────────────────────────
-app.listen(PORT, () => {
+app.listen(PORT, async () => {
+    // Télécharger torrent_final.json si absent
+    if (!fs.existsSync(TORRENTS_PATH)) {
+        try {
+            console.log('[fankarr] torrent_final.json absent → téléchargement...')
+            const response = await fetch(GITHUB_RAW_URL)
+            if (!response.ok) throw new Error(`GitHub a répondu ${response.status}`)
+            const data = await response.json() as unknown[]
+            if (!Array.isArray(data)) throw new Error('Format invalide')
+            fs.mkdirSync(path.dirname(TORRENTS_PATH), { recursive: true })
+            fs.writeFileSync(TORRENTS_PATH, JSON.stringify(data, null, 2), 'utf-8')
+            console.log(`[fankarr] ${data.length} torrents téléchargés`)
+        } catch (err) {
+            console.warn(`[fankarr] ⚠ Téléchargement échoué: ${err instanceof Error ? err.message : err}`)
+        }
+    }
+
     try {
         const data  = JSON.parse(fs.readFileSync(TORRENTS_PATH, 'utf-8'))
         const count = Array.isArray(data) ? data.length : 0

server/organize-worker.ts

@@ -16,8 +16,15 @@ 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')
+// 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, 'data', 'torrent_final.json')
+const ORGANIZED_PATH = path.join(BASE_DIR, 'data', 'organized.json')
 
 // ─── Utils log ────────────────────────────────────────────────
 // Le worker tourne dans un thread séparé — il passe les logs au thread principal
@@ -249,10 +256,26 @@ async function organizeTorrent(hash: string, name: string, savePath: string) {
     }
 
     // ── Map filename → season ─────────────────────────────────
+    // Priorité : season_number dans torrent_files (packs multi-saisons)
+    // Fallback  : resolved_episodes matchés par episode_number (torrents individuels)
     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
     for (const ep of torrent.resolved_episodes ?? []) {
-        if (ep.filename && ep.season_number !== undefined)
-            filenameSeasonMap.set(ep.filename, ep.season_number)
+        if (ep.episode_number !== undefined && ep.season_number !== undefined)
+            epByNum.set(ep.episode_number, ep.season_number)
+    }
+
+    for (const tf of torrentFiles) {
+        const sn: number | null = tf.season_number ?? null
+        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 (torrent.season_number !== undefined) {
+            filenameSeasonMap.set(tf.filename, torrent.season_number)
+        }
     }
 
     result.total = torrentFiles.length

server/settings.ts

@@ -1,7 +1,12 @@
 import fs from 'fs'
 import path from 'path'
 
-const DATA_PATH = path.join(process.cwd(), 'data', 'settings.json')
+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, 'data', 'settings.json')
 
 export interface Settings {
     mediaPath     : string

vite.config.ts

@@ -10,6 +10,9 @@ export default defineConfig({
       '@': fileURLToPath(new URL('./src', import.meta.url))
     }
   },
+  build: {
+    outDir: 'dist/client'
+  },
   server: {
     port: 3000,
     proxy: {