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

chore(main): release 1.11.7

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [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)
 
 

server/auth.ts

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

server/config.ts

@@ -10,4 +10,4 @@ export const BASE_DIR = _isBunBinary
 
 export const DATA_DIR = fs.existsSync('/.dockerenv')
     ? '/config'
-    : path.join(BASE_DIR, 'data')
+    : path.join(BASE_DIR, 'config')

server/index.ts

@@ -12,7 +12,7 @@ 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, _isBunBinary }  from './config.js'
+import { DATA_DIR, BASE_DIR }  from './config.js'
 
 registerDriver(qbittorrentDriver)
 
@@ -403,7 +403,7 @@ app.get('/api/downloads', requireAuth, async (_req, res) => {
 
         let torrentFinal: any[] = []
         try {
-            const tfPath = path.join(BASE_DIR, 'config', 'torrent_final.json')
+            const tfPath = path.join(DATA_DIR, 'config', 'torrent_final.json')
             if (fs.existsSync(tfPath))
                 torrentFinal = JSON.parse(fs.readFileSync(tfPath, 'utf-8'))
         } catch {}

server/logger.ts

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

server/organize-worker.ts

@@ -15,10 +15,10 @@ import fs   from 'fs'
 import fsp  from 'fs/promises'
 import path from 'path'
 import { parentPort } from 'worker_threads'
-import { BASE_DIR, _isBunBinary } from './config.js'
+import { DATA_DIR } from './config.js'
 
-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
@@ -33,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(BASE_DIR, '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 } }

server/secret.ts

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

server/settings.ts

@@ -1,8 +1,8 @@
 import fs from 'fs'
 import path from 'path'
-import { BASE_DIR, _isBunBinary } from './config.js'
+import { DATA_DIR } from './config.js'
 
-const DATA_PATH = path.join(BASE_DIR, 'config', 'settings.json')
+const DATA_PATH = path.join(DATA_DIR, 'config', 'settings.json')
 
 export interface Settings {
     mediaPath     : string

server/torrent-clients/index.ts

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