feat: manual import
This commit is contained in:
1 parent
2d0abab222
commit
a582991c15
3 files changed
+510
-123
No files matched your search
+167
-123
@@ -13,9 +13,8 @@ import {
|
|||||||
import qbittorrentDriver from './torrent-clients/qbittorrent.js'
|
import qbittorrentDriver from './torrent-clients/qbittorrent.js'
|
||||||
import transmissionDriver from './torrent-clients/transmission.js'
|
import transmissionDriver from './torrent-clients/transmission.js'
|
||||||
import synologyDsDriver from './torrent-clients/synology-ds.js'
|
import synologyDsDriver from './torrent-clients/synology-ds.js'
|
||||||
import rtorrentDriver from './torrent-clients/rtorrent.js'
|
import utorrentDriver from './torrent-clients/utorrent.js'
|
||||||
import utorrent from "./torrent-clients/utorrent.js";
|
import rtorrentDriver from './torrent-clients/rtorrent.js'
|
||||||
|
|
||||||
import { organizeTorrent, autoOrganizeAll, scanMediaPath, workerRunning } from './organize.js'
|
import { organizeTorrent, autoOrganizeAll, scanMediaPath, workerRunning } from './organize.js'
|
||||||
import { logger, readLogs, clearLogs, logsFileSize } from './logger.js'
|
import { logger, readLogs, clearLogs, logsFileSize } from './logger.js'
|
||||||
import { DATA_DIR, BASE_DIR } from './config.js'
|
import { DATA_DIR, BASE_DIR } from './config.js'
|
||||||
@@ -24,8 +23,8 @@ import { systemInfo } from './system.js'
|
|||||||
registerDriver(qbittorrentDriver)
|
registerDriver(qbittorrentDriver)
|
||||||
registerDriver(transmissionDriver)
|
registerDriver(transmissionDriver)
|
||||||
registerDriver(synologyDsDriver)
|
registerDriver(synologyDsDriver)
|
||||||
|
registerDriver(utorrentDriver)
|
||||||
registerDriver(rtorrentDriver)
|
registerDriver(rtorrentDriver)
|
||||||
registerDriver(utorrent)
|
|
||||||
|
|
||||||
const app = express()
|
const app = express()
|
||||||
const PORT = Number(process.env.PORT) || 9898
|
const PORT = Number(process.env.PORT) || 9898
|
||||||
@@ -47,7 +46,6 @@ app.post('/api/auth/setup', authSetup)
|
|||||||
app.post('/api/auth/login', authLogin)
|
app.post('/api/auth/login', authLogin)
|
||||||
app.post('/api/auth/logout', authLogout)
|
app.post('/api/auth/logout', authLogout)
|
||||||
|
|
||||||
// system info
|
|
||||||
app.get('/api/system/info', systemInfo)
|
app.get('/api/system/info', systemInfo)
|
||||||
|
|
||||||
// ── Settings ───────────────────────────────────────────────────
|
// ── Settings ───────────────────────────────────────────────────
|
||||||
@@ -91,7 +89,6 @@ app.put('/api/torrent-clients/:uuid', requireAuth, (req, res) => {
|
|||||||
const { name, type, config } = req.body
|
const { name, type, config } = req.body
|
||||||
if (!name || !type || !config) { res.status(400).json({ error: 'name, type et config requis' }); return }
|
if (!name || !type || !config) { res.status(400).json({ error: 'name, type et config requis' }); return }
|
||||||
if (!getDriver(type)) { res.status(400).json({ error: `Type inconnu : ${type}` }); return }
|
if (!getDriver(type)) { res.status(400).json({ error: `Type inconnu : ${type}` }); return }
|
||||||
// Restaurer les mots de passe masqués avec les valeurs actuelles
|
|
||||||
const oldClient = getClient(String(req.params.uuid))
|
const oldClient = getClient(String(req.params.uuid))
|
||||||
if (oldClient) {
|
if (oldClient) {
|
||||||
const driver = getDriver(type)
|
const driver = getDriver(type)
|
||||||
@@ -112,7 +109,6 @@ app.post('/api/torrent-clients/test-config', requireAuth, async (req, res) => {
|
|||||||
if (!type || !config) { res.status(400).json({ error: 'type et config requis' }); return }
|
if (!type || !config) { res.status(400).json({ error: 'type et config requis' }); return }
|
||||||
const driver = getDriver(type)
|
const driver = getDriver(type)
|
||||||
if (!driver) { res.status(400).json({ error: `Type inconnu : ${type}` }); return }
|
if (!driver) { res.status(400).json({ error: `Type inconnu : ${type}` }); return }
|
||||||
|
|
||||||
if (uuid) {
|
if (uuid) {
|
||||||
const oldClient = getClient(uuid)
|
const oldClient = getClient(uuid)
|
||||||
if (oldClient) {
|
if (oldClient) {
|
||||||
@@ -123,7 +119,6 @@ app.post('/api/torrent-clients/test-config', requireAuth, async (req, res) => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
res.json(await driver.test(config))
|
res.json(await driver.test(config))
|
||||||
})
|
})
|
||||||
app.post('/api/torrent-clients/:uuid/test', requireAuth, async (req, res) => {
|
app.post('/api/torrent-clients/:uuid/test', requireAuth, async (req, res) => {
|
||||||
@@ -265,7 +260,6 @@ function computeSerieDownloadState(serieData: any | null, organized: Record<stri
|
|||||||
const orgFiles = organized[hash] ?? {}
|
const orgFiles = organized[hash] ?? {}
|
||||||
if (Object.keys(orgFiles).length === 0) continue
|
if (Object.keys(orgFiles).length === 0) continue
|
||||||
for (const ep of buildResolvedEpisodes(serieData, hash, t.season_number)) {
|
for (const ep of buildResolvedEpisodes(serieData, hash, t.season_number)) {
|
||||||
// Nouveau format : clé = episode_id ; ancien format : clé = filename
|
|
||||||
const isOrganized = orgFiles[String(ep.episode_id)] !== undefined || orgFiles[ep.filename] !== undefined
|
const isOrganized = orgFiles[String(ep.episode_id)] !== undefined || orgFiles[ep.filename] !== undefined
|
||||||
if (isOrganized) organizedEpisodeIds.add(ep.episode_id)
|
if (isOrganized) organizedEpisodeIds.add(ep.episode_id)
|
||||||
}
|
}
|
||||||
@@ -280,7 +274,7 @@ app.get('/api/series', requireAuth, async (_req, res) => {
|
|||||||
try {
|
try {
|
||||||
const [apiData, availableIds] = await Promise.all([fankaiGet('/series'), readAvailable()])
|
const [apiData, availableIds] = await Promise.all([fankaiGet('/series'), readAvailable()])
|
||||||
const availableSet = new Set<number>(availableIds)
|
const availableSet = new Set<number>(availableIds)
|
||||||
let organized: Record<string, Record<string, string>> = {}
|
let organized: Record<string, Record<string, any>> = {}
|
||||||
try { const p = path.join(DATA_DIR, 'organized.json'); if (fs.existsSync(p)) organized = JSON.parse(fs.readFileSync(p, 'utf-8')) } catch {}
|
try { const p = path.join(DATA_DIR, 'organized.json'); if (fs.existsSync(p)) organized = JSON.parse(fs.readFileSync(p, 'utf-8')) } catch {}
|
||||||
const activeTorrents = new Set<string>()
|
const activeTorrents = new Set<string>()
|
||||||
try { const { category } = readSettings(); const active = await dispatchList(category ?? 'fankai'); for (const t of active) { if (t.hash && t.state === 'downloading') activeTorrents.add(t.hash.toLowerCase()) } } catch {}
|
try { const { category } = readSettings(); const active = await dispatchList(category ?? 'fankai'); for (const t of active) { if (t.hash && t.state === 'downloading') activeTorrents.add(t.hash.toLowerCase()) } } catch {}
|
||||||
@@ -315,7 +309,6 @@ app.get('/api/series/:id', requireAuth, async (req, res) => {
|
|||||||
const episodeTorrentMap : Record<number, any> = {}
|
const episodeTorrentMap : Record<number, any> = {}
|
||||||
const seasonTorrentMapBySn : Record<number, any> = {}
|
const seasonTorrentMapBySn : Record<number, any> = {}
|
||||||
const integraleTorrents : any[] = []
|
const integraleTorrents : any[] = []
|
||||||
const packEpisodesTorrents : any[] = []
|
|
||||||
const organizedEpisodeIds = new Set<number>()
|
const organizedEpisodeIds = new Set<number>()
|
||||||
if (serieData) {
|
if (serieData) {
|
||||||
for (const t of (serieData.torrents ?? [])) {
|
for (const t of (serieData.torrents ?? [])) {
|
||||||
@@ -346,7 +339,6 @@ app.get('/api/series/:id', requireAuth, async (req, res) => {
|
|||||||
const orgFiles = organized[t.infohash?.toLowerCase()] ?? {}
|
const orgFiles = organized[t.infohash?.toLowerCase()] ?? {}
|
||||||
const isOrg = orgFiles[String(ep.id)] !== undefined
|
const isOrg = orgFiles[String(ep.id)] !== undefined
|
||||||
if (!isOrg) {
|
if (!isOrg) {
|
||||||
// fallback ancien format
|
|
||||||
const match = (ep.paths ?? []).find((p: any) => typeof p === 'object' && p.infohash?.toLowerCase() === t.infohash?.toLowerCase())
|
const match = (ep.paths ?? []).find((p: any) => typeof p === 'object' && p.infohash?.toLowerCase() === t.infohash?.toLowerCase())
|
||||||
const filename = match ? match.path.split('/').pop() : null
|
const filename = match ? match.path.split('/').pop() : null
|
||||||
if (filename && orgFiles[filename]) organizedEpisodeIds.add(ep.id)
|
if (filename && orgFiles[filename]) organizedEpisodeIds.add(ep.id)
|
||||||
@@ -481,6 +473,7 @@ app.post('/api/logs/clear', requireAuth, (_req, res) => {
|
|||||||
app.get('/api/system', requireAuth, (_req, res) => {
|
app.get('/api/system', requireAuth, (_req, res) => {
|
||||||
res.json({ isDocker: fs.existsSync('/.dockerenv') })
|
res.json({ isDocker: fs.existsSync('/.dockerenv') })
|
||||||
})
|
})
|
||||||
|
|
||||||
app.get('/api/browse', requireAuth, (req, res) => {
|
app.get('/api/browse', requireAuth, (req, res) => {
|
||||||
const dirPath = (req.query.path as string) || '/'
|
const dirPath = (req.query.path as string) || '/'
|
||||||
try {
|
try {
|
||||||
@@ -492,12 +485,45 @@ app.get('/api/browse', requireAuth, (req, res) => {
|
|||||||
res.status(400).json({ error: err instanceof Error ? err.message : 'Erreur lecture dossier' })
|
res.status(400).json({ error: err instanceof Error ? err.message : 'Erreur lecture dossier' })
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
app.get('/api/browse-files', requireAuth, (req, res) => {
|
||||||
|
const dirPath = (req.query.path as string) || '/'
|
||||||
|
const VIDEO_EXTS = new Set(['.mkv', '.mp4', '.avi', '.m4v', '.mov', '.wmv'])
|
||||||
|
try {
|
||||||
|
const files: { name: string; path: string; size: number }[] = []
|
||||||
|
function walk(dir: string) {
|
||||||
|
let entries: fs.Dirent[]
|
||||||
|
try { entries = fs.readdirSync(dir, { withFileTypes: true }) }
|
||||||
|
catch { return }
|
||||||
|
for (const entry of entries) {
|
||||||
|
if (entry.name.startsWith('.')) continue
|
||||||
|
const full = path.join(dir, entry.name)
|
||||||
|
if (entry.isDirectory()) {
|
||||||
|
walk(full)
|
||||||
|
} else if (entry.isFile() && VIDEO_EXTS.has(path.extname(entry.name).toLowerCase())) {
|
||||||
|
try {
|
||||||
|
const stat = fs.statSync(full)
|
||||||
|
files.push({ name: entry.name, path: full, size: stat.size })
|
||||||
|
} catch {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
walk(dirPath)
|
||||||
|
files.sort((a, b) => a.name.localeCompare(b.name, 'fr'))
|
||||||
|
res.json({ path: dirPath, files })
|
||||||
|
} catch (err) {
|
||||||
|
logger.warn('api', `browse-files "${dirPath}" : ${err instanceof Error ? err.message : err}`)
|
||||||
|
res.status(400).json({ error: err instanceof Error ? err.message : 'Erreur lecture dossier' })
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
app.get('/api/torrents/status', requireAuth, async (_req, res) => {
|
app.get('/api/torrents/status', requireAuth, async (_req, res) => {
|
||||||
try {
|
try {
|
||||||
const available = await readAvailable()
|
const available = await readAvailable()
|
||||||
res.json({ exists: available.length > 0, count: available.length, empty: available.length === 0 })
|
res.json({ exists: available.length > 0, count: available.length, empty: available.length === 0 })
|
||||||
} catch { res.json({ exists: false, count: 0, empty: true }) }
|
} catch { res.json({ exists: false, count: 0, empty: true }) }
|
||||||
})
|
})
|
||||||
|
|
||||||
app.post('/api/update', requireAuth, async (_req, res) => {
|
app.post('/api/update', requireAuth, async (_req, res) => {
|
||||||
try {
|
try {
|
||||||
cacheClear()
|
cacheClear()
|
||||||
@@ -511,6 +537,7 @@ app.post('/api/update', requireAuth, async (_req, res) => {
|
|||||||
res.status(500).json({ error: err instanceof Error ? err.message : 'Erreur inconnue' })
|
res.status(500).json({ error: err instanceof Error ? err.message : 'Erreur inconnue' })
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
app.post('/api/scan', requireAuth, async (_req, res) => {
|
app.post('/api/scan', requireAuth, async (_req, res) => {
|
||||||
try {
|
try {
|
||||||
const { mediaPath } = readSettings()
|
const { mediaPath } = readSettings()
|
||||||
@@ -524,17 +551,111 @@ app.post('/api/scan', requireAuth, async (_req, res) => {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
// ── Debug (dev mode uniquement) ───────────────────────────────
|
// ── Import manuel ──────────────────────────────────────────────
|
||||||
|
app.post('/api/manual-import', requireAuth, async (req, res) => {
|
||||||
|
const { serie_id, items } = req.body
|
||||||
|
if (!serie_id || !Array.isArray(items) || items.length === 0) {
|
||||||
|
res.status(400).json({ error: 'serie_id et items requis' }); return
|
||||||
|
}
|
||||||
|
const { mediaPath, organizeMode, nfoSupport } = readSettings()
|
||||||
|
const ORGANIZED_PATH = path.join(DATA_DIR, 'organized.json')
|
||||||
|
let organized: Record<string, Record<string, any>> = {}
|
||||||
|
try { if (fs.existsSync(ORGANIZED_PATH)) organized = JSON.parse(fs.readFileSync(ORGANIZED_PATH, 'utf-8')) } catch {}
|
||||||
|
const sd = await readSerieData(Number(serie_id))
|
||||||
|
if (!sd) { res.status(404).json({ error: 'Série introuvable dans le catalogue' }); return }
|
||||||
|
const rawTitle = sd.title ?? sd.show_title ?? ''
|
||||||
|
const serieTitle = rawTitle.replace(/:/g, ' -').replace(/[<>"/\\|?*]/g, '').replace(/\s+/g, ' ').trim()
|
||||||
|
const episodeIndex = new Map<number, { ep: any; season: any }>()
|
||||||
|
for (const season of sd.seasons ?? []) {
|
||||||
|
for (const ep of season.episodes ?? []) {
|
||||||
|
episodeIndex.set(ep.id, { ep, season })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const done: number[] = []
|
||||||
|
const errors: { file: string; error: string }[] = []
|
||||||
|
for (const item of items) {
|
||||||
|
const { file_path, episode_id, hash } = item
|
||||||
|
if (!file_path || !episode_id) { errors.push({ file: file_path ?? '?', error: 'Paramètres manquants' }); continue }
|
||||||
|
const found = episodeIndex.get(Number(episode_id))
|
||||||
|
if (!found) { errors.push({ file: file_path, error: `Épisode ${episode_id} introuvable` }); continue }
|
||||||
|
const { ep, season } = found
|
||||||
|
const srcFilename = path.basename(file_path)
|
||||||
|
const srcExt = path.extname(srcFilename)
|
||||||
|
const fmtName = ep.formatted_name?.trim() ? ep.formatted_name.replace(/[<>:"/\\|?*]/g, '') + '.mkv' : null
|
||||||
|
const resolvedName = nfoSupport
|
||||||
|
? (ep.nfo_filename ?? ep.original_filename ?? srcFilename)
|
||||||
|
: (fmtName ?? ep.nfo_filename ?? ep.original_filename ?? srcFilename)
|
||||||
|
const destFilename = resolvedName.endsWith('.nfo') ? resolvedName.slice(0, -4) + srcExt : resolvedName
|
||||||
|
const seasonFolder = season.season_number === 0 ? 'Specials' : `Saison ${season.season_number}`
|
||||||
|
const destDir = path.join(mediaPath, serieTitle, seasonFolder)
|
||||||
|
const destPath = path.join(destDir, destFilename)
|
||||||
|
try {
|
||||||
|
if (!fs.existsSync(file_path)) throw new Error('Fichier source introuvable')
|
||||||
|
fs.mkdirSync(destDir, { recursive: true })
|
||||||
|
if (!fs.existsSync(destPath)) {
|
||||||
|
if (organizeMode === 'hardlink') {
|
||||||
|
try { fs.linkSync(file_path, destPath) }
|
||||||
|
catch { await fs.promises.copyFile(file_path, destPath) }
|
||||||
|
} else {
|
||||||
|
await fs.promises.copyFile(file_path, destPath)
|
||||||
|
await fs.promises.unlink(file_path)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const torrentHash = String(hash || '').toLowerCase() || 'manual'
|
||||||
|
if (!organized[torrentHash]) organized[torrentHash] = {}
|
||||||
|
organized[torrentHash][String(episode_id)] = {
|
||||||
|
at: new Date().toISOString(), season: season.season_number,
|
||||||
|
episode: ep.episode_number, episode_id: ep.id,
|
||||||
|
src_filename: srcFilename, dest_filename: destFilename, dest_path: destPath,
|
||||||
|
}
|
||||||
|
done.push(episode_id)
|
||||||
|
logger.info('api', `Import manuel : "${srcFilename}" → "${destPath}"`)
|
||||||
|
} catch (err) {
|
||||||
|
const msg = err instanceof Error ? err.message : 'Erreur inconnue'
|
||||||
|
errors.push({ file: srcFilename, error: msg })
|
||||||
|
logger.error('api', `Import manuel échoué pour "${srcFilename}" : ${msg}`)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fs.writeFileSync(ORGANIZED_PATH, JSON.stringify(organized, null, 2), 'utf-8')
|
||||||
|
res.json({ ok: true, done: done.length, errors })
|
||||||
|
})
|
||||||
|
|
||||||
|
app.get('/api/organized/:serieId', requireAuth, async (req, res) => {
|
||||||
|
const serieId = Number(req.params.serieId)
|
||||||
|
try {
|
||||||
|
const sd = await readSerieData(serieId)
|
||||||
|
if (!sd) { res.status(404).json({ error: 'Série introuvable' }); return }
|
||||||
|
let organized: Record<string, Record<string, any>> = {}
|
||||||
|
try { const p = path.join(DATA_DIR, 'organized.json'); if (fs.existsSync(p)) organized = JSON.parse(fs.readFileSync(p, 'utf-8')) } catch {}
|
||||||
|
const result: Record<string, any> = {}
|
||||||
|
for (const season of sd.seasons ?? []) {
|
||||||
|
for (const ep of season.episodes ?? []) {
|
||||||
|
for (const p of ep.paths ?? []) {
|
||||||
|
if (typeof p !== 'object' || !p.infohash) continue
|
||||||
|
const hash = p.infohash.toLowerCase()
|
||||||
|
const entry = (organized[hash] ?? {})[String(ep.id)]
|
||||||
|
if (entry) { result[String(ep.id)] = entry; break }
|
||||||
|
}
|
||||||
|
if (!result[String(ep.id)] && organized['manual']?.[String(ep.id)]) {
|
||||||
|
result[String(ep.id)] = organized['manual'][String(ep.id)]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
res.json(result)
|
||||||
|
} catch (err) {
|
||||||
|
res.status(500).json({ error: err instanceof Error ? err.message : 'Erreur inconnue' })
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
// ── Debug ──────────────────────────────────────────────────────
|
||||||
app.get('/api/debug/stats', requireAuth, (req, res) => {
|
app.get('/api/debug/stats', requireAuth, (req, res) => {
|
||||||
const { devMode } = readSettings()
|
const { devMode } = readSettings()
|
||||||
if (!devMode) { res.status(403).json({ error: 'Dev mode désactivé' }); return }
|
if (!devMode) { res.status(403).json({ error: 'Dev mode désactivé' }); return }
|
||||||
|
|
||||||
const mem = process.memoryUsage()
|
const mem = process.memoryUsage()
|
||||||
const uptimeS = Math.floor(process.uptime())
|
const uptimeS = Math.floor(process.uptime())
|
||||||
const h = Math.floor(uptimeS / 3600)
|
const h = Math.floor(uptimeS / 3600)
|
||||||
const m = Math.floor((uptimeS % 3600) / 60)
|
const m = Math.floor((uptimeS % 3600) / 60)
|
||||||
const s = uptimeS % 60
|
const s = uptimeS % 60
|
||||||
|
|
||||||
let organizedCount = 0
|
let organizedCount = 0
|
||||||
try {
|
try {
|
||||||
const orgPath = path.join(DATA_DIR, 'organized.json')
|
const orgPath = path.join(DATA_DIR, 'organized.json')
|
||||||
@@ -543,48 +664,27 @@ app.get('/api/debug/stats', requireAuth, (req, res) => {
|
|||||||
organizedCount = Object.values(org).reduce((acc: number, episodes: any) => acc + Object.keys(episodes).length, 0)
|
organizedCount = Object.values(org).reduce((acc: number, episodes: any) => acc + Object.keys(episodes).length, 0)
|
||||||
}
|
}
|
||||||
} catch {}
|
} catch {}
|
||||||
|
|
||||||
res.json({
|
res.json({
|
||||||
memory: {
|
memory : { heapUsed: Math.round(mem.heapUsed / 1024 / 1024), heapTotal: Math.round(mem.heapTotal / 1024 / 1024), rss: Math.round(mem.rss / 1024 / 1024) },
|
||||||
heapUsed : Math.round(mem.heapUsed / 1024 / 1024),
|
cache : { entries: _cache.size, ttlHours: 6 },
|
||||||
heapTotal: Math.round(mem.heapTotal / 1024 / 1024),
|
uptime : `${h}h ${m}m ${s}s`,
|
||||||
rss : Math.round(mem.rss / 1024 / 1024),
|
|
||||||
},
|
|
||||||
cache: {
|
|
||||||
entries : _cache.size,
|
|
||||||
ttlHours : 6,
|
|
||||||
},
|
|
||||||
uptime: `${h}h ${m}m ${s}s`,
|
|
||||||
uptimeSeconds: uptimeS,
|
uptimeSeconds: uptimeS,
|
||||||
worker: {
|
worker : { running: workerRunning },
|
||||||
running: workerRunning,
|
organized: { trackedFiles: organizedCount },
|
||||||
},
|
requests : { notifs: recentOrganized.length },
|
||||||
organized: {
|
|
||||||
trackedFiles: organizedCount,
|
|
||||||
},
|
|
||||||
requests: {
|
|
||||||
notifs: recentOrganized.length,
|
|
||||||
},
|
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
// ── NFO Updates ────────────────────────────────────────────────
|
// ── NFO Updates ────────────────────────────────────────────────
|
||||||
|
|
||||||
interface NfoUpdateNotif {
|
interface NfoUpdateNotif {
|
||||||
serieTitle : string
|
serieTitle: string; commitSha: string; commitMsg: string
|
||||||
commitSha : string
|
updatedAt: string; status: 'updated' | 'error'; error?: string
|
||||||
commitMsg : string
|
|
||||||
updatedAt : string
|
|
||||||
status : 'updated' | 'error'
|
|
||||||
error? : string
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const recentNfoUpdates: NfoUpdateNotif[] = []
|
const recentNfoUpdates: NfoUpdateNotif[] = []
|
||||||
const MAX_NFO_NOTIFS = 30
|
const MAX_NFO_NOTIFS = 30
|
||||||
const NFO_COMMITS_PATH = path.join(DATA_DIR, 'nfo_commits.json')
|
const NFO_COMMITS_PATH = path.join(DATA_DIR, 'nfo_commits.json')
|
||||||
|
const GITLAB_API_NFO = 'https://gitlab.com/api/v4/projects/ElPouki%2Ffankai_pack/repository'
|
||||||
const GITLAB_API_NFO = 'https://gitlab.com/api/v4/projects/ElPouki%2Ffankai_pack/repository'
|
const GITLAB_RAW_NFO = 'https://gitlab.com/ElPouki/fankai_pack/-/raw/main/pack'
|
||||||
const GITLAB_RAW_NFO = 'https://gitlab.com/ElPouki/fankai_pack/-/raw/main/pack'
|
|
||||||
|
|
||||||
const SERIE_TITLE_GITLAB_MAP: Record<string, string> = {
|
const SERIE_TITLE_GITLAB_MAP: Record<string, string> = {
|
||||||
'Enfer Et Paradis Henshū' : 'Enfer et Paradis Henshū',
|
'Enfer Et Paradis Henshū' : 'Enfer et Paradis Henshū',
|
||||||
@@ -598,17 +698,12 @@ const SERIE_TITLE_GITLAB_MAP: Record<string, string> = {
|
|||||||
'Tower Of God Henshū' : 'Tower of God Henshū',
|
'Tower Of God Henshū' : 'Tower of God Henshū',
|
||||||
}
|
}
|
||||||
|
|
||||||
function getGitlabTitle(title: string): string {
|
function getGitlabTitle(title: string): string { return SERIE_TITLE_GITLAB_MAP[title] ?? title }
|
||||||
return SERIE_TITLE_GITLAB_MAP[title] ?? title
|
|
||||||
}
|
|
||||||
|
|
||||||
function loadNfoCommits(): Record<string, string> {
|
function loadNfoCommits(): Record<string, string> {
|
||||||
try {
|
try { if (!fs.existsSync(NFO_COMMITS_PATH)) return {}; return JSON.parse(fs.readFileSync(NFO_COMMITS_PATH, 'utf-8')) }
|
||||||
if (!fs.existsSync(NFO_COMMITS_PATH)) return {}
|
catch { return {} }
|
||||||
return JSON.parse(fs.readFileSync(NFO_COMMITS_PATH, 'utf-8'))
|
|
||||||
} catch { return {} }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function saveNfoCommits(commits: Record<string, string>) {
|
function saveNfoCommits(commits: Record<string, string>) {
|
||||||
fs.mkdirSync(path.dirname(NFO_COMMITS_PATH), { recursive: true })
|
fs.mkdirSync(path.dirname(NFO_COMMITS_PATH), { recursive: true })
|
||||||
fs.writeFileSync(NFO_COMMITS_PATH, JSON.stringify(commits, null, 2), 'utf-8')
|
fs.writeFileSync(NFO_COMMITS_PATH, JSON.stringify(commits, null, 2), 'utf-8')
|
||||||
@@ -616,8 +711,7 @@ function saveNfoCommits(commits: Record<string, string>) {
|
|||||||
|
|
||||||
async function getLatestGitlabCommit(gitlabTitle: string): Promise<{ sha: string; message: string } | null> {
|
async function getLatestGitlabCommit(gitlabTitle: string): Promise<{ sha: string; message: string } | null> {
|
||||||
try {
|
try {
|
||||||
const url = `${GITLAB_API_NFO}/commits?path=${encodeURIComponent('pack/' + gitlabTitle)}&per_page=1&ref_name=main`
|
const res = await fetch(`${GITLAB_API_NFO}/commits?path=${encodeURIComponent('pack/' + gitlabTitle)}&per_page=1&ref_name=main`, { headers: { 'User-Agent': 'fankarr' } })
|
||||||
const res = await fetch(url, { headers: { 'User-Agent': 'fankarr' } })
|
|
||||||
if (!res.ok) return null
|
if (!res.ok) return null
|
||||||
const data: any[] = await res.json()
|
const data: any[] = await res.json()
|
||||||
if (!data.length) return null
|
if (!data.length) return null
|
||||||
@@ -626,28 +720,18 @@ async function getLatestGitlabCommit(gitlabTitle: string): Promise<{ sha: string
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function downloadNfoFolder(gitlabTitle: string, destRoot: string): Promise<void> {
|
async function downloadNfoFolder(gitlabTitle: string, destRoot: string): Promise<void> {
|
||||||
let files: any[] = []
|
let files: any[] = [], page = 1
|
||||||
let page = 1
|
|
||||||
while (true) {
|
while (true) {
|
||||||
const batch = await fetch(
|
const batch = await fetch(`${GITLAB_API_NFO}/tree?path=${encodeURIComponent('pack/' + gitlabTitle)}&recursive=true&per_page=100&page=${page}&ref=main`, { headers: { 'User-Agent': 'fankarr' } }).then(r => r.ok ? r.json() : [])
|
||||||
`${GITLAB_API_NFO}/tree?path=${encodeURIComponent('pack/' + gitlabTitle)}&recursive=true&per_page=100&page=${page}&ref=main`,
|
|
||||||
{ headers: { 'User-Agent': 'fankarr' } }
|
|
||||||
).then(r => r.ok ? r.json() : [])
|
|
||||||
if (!Array.isArray(batch) || batch.length === 0) break
|
if (!Array.isArray(batch) || batch.length === 0) break
|
||||||
files.push(...batch)
|
files.push(...batch); if (batch.length < 100) break; page++
|
||||||
if (batch.length < 100) break
|
|
||||||
page++
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const blobs = files.filter((f: any) => f.type === 'blob')
|
|
||||||
let downloaded = 0, skipped = 0
|
let downloaded = 0, skipped = 0
|
||||||
|
for (const entry of files.filter((f: any) => f.type === 'blob')) {
|
||||||
for (const entry of blobs) {
|
|
||||||
const relativePath = entry.path.replace(`pack/${gitlabTitle}/`, '')
|
const relativePath = entry.path.replace(`pack/${gitlabTitle}/`, '')
|
||||||
const destPath = path.join(destRoot, relativePath)
|
const destPath = path.join(destRoot, relativePath)
|
||||||
try {
|
try {
|
||||||
const rawUrl = `${GITLAB_RAW_NFO}/${encodeURIComponent(gitlabTitle)}/${relativePath.split('/').map(encodeURIComponent).join('/')}`
|
const res = await fetch(`${GITLAB_RAW_NFO}/${encodeURIComponent(gitlabTitle)}/${relativePath.split('/').map(encodeURIComponent).join('/')}`, { headers: { 'User-Agent': 'fankarr' } })
|
||||||
const res = await fetch(rawUrl, { headers: { 'User-Agent': 'fankarr' } })
|
|
||||||
if (!res.ok) { skipped++; continue }
|
if (!res.ok) { skipped++; continue }
|
||||||
fs.mkdirSync(path.dirname(destPath), { recursive: true })
|
fs.mkdirSync(path.dirname(destPath), { recursive: true })
|
||||||
fs.writeFileSync(destPath, Buffer.from(await res.arrayBuffer()))
|
fs.writeFileSync(destPath, Buffer.from(await res.arrayBuffer()))
|
||||||
@@ -660,96 +744,59 @@ async function downloadNfoFolder(gitlabTitle: string, destRoot: string): Promise
|
|||||||
async function checkNfoUpdates() {
|
async function checkNfoUpdates() {
|
||||||
const { mediaPath, nfoSupport } = readSettings()
|
const { mediaPath, nfoSupport } = readSettings()
|
||||||
if (!nfoSupport) return
|
if (!nfoSupport) return
|
||||||
|
let organized: Record<string, Record<string, any>> = {}
|
||||||
let organized: Record<string, Record<string, string>> = {}
|
|
||||||
try { const p = path.join(DATA_DIR, 'organized.json'); if (fs.existsSync(p)) organized = JSON.parse(fs.readFileSync(p, 'utf-8')) } catch {}
|
try { const p = path.join(DATA_DIR, 'organized.json'); if (fs.existsSync(p)) organized = JSON.parse(fs.readFileSync(p, 'utf-8')) } catch {}
|
||||||
if (Object.keys(organized).length === 0) return
|
if (Object.keys(organized).length === 0) return
|
||||||
|
|
||||||
// Récupérer les titres de séries qu'on a déjà importées
|
|
||||||
const seriesData = await loadEnrichedSeriesData()
|
const seriesData = await loadEnrichedSeriesData()
|
||||||
const knownHashes = new Set(Object.keys(organized))
|
const knownHashes = new Set(Object.keys(organized))
|
||||||
const serieTitles = new Set<string>()
|
const serieTitles = new Set<string>()
|
||||||
|
|
||||||
for (const sd of seriesData) {
|
for (const sd of seriesData) {
|
||||||
const allTorrents = [
|
const allTorrents = [...(sd.torrents ?? []), ...(sd.seasons ?? []).flatMap((s: any) => s.torrents ?? []), ...(sd.seasons ?? []).flatMap((s: any) => (s.episodes ?? []).flatMap((e: any) => e.torrents ?? []))]
|
||||||
...(sd.torrents ?? []),
|
|
||||||
...(sd.seasons ?? []).flatMap((s: any) => s.torrents ?? []),
|
|
||||||
...(sd.seasons ?? []).flatMap((s: any) => (s.episodes ?? []).flatMap((e: any) => e.torrents ?? [])),
|
|
||||||
]
|
|
||||||
if (allTorrents.some((t: any) => knownHashes.has(t.infohash?.toLowerCase()))) {
|
if (allTorrents.some((t: any) => knownHashes.has(t.infohash?.toLowerCase()))) {
|
||||||
const rawTitle = sd.title ?? sd.show_title ?? ''
|
const rawTitle = sd.title ?? sd.show_title ?? ''
|
||||||
if (rawTitle) serieTitles.add(rawTitle.replace(/:/g, ' -').replace(/[<>"/\\|?*]/g, '').replace(/\s+/g, ' ').trim())
|
if (rawTitle) serieTitles.add(rawTitle.replace(/:/g, ' -').replace(/[<>"/\\|?*]/g, '').replace(/\s+/g, ' ').trim())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (serieTitles.size === 0) return
|
if (serieTitles.size === 0) return
|
||||||
|
|
||||||
const commits = loadNfoCommits()
|
const commits = loadNfoCommits()
|
||||||
let hasChanges = false
|
let hasChanges = false
|
||||||
|
|
||||||
for (const serieTitle of serieTitles) {
|
for (const serieTitle of serieTitles) {
|
||||||
const gitlabTitle = getGitlabTitle(serieTitle)
|
const gitlabTitle = getGitlabTitle(serieTitle)
|
||||||
const latest = await getLatestGitlabCommit(gitlabTitle)
|
const latest = await getLatestGitlabCommit(gitlabTitle)
|
||||||
if (!latest) continue
|
if (!latest || commits[gitlabTitle] === latest.sha) continue
|
||||||
|
|
||||||
const known = commits[gitlabTitle]
|
|
||||||
if (known === latest.sha) continue
|
|
||||||
|
|
||||||
// Nouveau commit détecté → re-télécharger
|
|
||||||
logger.info('nfo-update', `MAJ NFO détectée pour "${gitlabTitle}" (${latest.sha.slice(0, 8)})`)
|
logger.info('nfo-update', `MAJ NFO détectée pour "${gitlabTitle}" (${latest.sha.slice(0, 8)})`)
|
||||||
try {
|
try {
|
||||||
const destRoot = path.join(mediaPath, serieTitle)
|
await downloadNfoFolder(gitlabTitle, path.join(mediaPath, serieTitle))
|
||||||
await downloadNfoFolder(gitlabTitle, destRoot)
|
|
||||||
commits[gitlabTitle] = latest.sha
|
commits[gitlabTitle] = latest.sha
|
||||||
hasChanges = true
|
hasChanges = true
|
||||||
|
recentNfoUpdates.unshift({ serieTitle, commitSha: latest.sha.slice(0, 8), commitMsg: latest.message, updatedAt: new Date().toISOString(), status: 'updated' })
|
||||||
recentNfoUpdates.unshift({
|
|
||||||
serieTitle,
|
|
||||||
commitSha : latest.sha.slice(0, 8),
|
|
||||||
commitMsg : latest.message,
|
|
||||||
updatedAt : new Date().toISOString(),
|
|
||||||
status : 'updated',
|
|
||||||
})
|
|
||||||
if (recentNfoUpdates.length > MAX_NFO_NOTIFS) recentNfoUpdates.pop()
|
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
const msg = err instanceof Error ? err.message : 'Erreur inconnue'
|
const msg = err instanceof Error ? err.message : 'Erreur inconnue'
|
||||||
logger.error('nfo-update', `Échec MAJ NFO "${gitlabTitle}" : ${msg}`)
|
logger.error('nfo-update', `Échec MAJ NFO "${gitlabTitle}" : ${msg}`)
|
||||||
recentNfoUpdates.unshift({
|
recentNfoUpdates.unshift({ serieTitle, commitSha: latest.sha.slice(0, 8), commitMsg: latest.message, updatedAt: new Date().toISOString(), status: 'error', error: msg })
|
||||||
serieTitle,
|
|
||||||
commitSha : latest.sha.slice(0, 8),
|
|
||||||
commitMsg : latest.message,
|
|
||||||
updatedAt : new Date().toISOString(),
|
|
||||||
status : 'error',
|
|
||||||
error : msg,
|
|
||||||
})
|
|
||||||
if (recentNfoUpdates.length > MAX_NFO_NOTIFS) recentNfoUpdates.pop()
|
|
||||||
}
|
}
|
||||||
|
if (recentNfoUpdates.length > MAX_NFO_NOTIFS) recentNfoUpdates.pop()
|
||||||
}
|
}
|
||||||
|
|
||||||
if (hasChanges) saveNfoCommits(commits)
|
if (hasChanges) saveNfoCommits(commits)
|
||||||
}
|
}
|
||||||
|
|
||||||
app.get('/api/nfo-updates/recent', requireAuth, (_req, res) => {
|
app.get('/api/nfo-updates/recent', requireAuth, (_req, res) => { res.json(recentNfoUpdates) })
|
||||||
res.json(recentNfoUpdates)
|
|
||||||
})
|
|
||||||
|
|
||||||
app.post('/api/nfo-updates/check', requireAuth, async (_req, res) => {
|
app.post('/api/nfo-updates/check', requireAuth, async (_req, res) => {
|
||||||
logger.info('nfo-update', 'Vérification manuelle des MAJ NFO lancée')
|
logger.info('nfo-update', 'Vérification manuelle des MAJ NFO lancée')
|
||||||
checkNfoUpdates().catch(err => logger.error('nfo-update', `Vérif manuelle échouée : ${err instanceof Error ? err.message : err}`))
|
checkNfoUpdates().catch(err => logger.error('nfo-update', `Vérif manuelle échouée : ${err instanceof Error ? err.message : err}`))
|
||||||
res.json({ ok: true, message: 'Vérification lancée en arrière-plan' })
|
res.json({ ok: true, message: 'Vérification lancée en arrière-plan' })
|
||||||
})
|
})
|
||||||
|
|
||||||
|
// ── Catch-all SPA ──────────────────────────────────────────────
|
||||||
if (fs.existsSync(PUBLIC_PATH)) {
|
if (fs.existsSync(PUBLIC_PATH)) {
|
||||||
app.get('*path', (_req, res) => { res.sendFile(path.join(PUBLIC_PATH, 'index.html')) })
|
app.get('*path', (_req, res) => { res.sendFile(path.join(PUBLIC_PATH, 'index.html')) })
|
||||||
}
|
}
|
||||||
|
|
||||||
// ── Démarrage ──────────────────────────────────────────────────
|
// ── Démarrage ──────────────────────────────────────────────────
|
||||||
// FIX : maxHeaderSize à 32KB pour éviter l'erreur 431 (cookies trop volumineux, Firefox)
|
|
||||||
const server = http.createServer({ maxHeaderSize: 32768 }, app)
|
const server = http.createServer({ maxHeaderSize: 32768 }, app)
|
||||||
|
|
||||||
server.listen(PORT, async () => {
|
server.listen(PORT, async () => {
|
||||||
logger.info('api', `Serveur démarré sur le port ${PORT}`)
|
logger.info('api', `Serveur démarré sur le port ${PORT}`)
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const available = await readAvailable()
|
const available = await readAvailable()
|
||||||
logger.info('api', `Cache GitHub initialisé — ${available.length} séries disponibles`)
|
logger.info('api', `Cache GitHub initialisé — ${available.length} séries disponibles`)
|
||||||
@@ -760,9 +807,7 @@ server.listen(PORT, async () => {
|
|||||||
const ORGANIZED_PATH = path.join(DATA_DIR, 'organized.json')
|
const ORGANIZED_PATH = path.join(DATA_DIR, 'organized.json')
|
||||||
const { mediaPath } = readSettings()
|
const { mediaPath } = readSettings()
|
||||||
|
|
||||||
// Reset organized.json au nouveau format (clé episode_id au lieu de filename)
|
// Migration organized.json : si ancien format (valeurs string) → reset + rescan
|
||||||
// Si le fichier existe et contient l'ancien format (valeurs string), on le vide
|
|
||||||
// et on relance le scan pour reconstruire proprement
|
|
||||||
try {
|
try {
|
||||||
if (fs.existsSync(ORGANIZED_PATH)) {
|
if (fs.existsSync(ORGANIZED_PATH)) {
|
||||||
const raw = JSON.parse(fs.readFileSync(ORGANIZED_PATH, 'utf-8'))
|
const raw = JSON.parse(fs.readFileSync(ORGANIZED_PATH, 'utf-8'))
|
||||||
@@ -803,11 +848,10 @@ server.listen(PORT, async () => {
|
|||||||
setInterval(autoOrganize, 5 * 60_000)
|
setInterval(autoOrganize, 5 * 60_000)
|
||||||
}, 10_000)
|
}, 10_000)
|
||||||
|
|
||||||
// Vérification NFO GitLab toutes les heures
|
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
checkNfoUpdates().catch(err => logger.error('nfo-update', `Vérif initiale échouée : ${err instanceof Error ? err.message : err}`))
|
checkNfoUpdates().catch(err => logger.error('nfo-update', `Vérif initiale échouée : ${err instanceof Error ? err.message : err}`))
|
||||||
setInterval(() => {
|
setInterval(() => {
|
||||||
checkNfoUpdates().catch(err => logger.error('nfo-update', `Vérif horaire échouée : ${err instanceof Error ? err.message : err}`))
|
checkNfoUpdates().catch(err => logger.error('nfo-update', `Vérif horaire échouée : ${err instanceof Error ? err.message : err}`))
|
||||||
}, 60 * 60_000)
|
}, 60 * 60_000)
|
||||||
}, 30_000) // 30s après le démarrage pour ne pas surcharger
|
}, 30_000)
|
||||||
})
|
})
|
||||||
@@ -0,0 +1,312 @@
|
|||||||
|
<template>
|
||||||
|
<Teleport to="body">
|
||||||
|
<div class="fixed inset-0 bg-black/60 flex items-center justify-center z-50 px-4" @click.self="$emit('close')">
|
||||||
|
<div class="bg-card border border-border rounded-xl w-full max-w-3xl flex flex-col" style="max-height: 85vh">
|
||||||
|
|
||||||
|
<!-- Header -->
|
||||||
|
<div class="flex items-center justify-between px-6 py-4 border-b border-border shrink-0">
|
||||||
|
<div>
|
||||||
|
<h3 class="text-sm font-semibold text-primary">Import manuel — {{ serieName }}</h3>
|
||||||
|
<p class="text-xs text-muted mt-0.5">Associez vos fichiers existants aux épisodes du catalogue</p>
|
||||||
|
</div>
|
||||||
|
<button @click="$emit('close')" class="text-muted hover:text-primary transition-colors text-lg leading-none">✕</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Étape 1 : Choisir un dossier -->
|
||||||
|
<div v-if="step === 'folder'" class="flex flex-col gap-4 px-6 py-5">
|
||||||
|
<p class="text-sm text-secondary">Sélectionnez le dossier contenant vos fichiers vidéo :</p>
|
||||||
|
<button
|
||||||
|
@click="pickerOpen = true"
|
||||||
|
class="settings-input text-left font-mono truncate"
|
||||||
|
:class="selectedFolder ? 'text-primary' : 'text-muted'"
|
||||||
|
>
|
||||||
|
{{ selectedFolder || 'Choisir un dossier…' }}
|
||||||
|
</button>
|
||||||
|
<div class="flex gap-2">
|
||||||
|
<button @click="scanFolder" :disabled="!selectedFolder || scanning" class="btn-primary">
|
||||||
|
{{ scanning ? 'Scan…' : 'Scanner ce dossier' }}
|
||||||
|
</button>
|
||||||
|
<button @click="$emit('close')" class="btn-secondary">Annuler</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Étape 2 : Matcher les fichiers -->
|
||||||
|
<template v-else-if="step === 'match'">
|
||||||
|
|
||||||
|
<!-- Toolbar -->
|
||||||
|
<div class="flex items-center justify-between px-6 py-3 border-b border-border shrink-0 gap-3">
|
||||||
|
<p class="text-xs text-muted">
|
||||||
|
<span class="text-primary font-medium">{{ files.length }}</span> fichier{{ files.length > 1 ? 's' : '' }} trouvé{{ files.length > 1 ? 's' : '' }}
|
||||||
|
· <span class="text-green-400">{{ matchedCount }} matché{{ matchedCount > 1 ? 's' : '' }}</span>
|
||||||
|
<span v-if="unmatchedCount > 0"> · <span class="text-yellow-500">{{ unmatchedCount }} non matché{{ unmatchedCount > 1 ? 's' : '' }}</span></span>
|
||||||
|
</p>
|
||||||
|
<button @click="step = 'folder'" class="text-xs text-muted hover:text-primary transition-colors">← Changer de dossier</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Liste fichiers -->
|
||||||
|
<div class="overflow-y-auto flex-1 px-6 py-3 flex flex-col gap-2">
|
||||||
|
<div
|
||||||
|
v-for="(item, i) in items"
|
||||||
|
:key="item.file.path"
|
||||||
|
class="flex items-center gap-3 p-3 rounded-lg border transition-colors"
|
||||||
|
:class="item.episode_id
|
||||||
|
? 'border-green-500/20 bg-green-500/5'
|
||||||
|
: 'border-border bg-shell'"
|
||||||
|
>
|
||||||
|
<!-- Icône état -->
|
||||||
|
<div class="w-5 h-5 rounded-md flex items-center justify-center shrink-0"
|
||||||
|
:class="item.episode_id ? 'bg-green-500/15 text-green-400' : 'bg-border text-muted'">
|
||||||
|
<svg v-if="item.episode_id" width="10" height="10" viewBox="0 0 12 12" stroke="currentColor" stroke-width="2.5" fill="none"><polyline points="2 6 5 9 10 3"/></svg>
|
||||||
|
<svg v-else width="10" height="10" viewBox="0 0 12 12" stroke="currentColor" stroke-width="2" fill="none"><line x1="6" y1="2" x2="6" y2="7"/><circle cx="6" cy="9.5" r="0.5" fill="currentColor"/></svg>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Nom fichier -->
|
||||||
|
<div class="flex-1 min-w-0">
|
||||||
|
<p class="text-xs text-primary font-mono truncate">{{ item.file.name }}</p>
|
||||||
|
<p class="text-[11px] text-muted mt-0.5">{{ formatSize(item.file.size) }}</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Sélecteur épisode -->
|
||||||
|
<select
|
||||||
|
v-model="items[i].episode_id"
|
||||||
|
class="settings-input text-xs py-1 max-w-[260px] shrink-0"
|
||||||
|
@change="items[i].hash = getHashForEpisode(Number(items[i].episode_id))"
|
||||||
|
>
|
||||||
|
<option :value="null">— Non associé —</option>
|
||||||
|
<optgroup v-for="season in seasons" :key="season.id" :label="season.season_number === 0 ? 'Spéciaux' : `Saison ${season.season_number}`">
|
||||||
|
<option
|
||||||
|
v-for="ep in season.episodes"
|
||||||
|
:key="ep.id"
|
||||||
|
:value="ep.id"
|
||||||
|
:disabled="isEpisodeAlreadyUsed(ep.id, i)"
|
||||||
|
>
|
||||||
|
E{{ String(ep.episode_number).padStart(2, '0') }} — {{ ep.title || `Épisode ${ep.episode_number}` }}
|
||||||
|
{{ isEpisodeOrganized(ep.id) ? '✓' : '' }}
|
||||||
|
</option>
|
||||||
|
</optgroup>
|
||||||
|
</select>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Footer -->
|
||||||
|
<div class="flex items-center justify-between px-6 py-4 border-t border-border shrink-0">
|
||||||
|
<p v-if="importError" class="text-xs text-red-400">{{ importError }}</p>
|
||||||
|
<p v-else class="text-xs text-muted">
|
||||||
|
Seuls les fichiers associés à un épisode seront importés.
|
||||||
|
</p>
|
||||||
|
<div class="flex gap-2">
|
||||||
|
<button @click="$emit('close')" class="btn-secondary">Annuler</button>
|
||||||
|
<button
|
||||||
|
@click="doImport"
|
||||||
|
:disabled="matchedCount === 0 || importing"
|
||||||
|
class="btn-primary"
|
||||||
|
>
|
||||||
|
{{ importing ? 'Import…' : `Importer ${matchedCount} fichier${matchedCount > 1 ? 's' : ''}` }}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<!-- Étape 3 : Résultat -->
|
||||||
|
<div v-else-if="step === 'done'" class="flex flex-col items-center gap-4 px-6 py-10 text-center">
|
||||||
|
<div class="w-12 h-12 rounded-full bg-green-500/10 flex items-center justify-center">
|
||||||
|
<svg width="20" height="20" viewBox="0 0 24 24" stroke="#22c55e" stroke-width="2.5" fill="none"><polyline points="20 6 9 17 4 12"/></svg>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<p class="text-sm font-semibold text-primary">Import terminé</p>
|
||||||
|
<p class="text-xs text-muted mt-1">
|
||||||
|
{{ importResult.done }} fichier{{ importResult.done > 1 ? 's' : '' }} importé{{ importResult.done > 1 ? 's' : '' }}
|
||||||
|
<span v-if="importResult.errors.length > 0" class="text-red-400">
|
||||||
|
· {{ importResult.errors.length }} erreur{{ importResult.errors.length > 1 ? 's' : '' }}
|
||||||
|
</span>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div v-if="importResult.errors.length > 0" class="w-full text-left bg-red-500/5 border border-red-500/20 rounded-lg p-3">
|
||||||
|
<p class="text-xs text-red-400 font-medium mb-1.5">Erreurs</p>
|
||||||
|
<div v-for="e in importResult.errors" :key="e.file" class="text-xs text-muted mb-1">
|
||||||
|
<span class="text-primary font-mono">{{ e.file }}</span> — {{ e.error }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<button @click="$emit('close'); $emit('imported')" class="btn-primary">Fermer</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Folder Picker -->
|
||||||
|
<FolderPicker
|
||||||
|
v-if="pickerOpen"
|
||||||
|
:initial-path="selectedFolder || '/'"
|
||||||
|
@select="onFolderSelect"
|
||||||
|
@cancel="pickerOpen = false"
|
||||||
|
/>
|
||||||
|
</Teleport>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
import { ref, computed } from 'vue'
|
||||||
|
import FolderPicker from '@/components/FolderPicker.vue'
|
||||||
|
import { useToast } from '@/composables/useToast'
|
||||||
|
|
||||||
|
const { add: toast } = useToast()
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
serieId : number
|
||||||
|
serieName: string
|
||||||
|
seasons : any[]
|
||||||
|
organized: Record<string, any> // episode_id → entry
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const emit = defineEmits<{
|
||||||
|
close : []
|
||||||
|
imported: []
|
||||||
|
}>()
|
||||||
|
|
||||||
|
// ─── State ────────────────────────────────────────────────────
|
||||||
|
const step = ref<'folder' | 'match' | 'done'>('folder')
|
||||||
|
const pickerOpen = ref(false)
|
||||||
|
const selectedFolder = ref('')
|
||||||
|
const scanning = ref(false)
|
||||||
|
const importing = ref(false)
|
||||||
|
const importError = ref('')
|
||||||
|
const importResult = ref({ done: 0, errors: [] as { file: string; error: string }[] })
|
||||||
|
|
||||||
|
interface FileItem {
|
||||||
|
file : { name: string; path: string; size: number }
|
||||||
|
episode_id: number | null
|
||||||
|
hash : string | null
|
||||||
|
}
|
||||||
|
|
||||||
|
const files = ref<{ name: string; path: string; size: number }[]>([])
|
||||||
|
const items = ref<FileItem[]>([])
|
||||||
|
|
||||||
|
// ─── Computed ─────────────────────────────────────────────────
|
||||||
|
const matchedCount = computed(() => items.value.filter(i => i.episode_id !== null).length)
|
||||||
|
const unmatchedCount = computed(() => items.value.filter(i => i.episode_id === null).length)
|
||||||
|
|
||||||
|
// ─── Helpers ──────────────────────────────────────────────────
|
||||||
|
function isEpisodeOrganized(epId: number): boolean {
|
||||||
|
return !!props.organized?.[String(epId)]
|
||||||
|
}
|
||||||
|
|
||||||
|
function isEpisodeAlreadyUsed(epId: number, currentIndex: number): boolean {
|
||||||
|
return items.value.some((item, i) => i !== currentIndex && item.episode_id === epId)
|
||||||
|
}
|
||||||
|
|
||||||
|
function getHashForEpisode(episodeId: number): string | null {
|
||||||
|
for (const season of props.seasons) {
|
||||||
|
for (const ep of season.episodes) {
|
||||||
|
if (ep.id !== episodeId) continue
|
||||||
|
for (const p of ep.paths ?? []) {
|
||||||
|
if (typeof p === 'object' && p.infohash) return p.infohash.toLowerCase()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
// Auto-match : on essaie de matcher par original_filename, nfo_filename, formatted_name
|
||||||
|
function autoMatch(filename: string): { episode_id: number | null; hash: string | null } {
|
||||||
|
const lower = filename.toLowerCase()
|
||||||
|
|
||||||
|
for (const season of props.seasons) {
|
||||||
|
for (const ep of season.episodes) {
|
||||||
|
const candidates = [
|
||||||
|
ep.original_filename,
|
||||||
|
ep.nfo_filename?.replace(/\.nfo$/, '.mkv'),
|
||||||
|
ep.formatted_name ? ep.formatted_name.replace(/[<>:"/\\|?*]/g, '') + '.mkv' : null,
|
||||||
|
].filter(Boolean).map((s: string) => s.toLowerCase())
|
||||||
|
|
||||||
|
if (candidates.some(c => c === lower || lower.includes(c.replace(/\.mkv$/, '')))) {
|
||||||
|
const hash = getHashForEpisode(ep.id)
|
||||||
|
return { episode_id: ep.id, hash }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fallback : match par numéro d'épisode dans le nom de fichier
|
||||||
|
const numMatch = filename.match(/(?:e|ep|episode|épisode)[.\s_-]?0*(\d+)/i)
|
||||||
|
?? filename.match(/\b0*(\d{1,3})\b/)
|
||||||
|
if (numMatch) {
|
||||||
|
const num = parseInt(numMatch[1], 10)
|
||||||
|
for (const season of props.seasons) {
|
||||||
|
const ep = season.episodes.find((e: any) => e.episode_number === num)
|
||||||
|
if (ep) {
|
||||||
|
const hash = getHashForEpisode(ep.id)
|
||||||
|
return { episode_id: ep.id, hash }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return { episode_id: null, hash: null }
|
||||||
|
}
|
||||||
|
|
||||||
|
function formatSize(bytes: number): string {
|
||||||
|
if (!bytes) return '0 B'
|
||||||
|
const units = ['B', 'KB', 'MB', 'GB', 'TB']
|
||||||
|
const i = Math.floor(Math.log(bytes) / Math.log(1024))
|
||||||
|
return `${(bytes / Math.pow(1024, i)).toFixed(1)} ${units[i]}`
|
||||||
|
}
|
||||||
|
|
||||||
|
// ─── Actions ──────────────────────────────────────────────────
|
||||||
|
function onFolderSelect(p: string) {
|
||||||
|
selectedFolder.value = p
|
||||||
|
pickerOpen.value = false
|
||||||
|
}
|
||||||
|
|
||||||
|
async function scanFolder() {
|
||||||
|
if (!selectedFolder.value) return
|
||||||
|
scanning.value = true
|
||||||
|
try {
|
||||||
|
const res = await fetch(`/api/browse-files?path=${encodeURIComponent(selectedFolder.value)}`, { credentials: 'include' })
|
||||||
|
if (!res.ok) { toast('Erreur lors du scan', 'error'); return }
|
||||||
|
const data = await res.json()
|
||||||
|
files.value = data.files ?? []
|
||||||
|
|
||||||
|
items.value = files.value.map(f => {
|
||||||
|
const match = autoMatch(f.name)
|
||||||
|
return { file: f, ...match }
|
||||||
|
})
|
||||||
|
|
||||||
|
step.value = 'match'
|
||||||
|
} catch {
|
||||||
|
toast('Impossible de contacter le serveur', 'error')
|
||||||
|
} finally {
|
||||||
|
scanning.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function doImport() {
|
||||||
|
importing.value = true
|
||||||
|
importError.value = ''
|
||||||
|
|
||||||
|
const payload = items.value
|
||||||
|
.filter(i => i.episode_id !== null)
|
||||||
|
.map(i => ({
|
||||||
|
file_path : i.file.path,
|
||||||
|
episode_id : i.episode_id,
|
||||||
|
hash : i.hash,
|
||||||
|
}))
|
||||||
|
|
||||||
|
try {
|
||||||
|
const res = await fetch('/api/manual-import', {
|
||||||
|
method : 'POST',
|
||||||
|
headers : { 'Content-Type': 'application/json' },
|
||||||
|
credentials: 'include',
|
||||||
|
body : JSON.stringify({ serie_id: props.serieId, items: payload }),
|
||||||
|
})
|
||||||
|
|
||||||
|
const data = await res.json()
|
||||||
|
if (!res.ok) { importError.value = data.error ?? 'Erreur inconnue'; return }
|
||||||
|
|
||||||
|
importResult.value = { done: data.done, errors: data.errors ?? [] }
|
||||||
|
step.value = 'done'
|
||||||
|
} catch {
|
||||||
|
importError.value = 'Impossible de contacter le serveur'
|
||||||
|
} finally {
|
||||||
|
importing.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
@@ -62,6 +62,24 @@
|
|||||||
{{ data.serie.plot }}
|
{{ data.serie.plot }}
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
|
<button
|
||||||
|
@click="manualImportOpen = true"
|
||||||
|
class="inline-flex items-center gap-2 px-4 py-2 text-sm rounded-lg border border-border text-muted hover:text-primary hover:border-secondary transition"
|
||||||
|
>
|
||||||
|
Import manuel
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<!-- Modal -->
|
||||||
|
<ManualImportModal
|
||||||
|
v-if="manualImportOpen && data"
|
||||||
|
:serie-id="Number(route.params.id)"
|
||||||
|
:serie-name="data.serie.title"
|
||||||
|
:seasons="data.seasons"
|
||||||
|
:organized="organizedByEpisode"
|
||||||
|
@close="manualImportOpen = false"
|
||||||
|
@imported="load(); manualImportOpen = false"
|
||||||
|
/>
|
||||||
|
|
||||||
<!-- Boutons intégrale -->
|
<!-- Boutons intégrale -->
|
||||||
<div class="flex flex-wrap gap-2 mt-1">
|
<div class="flex flex-wrap gap-2 mt-1">
|
||||||
<button
|
<button
|
||||||
@@ -243,6 +261,7 @@ import { ArrowLeft, Tv, ChevronUp, Download, Loader, Check, X } from 'lucide-vue
|
|||||||
import { useSeriesStore } from '@/stores/series'
|
import { useSeriesStore } from '@/stores/series'
|
||||||
import { useToast } from '@/composables/useToast'
|
import { useToast } from '@/composables/useToast'
|
||||||
import type { Season } from '@/stores/series'
|
import type { Season } from '@/stores/series'
|
||||||
|
import ManualImportModal from "@/components/ManualImportModal.vue";
|
||||||
|
|
||||||
// ── Icône d'état du bouton ────────────────────────────────────
|
// ── Icône d'état du bouton ────────────────────────────────────
|
||||||
// states: 'idle' | 'loading' | 'done' | 'unavailable'
|
// states: 'idle' | 'loading' | 'done' | 'unavailable'
|
||||||
@@ -297,6 +316,17 @@ let pollTimer: ReturnType<typeof setInterval> | null = null
|
|||||||
|
|
||||||
const data = computed(() => store.currentSerie)
|
const data = computed(() => store.currentSerie)
|
||||||
|
|
||||||
|
|
||||||
|
const manualImportOpen = ref(false)
|
||||||
|
const organizedByEpisode = ref<Record<string, any>>({})
|
||||||
|
|
||||||
|
// Dans onMounted, après load() :
|
||||||
|
async function fetchOrganized() {
|
||||||
|
try {
|
||||||
|
const res = await fetch('/api/organized', { credentials: 'include' })
|
||||||
|
if (res.ok) organizedByEpisode.value = await res.json()
|
||||||
|
} catch {}
|
||||||
|
}
|
||||||
// ── Polling downloads ─────────────────────────────────────────
|
// ── Polling downloads ─────────────────────────────────────────
|
||||||
async function fetchActiveDownloads() {
|
async function fetchActiveDownloads() {
|
||||||
try {
|
try {
|
||||||
@@ -408,6 +438,7 @@ function formatDuration(seconds: number): string {
|
|||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
load()
|
load()
|
||||||
|
fetchOrganized()
|
||||||
fetchActiveDownloads()
|
fetchActiveDownloads()
|
||||||
pollTimer = setInterval(fetchActiveDownloads, 5000)
|
pollTimer = setInterval(fetchActiveDownloads, 5000)
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in new issue
Block a user