ani-auto 1.0.3 → 1.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ani-auto",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "description": "Automatic anime episode downloader",
   "bin": {
     "ani-auto": "./src/cli.js"

package/src/engine.js

@@ -10,6 +10,7 @@ const { loadConfig }             = require('./config');
 const db                         = require('./db');
 const { getUserList, pickTitle } = require('./anilist');
 const scraper                    = require('./scraper');
+const { version }                = require('../package.json');
 
 // ── Logging ────────────────────────────────────────────────────────────────
 
@@ -28,7 +29,12 @@ function buildFilename(title, episodeNum, season = null, displayEpisodeNum = nul
 }
 
 function buildFolderName(title) {
-    return title.replace(/[<>:"/\\|?*]/g, '').trim();
+    return title
+        .replace(/[\u2018\u2019\u201A\u201B]/g, "'")  // normalize smart single quotes
+        .replace(/[\u201C\u201D\u201E\u201F]/g, '"')  // normalize smart double quotes
+        .replace(/[<>:"/\\|?*]/g, '')                    // strip illegal path chars
+        .replace(/ +/g, ' ')                               // collapse spaces
+        .trim();
 }
 
 function detectSeason(title) {
@@ -95,7 +101,6 @@ async function resolveWatchList(config) {
 // ── Anime selector prompt ──────────────────────────────────────────────────
 
 async function promptAnimeSelection(watchList) {
-    // Show numbered list
     console.log(chalk.bold('\n  Available anime:'));
     watchList.forEach((item, i) => {
         const watched = item.watchedEpisodes ? chalk.gray(` (watched: ${item.watchedEpisodes})`) : '';
@@ -133,31 +138,28 @@ async function processAnime(workItem, config, multiBar, auto = false, runQuality
     const existingRow = db.getAnimeBySiteTitle(workItem.title);
     let siteAnime;
 
-    if (existingRow?.confirmed_site_id) {
-        // Already confirmed before — use saved match directly
-        siteAnime = { session: existingRow.confirmed_site_id, title: existingRow.confirmed_site_title };
+    // Always do a fresh search — session IDs expire on AnimePahe
+    const siteResults = await scraper.searchAll(workItem.title);
+    if (!siteResults.length) {
+        warn(`[${workItem.title}] Not found on site — skipping.`);
+        return { downloaded: 0, skipped: 0, failed: 0 };
+    }
+
+    if (existingRow?.confirmed_site_title) {
+        // We have a saved title preference — find it in fresh results
+        const savedMatch = siteResults.find(r =>
+            r.title?.toLowerCase() === existingRow.confirmed_site_title.toLowerCase()
+        ) || siteResults[0];
+        siteAnime = savedMatch;
         info(`[${workItem.title}] Using saved site match: ${chalk.bold(siteAnime.title)}`);
+        // Update session ID in DB
+        db.saveConfirmedSiteMatch(workItem.title, siteAnime.session, siteAnime.title);
     } else if (auto) {
-        // Auto mode — use top search result, save it
-        const siteResults = await scraper.searchAll(workItem.title);
-        if (!siteResults.length) {
-            warn(`[${workItem.title}] Not found on site — skipping.`);
-            return { downloaded: 0, skipped: 0, failed: 0 };
-        }
         siteAnime = siteResults[0];
         db.saveConfirmedSiteMatch(workItem.title, siteAnime.session, siteAnime.title);
         info(`[${workItem.title}] Auto-matched to: ${chalk.bold(siteAnime.title)}`);
     } else {
-        // Search and ask user to confirm
-        const siteResults = await scraper.searchAll(workItem.title);
-
-        if (!siteResults.length) {
-            warn(`[${workItem.title}] Not found on site — skipping.`);
-            return { downloaded: 0, skipped: 0, failed: 0 };
-        }
-
         const topResults = siteResults.slice(0, 5);
-
         const { pick } = await inquirer.prompt([{
             type:    'list',
             name:    'pick',
@@ -177,8 +179,6 @@ async function processAnime(workItem, config, multiBar, auto = false, runQuality
         }
 
         siteAnime = pick;
-
-        // Save confirmed match to DB so daemon never prompts again
         db.saveConfirmedSiteMatch(workItem.title, siteAnime.session, siteAnime.title);
         ok(`[${workItem.title}] Site match saved: ${chalk.bold(siteAnime.title)}`);
     }
@@ -192,7 +192,7 @@ async function processAnime(workItem, config, multiBar, auto = false, runQuality
         language:  workItem.language || null,
     });
 
-    // Check enabled flag — also check by title in case site match not yet confirmed
+    // Check enabled flag by title (AniList title) to respect ani-auto disable
     const enabledCheck = db.getAnimeBySiteTitle(workItem.title);
     if (dbRow.enabled === 0 || enabledCheck?.enabled === 0) {
         info(`[${workItem.title}] Disabled — skipping.`);
@@ -212,16 +212,10 @@ async function processAnime(workItem, config, multiBar, auto = false, runQuality
         return { downloaded: 0, skipped: 0, failed: 0 };
     }
 
-    // Sort episodes ascending by episode number
     const sortedEpisodes = [...episodes].sort((a, b) => a.episode - b.episode);
-
-    // AniList progress = episodes watched *within this season/entry*.
-    // The site may use absolute episode numbers (e.g. S2E1 = EP25).
-    // So we skip the first N episodes by position, not by episode number.
-    const watched = workItem.watchedEpisodes || 0;
-    const unwatched = sortedEpisodes.slice(watched);
-
-    const toDownload = unwatched.filter(ep => !db.isEpisodeDownloaded(dbRow.id, ep.episode));
+    const watched        = workItem.watchedEpisodes || 0;
+    const unwatched      = sortedEpisodes.slice(watched);
+    const toDownload     = unwatched.filter(ep => !db.isEpisodeDownloaded(dbRow.id, ep.episode));
 
     if (!toDownload.length) {
         info(`[${workItem.title}] Nothing new (watched ${watched}/${sortedEpisodes.length} episodes).`);
@@ -230,10 +224,13 @@ async function processAnime(workItem, config, multiBar, auto = false, runQuality
 
     info(`[${workItem.title}] ${toDownload.length} unwatched episode(s) to download (Q:${q} L:${l}, skipping first ${watched}).`);
 
-    const cleanTitle = buildFolderName(siteAnime.title || workItem.title);
-    // detectSeason from site title first, fall back to AniList title
-    const season     = detectSeason(cleanTitle) || detectSeason(workItem.title);
-    const outputDir  = path.join(config.outputDir, cleanTitle);
+    // Folder uses AniList title — consistent with what user sees on AniList
+    const cleanTitle   = buildFolderName(workItem.title);
+    const season       = detectSeason(workItem.title);
+    // Filename uses site title (better casing) with Season X stripped to avoid duplication
+    const siteClean    = buildFolderName(siteAnime.title || workItem.title);
+    const displayTitle = siteClean.replace(/[:\s]*season\s*\d+[:\s]*/gi, ' ').replace(/\s+/g, ' ').trim();
+    const outputDir    = path.join(config.outputDir, cleanTitle);
     if (!fs.existsSync(outputDir)) fs.mkdirSync(outputDir, { recursive: true });
 
     const queue       = [...toDownload];
@@ -252,16 +249,16 @@ async function processAnime(workItem, config, multiBar, auto = false, runQuality
             while (!success && attempts < MAX_RETRIES) {
                 attempts++;
                 try {
-                    const links    = await scraper.getDownloadLinks(siteAnime.session, ep.session);
-                    const link     = scraper.pickLink(links, q, l);
+                    const links = await scraper.getDownloadLinks(siteAnime.session, ep.session);
+                    const link  = scraper.pickLink(links, q, l);
                     if (!link?.mp4Url) throw new Error('No suitable download link found');
 
-                    // Each site listing is per-season, so episode position in sortedEpisodes
-                    // directly equals the season episode number (1-indexed).
+                    // Per-season site listing: position in sortedEpisodes = season episode number
                     const relativeEp = season
                         ? sortedEpisodes.findIndex(e => e.episode === ep.episode) + 1
                         : ep.episode;
-                    const filename = buildFilename(cleanTitle, ep.episode, season, relativeEp);
+
+                    const filename = buildFilename(displayTitle, ep.episode, season, relativeEp);
                     await scraper.downloadEpisode(link.mp4Url, filename, outputDir, multiBar, ep.episode);
 
                     db.markEpisodeStatus(dbRow.id, ep.episode, 'done', filename);
@@ -292,9 +289,9 @@ async function runCycle({ auto = false, quality = null, language = null } = {})
     await db.initDb();
     const config = loadConfig();
 
-    console.log(chalk.bold.red('\n  ╔══════════════════════════════╗'));
-    console.log(chalk.bold.red('  ║      ANI-AUTO — CHECK RUN    ║'));
-    console.log(chalk.bold.red('  ╚══════════════════════════════╝\n'));
+    console.log(chalk.bold.red('\n  ╔════════════════════════════════╗'));
+    console.log(chalk.bold.red(`  ║   ANI-AUTO v${version} — CHECK RUN  ║`));
+    console.log(chalk.bold.red('  ╚════════════════════════════════╝\n'));
 
     const watchList = await resolveWatchList(config);