ani-auto 1.2.0 → 1.2.2

package/package.json

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

package/src/cli.js

@@ -126,9 +126,10 @@ program
         banner();
         try {
             const config = loadConfig();
-            let quality  = config.quality  || '1080p';
-            let language = config.language || 'sub';
-            let range    = null;
+            let quality      = config.quality       || '1080p';
+            let language     = config.language      || 'sub';
+            let range        = null;
+            let runStatuses  = config.watchStatuses || ['CURRENT'];
 
             if (!opts.auto) {
                 const { pickedQuality, saveAsDefault } = await inquirer.prompt([
@@ -152,6 +153,21 @@ program
                     console.log(chalk.green(`  ✔  Saved default quality: ${quality}\n`));
                 }
 
+                // Status selection for this run
+                const { pickedStatuses } = await inquirer.prompt([{
+                    type:    'checkbox',
+                    name:    'pickedStatuses',
+                    message: 'AniList statuses to fetch for this run:',
+                    choices: [
+                        { name: 'CURRENT   (Watching)',      value: 'CURRENT',   checked: (config.watchStatuses || ['CURRENT']).includes('CURRENT') },
+                        { name: 'PLANNING  (Plan to Watch)', value: 'PLANNING',  checked: (config.watchStatuses || []).includes('PLANNING') },
+                        { name: 'PAUSED',                    value: 'PAUSED',    checked: (config.watchStatuses || []).includes('PAUSED') },
+                        { name: 'REPEATING',                 value: 'REPEATING', checked: (config.watchStatuses || []).includes('REPEATING') },
+                    ],
+                    validate: v => v.length > 0 ? true : 'Select at least one status',
+                }]);
+                runStatuses = pickedStatuses;
+
                 const { useRange } = await inquirer.prompt([{
                     type:    'confirm',
                     name:    'useRange',
@@ -178,7 +194,7 @@ program
                 }
             }
 
-            await runCycle({ auto: !!opts.auto, quality, language, range });
+            await runCycle({ auto: !!opts.auto, quality, language, range, statuses: runStatuses });
         }
         catch (e) { console.error(chalk.red('[ERROR]'), e.message); process.exit(1); }
     });

package/src/engine.js

@@ -31,10 +31,10 @@ function buildFilename(title, episodeNum, season = null, displayEpisodeNum = nul
 
 function buildFolderName(title) {
     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
+        .replace(/[\u2018\u2019\u201A\u201B]/g, "'")
+        .replace(/[\u201C\u201D\u201E\u201F]/g, '"')
+        .replace(/[<>:"/\\|?*]/g, '')
+        .replace(/ +/g, ' ')
         .trim();
 }
 
@@ -68,6 +68,7 @@ async function resolveWatchList(config) {
                     watchedEpisodes: entry.progress || 0,
                     knownEpisodes:   entry.totalEpisodes,
                     animeStatus:     entry.animeStatus,
+                    anilistStatus:   entry.status,
                 });
             }
             info(`AniList returned ${chalk.bold(entries.length)} entries.`);
@@ -87,6 +88,7 @@ async function resolveWatchList(config) {
             watchedEpisodes: 0,
             knownEpisodes:   null,
             animeStatus:     null,
+            anilistStatus:   null,
         });
     }
 
@@ -105,7 +107,8 @@ async function promptAnimeSelection(watchList) {
     console.log(chalk.bold('\n  Available anime:'));
     watchList.forEach((item, i) => {
         const watched = item.watchedEpisodes ? chalk.gray(` (watched: ${item.watchedEpisodes})`) : '';
-        console.log(`  ${chalk.cyan(i + 1)}. ${item.title}${watched}`);
+        const status  = item.anilistStatus   ? chalk.gray(` [${item.anilistStatus}]`) : '';
+        console.log(`  ${chalk.cyan(i + 1)}. ${item.title}${watched}${status}`);
     });
     console.log(`  ${chalk.cyan('a')}. All`);
     console.log('');
@@ -135,11 +138,9 @@ async function processAnime(workItem, config, multiBar, auto = false, runQuality
     const q = runQuality  || workItem.quality  || config.quality  || '1080p';
     const l = runLanguage || workItem.language || config.language || 'sub';
 
-    // Check if we already have a confirmed site match saved in DB
     const existingRow = db.getAnimeBySiteTitle(workItem.title);
     let siteAnime;
 
-    // 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.`);
@@ -147,13 +148,11 @@ async function processAnime(workItem, config, multiBar, auto = false, runQuality
     }
 
     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) {
         siteAnime = siteResults[0];
@@ -193,7 +192,6 @@ async function processAnime(workItem, config, multiBar, auto = false, runQuality
         language:  workItem.language || null,
     });
 
-    // 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.`);
@@ -218,7 +216,6 @@ async function processAnime(workItem, config, multiBar, auto = false, runQuality
     const unwatched      = sortedEpisodes.slice(watched);
     let toDownload = unwatched.filter(ep => !db.isEpisodeDownloaded(dbRow.id, ep.episode));
 
-    // Apply episode range filter if specified
     if (range) {
         const clean = range.trim();
         let rangeFrom, rangeTo;
@@ -227,7 +224,6 @@ async function processAnime(workItem, config, multiBar, auto = false, runQuality
         } else {
             [rangeFrom, rangeTo] = clean.split('-').map(Number);
         }
-        // Range is relative to the unwatched slice (1 = first unwatched episode)
         toDownload = toDownload.filter((ep, idx) => {
             const pos = idx + 1;
             return pos >= rangeFrom && pos <= rangeTo;
@@ -242,10 +238,8 @@ 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}).`);
 
-    // 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);
@@ -256,6 +250,15 @@ async function processAnime(workItem, config, multiBar, auto = false, runQuality
     const concurrency = Math.min(config.concurrency || 2, queue.length);
     const MAX_RETRIES = config.maxRetries || 3;
 
+    // Pre-compute relative episode numbers before queueing
+    const epRelativeMap = new Map();
+    toDownload.forEach((ep, idx) => {
+        const relEp = season
+            ? sortedEpisodes.findIndex(e => e.episode === ep.episode) + 1
+            : ep.episode;
+        epRelativeMap.set(ep.episode, relEp);
+    });
+
     const workers = Array(concurrency).fill(0).map(async () => {
         while (queue.length > 0) {
             const ep     = queue.shift();
@@ -271,11 +274,7 @@ async function processAnime(workItem, config, multiBar, auto = false, runQuality
                     const link  = scraper.pickLink(links, q, l);
                     if (!link?.mp4Url) throw new Error('No suitable download link found');
 
-                    // Per-season site listing: position in sortedEpisodes = season episode number
-                    const relativeEp = season
-                        ? sortedEpisodes.findIndex(e => e.episode === ep.episode) + 1
-                        : ep.episode;
-
+                    const relativeEp = epRelativeMap.get(ep.episode) || ep.episode;
                     const filename = buildFilename(displayTitle, ep.episode, season, relativeEp);
                     await scraper.downloadEpisode(link.mp4Url, filename, outputDir, multiBar, ep.episode);
 
@@ -305,15 +304,19 @@ async function processAnime(workItem, config, multiBar, auto = false, runQuality
 
 // ── Main cycle ─────────────────────────────────────────────────────────────
 
-async function runCycle({ auto = false, quality = null, language = null, range = null } = {}) {
+async function runCycle({ auto = false, quality = null, language = null, range = null, statuses = null } = {}) {
     await db.initDb();
     const config = loadConfig();
 
-    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'));
+    console.log(chalk.bold.red('  ╚════════════════════════════════╝\n'));
 
-    const watchList = await resolveWatchList(config);
+    // Use run-level statuses if provided, otherwise fall back to config
+    const effectiveConfig = statuses
+        ? { ...config, watchStatuses: statuses }
+        : config;
+    const watchList = await resolveWatchList(effectiveConfig);
 
     if (!watchList.length) {
         warn('Watch list is empty. Add entries via AniList or `ani-auto add`.');