reelsort 0.2.4 → 0.2.6

package/dist/index.mjs

@@ -54,6 +54,10 @@ var db = () => {
     _db.exec("ALTER TABLE shows ADD COLUMN title TEXT");
   } catch {
   }
+  try {
+    _db.exec("ALTER TABLE imports ADD COLUMN type TEXT");
+  } catch {
+  }
   return _db;
 };
 var recordRename = (sessionId, oldPath, newPath) => {
@@ -67,8 +71,16 @@ var getLastSession = () => {
 var deleteSession = (sessionId) => {
   db().prepare("DELETE FROM renameHistory WHERE sessionId = ?").run(sessionId);
 };
-var recordImport = (sessionId, sourcePath, destPath, mode, tmdbId) => {
-  db().prepare("INSERT INTO imports (sessionId, sourcePath, destinationPath, mode, tmdbId) VALUES (?, ?, ?, ?, ?)").run(sessionId, sourcePath, destPath, mode, tmdbId ?? null);
+var getLastImportSession = () => {
+  const last = db().prepare("SELECT sessionId FROM imports ORDER BY id DESC LIMIT 1").get();
+  if (!last) return [];
+  return db().prepare("SELECT * FROM imports WHERE sessionId = ? ORDER BY id DESC").all(last.sessionId);
+};
+var deleteImportSession = (sessionId) => {
+  db().prepare("DELETE FROM imports WHERE sessionId = ?").run(sessionId);
+};
+var recordImport = (sessionId, sourcePath, destPath, mode, tmdbId, type) => {
+  db().prepare("INSERT INTO imports (sessionId, sourcePath, destinationPath, mode, tmdbId, type) VALUES (?, ?, ?, ?, ?, ?)").run(sessionId, sourcePath, destPath, mode, tmdbId ?? null, type ?? null);
 };
 var getMediaInfo = (filePath) => {
   return db().prepare("SELECT * FROM mediaInfo WHERE filePath = ?").get(filePath);
@@ -244,10 +256,10 @@ var saveConfig = (config) => {
 };
 
 // src/helpers/formatEpisode.ts
-var DEFAULT_EPISODE_FORMAT = "{s}x{ee}";
+var DEFAULT_EPISODE_FORMAT = "{s}x{ee} - {title}";
 var DEFAULT_SEASON_FORMAT = "Season {s}";
 var renderEpisode = (format, season, episode, title, name) => {
-  return format.replace(/\{sss\}/g, season.toString().padStart(3, "0")).replace(/\{ss\}/g, season.toString().padStart(2, "0")).replace(/\{s\}/g, season.toString()).replace(/\{eee\}/g, episode.toString().padStart(3, "0")).replace(/\{ee\}/g, episode.toString().padStart(2, "0")).replace(/\{e\}/g, episode.toString()).replace(/\{title\}/g, title ?? "").replace(/\{name\}/g, name ?? "").replace(/\s+/g, " ").trim();
+  return format.replace(/\{sss\}/g, season.toString().padStart(3, "0")).replace(/\{ss\}/g, season.toString().padStart(2, "0")).replace(/\{s\}/g, season.toString()).replace(/\{eee\}/g, episode.toString().padStart(3, "0")).replace(/\{ee\}/g, episode.toString().padStart(2, "0")).replace(/\{e\}/g, episode.toString()).replace(/\{show\}/g, title ?? "").replace(/\{title\}/g, name ?? "").replace(/(\s*-\s*)+$/, "").replace(/^(\s*-\s*)+/, "").replace(/\s+/g, " ").trim();
 };
 var formatSeasonFolder = (format, season) => format.replace(/\{sss\}/g, season.toString().padStart(3, "0")).replace(/\{ss\}/g, season.toString().padStart(2, "0")).replace(/\{s\}/g, season.toString()).trim();
 var formatEpisode = (season, episode, format = DEFAULT_EPISODE_FORMAT, double = false, title, name) => {
@@ -1060,7 +1072,7 @@ var reset = async ({ dir: inputDir, double }) => {
 var reset_default = reset;
 
 // src/actions/scan.ts
-import { cpSync, existsSync as existsSync9, linkSync, lstatSync as lstatSync4, mkdirSync as mkdirSync3, readdirSync as readdirSync7, renameSync as renameSync3, rmSync as rmSync2, statSync as statSync2 } from "fs";
+import { cpSync, existsSync as existsSync10, linkSync, lstatSync as lstatSync4, mkdirSync as mkdirSync4, readdirSync as readdirSync7, renameSync as renameSync4, rmSync as rmSync3, statSync as statSync2 } from "fs";
 import { dirname as dirname2, resolve as resolve8 } from "path";
 import { Color as Color9, MultiSelect as MultiSelect2, Select as Select2 } from "termkit";
 
@@ -1085,10 +1097,49 @@ var detectEdition = (filename) => {
 // src/helpers/hyperlink.ts
 var hyperlink = (url, text) => `\x1B]8;;${url}\x1B\\${text}\x1B]8;;\x1B\\`;
 
+// src/helpers/trash.ts
+import { execSync } from "child_process";
+import { existsSync as existsSync9, mkdirSync as mkdirSync3, renameSync as renameSync3, rmSync as rmSync2 } from "fs";
+import { homedir as homedir3 } from "os";
+import { basename as basename3, join as join3 } from "path";
+var trashDir = () => {
+  if (process.platform === "linux") return join3(homedir3(), ".local", "share", "Trash", "files");
+  return join3(homedir3(), ".Trash");
+};
+var trashPath = (filePath, opts) => {
+  if (process.platform === "darwin" || process.platform === "linux") {
+    try {
+      const dir = trashDir();
+      if (!existsSync9(dir)) mkdirSync3(dir, { recursive: true });
+      const name = basename3(filePath);
+      let dest = join3(dir, name);
+      let i = 1;
+      while (existsSync9(dest)) dest = join3(dir, `${name} ${i++}`);
+      renameSync3(filePath, dest);
+      return;
+    } catch {
+    }
+  } else if (process.platform === "win32") {
+    try {
+      const escaped = filePath.replace(/'/g, "''");
+      const isDir = opts?.recursive ?? false;
+      const method = isDir ? "DeleteDirectory" : "DeleteFile";
+      execSync(
+        `powershell -NoProfile -NonInteractive -Command "Add-Type -AssemblyName Microsoft.VisualBasic; [Microsoft.VisualBasic.FileIO.FileSystem]::${method}('${escaped}', 'OnlyErrorDialogs', 'SendToRecycleBin')"`,
+        { stdio: "ignore" }
+      );
+      return;
+    } catch {
+    }
+  }
+  rmSync2(filePath, { recursive: opts?.recursive ?? false, force: true });
+};
+
 // src/helpers/parseDownloadName.ts
 var QUALITY_TOKENS = /* @__PURE__ */ new Set(["480p", "576p", "720p", "1080p", "2160p", "4k", "8k", "bluray", "bdrip", "bdremux", "brrip", "webrip", "web-dl", "webdl", "web", "hdtv", "dvdrip", "dvdscr", "cam", "ts", "scr", "x264", "x265", "hevc", "avc", "h264", "h265", "xvid", "divx", "dts", "ac3", "aac", "mp3", "truehd", "atmos", "dd5", "hdr", "hdr10", "hlg", "dv", "dolby", "remux", "proper", "repack", "extended", "theatrical", "unrated", "multi", "dubbed", "subbed", "internal"]);
 var TV_PATTERN = /^(.*?)[.\s_-]*(?:S(\d{2,3})E(\d{2,3})|(\d{1,2})x(\d{2,3})|Season[\s.](\d+))/i;
-var parseDownloadName = (name) => {
+var parseDownloadName = (rawName) => {
+  const name = rawName.replace(/^[\w.-]+\.\w{2,6}\s+-+\s+/i, "");
   const base = name.replace(/\.[a-z0-9]{2,4}$/i, "");
   const tvMatch = TV_PATTERN.exec(base);
   if (tvMatch) {
@@ -1187,7 +1238,7 @@ var bookExtensions_default = ["epub", "mobi", "azw3", "azw"];
 var sameDev = (a, b) => {
   try {
     let bExisting = b;
-    while (!existsSync9(bExisting)) bExisting = dirname2(bExisting);
+    while (!existsSync10(bExisting)) bExisting = dirname2(bExisting);
     return statSync2(a).dev === statSync2(bExisting).dev;
   } catch {
     return false;
@@ -1195,10 +1246,10 @@ var sameDev = (a, b) => {
 };
 var moveFolder = (src, dest) => {
   if (sameDev(src, dest)) {
-    renameSync3(src, dest);
+    renameSync4(src, dest);
   } else {
     cpSync(src, dest, { recursive: true });
-    rmSync2(src, { recursive: true, force: true });
+    trashPath(src, { recursive: true });
   }
 };
 var findVideo = (dir) => readdirSync7(dir).find((f) => {
@@ -1299,7 +1350,7 @@ var gatherEntries = (source) => {
   return result;
 };
 var findShowFolder = (destRoot, title) => {
-  if (!existsSync9(destRoot)) return null;
+  if (!existsSync10(destRoot)) return null;
   const normalize = (s) => s.toLowerCase().replace(/[^a-z0-9]/g, "");
   const target = normalize(title);
   return readdirSync7(destRoot).filter((f) => {
@@ -1311,7 +1362,7 @@ var findShowFolder = (destRoot, title) => {
   }).find((f) => normalize(f) === target) ?? null;
 };
 var findShowFolderByContent = (destRoot, title) => {
-  if (!existsSync9(destRoot)) return null;
+  if (!existsSync10(destRoot)) return null;
   const normalize = (s) => s.toLowerCase().replace(/[^a-z0-9]/g, "");
   const target = normalize(title);
   const matchesTitle = (name) => {
@@ -1339,8 +1390,8 @@ var findShowFolderByContent = (destRoot, title) => {
   }
   return null;
 };
-var findSeasonFolder = (showPath, season) => {
-  if (!existsSync9(showPath)) return null;
+var findSeasonFolder = (showPath, season, specialsFolder) => {
+  if (!existsSync10(showPath)) return null;
   const folders = readdirSync7(showPath).filter((f) => {
     try {
       return lstatSync4(resolve8(showPath, f)).isDirectory();
@@ -1348,6 +1399,10 @@ var findSeasonFolder = (showPath, season) => {
       return false;
     }
   });
+  if (season === 0 && specialsFolder) {
+    const existing = folders.find((f) => f.toLowerCase() === specialsFolder.toLowerCase());
+    if (existing) return existing;
+  }
   return folders.find((f) => {
     const match = f.match(/(?:season|s)\s*0*(\d+)/i);
     return match && parseInt(match[1]) === season;
@@ -1363,12 +1418,12 @@ var classifyMovieConfidence = (entry) => {
   return "ambiguous";
 };
 var typeColor = {
-  movie: Color9.white.cyan,
-  tv: Color9.white.green,
-  book: Color9.white.yellow,
-  ps3: Color9.white.magenta
+  movie: (s) => Color9.cyan.encoder(s),
+  tv: (s) => Color9.green.encoder(s),
+  book: (s) => Color9.yellow.encoder(s),
+  ps3: (s) => Color9.magenta.encoder(s)
 };
-var typeGlyph = (t) => typeColor[t].encoder("\u25CF");
+var typeGlyph = (t) => typeColor[t]("\u25CF");
 var typeTag = (t) => isVerbose() ? Color9.white.faint.encoder(` (${t})`) : "";
 var scan = async ({ type, hardlink: useHardlink, dryRun, auto, force, interactive }) => {
   const config = getConfig();
@@ -1376,11 +1431,13 @@ var scan = async ({ type, hardlink: useHardlink, dryRun, auto, force, interactiv
   const language = config.language ?? "eng";
   const movieFormat = config.format?.movie ?? DEFAULT_MOVIE_FORMAT;
   const seasonFormat = config.format?.season ?? DEFAULT_SEASON_FORMAT;
+  const specialsFolder = config.specialsFolder ?? "Specials";
   const lookupMovie = async (parsed) => {
     let tmdbId;
     let resolvedTitle = parsed.title;
     let resolvedYear = parsed.year;
     if (config.tmdbApiKey) {
+      spinner_default.text = `TMDb: ${parsed.title}`;
       const results = await searchMovie(parsed.title, parsed.year, config.tmdbApiKey);
       if (results.length === 1) {
         tmdbId = results[0].id;
@@ -1409,7 +1466,7 @@ var scan = async ({ type, hardlink: useHardlink, dryRun, auto, force, interactiv
     const edition = detectEdition(entry);
     const folderName = formatMovieName(movieFormat, resolvedTitle, resolvedYear, edition);
     const destFolder = resolve8(destRoot, folderName);
-    if (existsSync9(destFolder)) {
+    if (existsSync10(destFolder)) {
       spinner_default.warn(`already exists: ${folderName}`);
       return false;
     }
@@ -1428,7 +1485,7 @@ var scan = async ({ type, hardlink: useHardlink, dryRun, auto, force, interactiv
     const destSubtitleName = subtitle && subtitleExt ? `${folderName}.${subtitleExt}` : null;
     if (!dryRun) {
       if (useHardlink) {
-        mkdirSync3(destFolder, { recursive: true });
+        mkdirSync4(destFolder, { recursive: true });
         const destVideoPath = resolve8(destFolder, destVideoName);
         let mode;
         try {
@@ -1441,28 +1498,28 @@ var scan = async ({ type, hardlink: useHardlink, dryRun, auto, force, interactiv
           mode = "copy";
         }
         if (subtitleSourcePath && destSubtitleName) cpSync(subtitleSourcePath, resolve8(destFolder, destSubtitleName));
-        recordImport(sessionId, entryPath, destFolder, mode, tmdbId);
+        recordImport(sessionId, entryPath, destFolder, mode, tmdbId, "movie");
       } else {
         if (isDir) {
           const keep = new Set([videoFile, subtitle].filter(Boolean));
-          for (const f of dirFiles.filter((f2) => !keep.has(f2))) rmSync2(resolve8(entryPath, f), { recursive: true, force: true });
-          renameSync3(videoSourcePath, resolve8(entryPath, destVideoName));
-          if (subtitleSourcePath && destSubtitleName) renameSync3(subtitleSourcePath, resolve8(entryPath, destSubtitleName));
+          for (const f of dirFiles.filter((f2) => !keep.has(f2))) trashPath(resolve8(entryPath, f), { recursive: true });
+          renameSync4(videoSourcePath, resolve8(entryPath, destVideoName));
+          if (subtitleSourcePath && destSubtitleName) renameSync4(subtitleSourcePath, resolve8(entryPath, destSubtitleName));
           moveFolder(entryPath, destFolder);
         } else {
-          mkdirSync3(destFolder, { recursive: true });
+          mkdirSync4(destFolder, { recursive: true });
           const destVideoPath = resolve8(destFolder, destVideoName);
           if (sameDev(videoSourcePath, destRoot)) {
-            renameSync3(videoSourcePath, destVideoPath);
+            renameSync4(videoSourcePath, destVideoPath);
           } else {
             cpSync(videoSourcePath, destVideoPath);
-            rmSync2(videoSourcePath);
+            trashPath(videoSourcePath);
           }
         }
-        recordImport(sessionId, entryPath, destFolder, "move", tmdbId);
+        recordImport(sessionId, entryPath, destFolder, "move", tmdbId, "movie");
       }
     }
-    spinner_default.succeed(`${dryRun ? "[dry] " : ""}${typeGlyph("movie")} ${typeColor.movie.encoder(folderName)}${typeTag("movie")}`);
+    spinner_default.succeed(`${dryRun ? "[dry] " : ""}${typeGlyph("movie")} ${typeColor.movie(folderName)}${typeTag("movie")}`);
     return true;
   };
   spinner_default.start();
@@ -1473,12 +1530,13 @@ var scan = async ({ type, hardlink: useHardlink, dryRun, auto, force, interactiv
   const ignoreSet = new Set(config.ignore ?? []);
   const seenIgnored = /* @__PURE__ */ new Set();
   for (const source of config.sources) {
-    if (!existsSync9(source)) {
+    if (!existsSync10(source)) {
       spinner_default.warn(`source not found: ${Color9.white.encoder(source)}`);
       continue;
     }
     spinner_default.text = `scanning ${Color9.white.encoder(source)}`;
     for (const { entry, entryPath, isDir } of gatherEntries(source)) {
+      spinner_default.text = `scanning: ${entry}`;
       if (ignoreSet.has(entry)) {
         seenIgnored.add(entry);
         if (isVerbose()) spinner_default.info(`ignored: ${entry}`);
@@ -1514,22 +1572,22 @@ var scan = async ({ type, hardlink: useHardlink, dryRun, auto, force, interactiv
         }
         const destName = `${nameMatch[0]} [${id}]`;
         const destPath = resolve8(destRoot, destName);
-        if (existsSync9(destPath)) {
+        if (existsSync10(destPath)) {
           spinner_default.warn(`already exists: ${destName}`);
           skipped++;
           continue;
         }
         if (!dryRun) {
           moveFolder(entryPath, destPath);
-          recordImport(sessionId, entryPath, destPath, "move");
+          recordImport(sessionId, entryPath, destPath, "move", void 0, "ps3");
         }
-        spinner_default.succeed(`${dryRun ? "[dry] " : ""}${typeGlyph("ps3")} ${typeColor.ps3.encoder(destName)}${typeTag("ps3")}`);
+        spinner_default.succeed(`${dryRun ? "[dry] " : ""}${typeGlyph("ps3")} ${typeColor.ps3(destName)}${typeTag("ps3")}`);
         imported++;
         continue;
       }
       if (detectedType === "book") {
         const destPath = resolve8(destRoot, entry);
-        if (existsSync9(destPath)) {
+        if (existsSync10(destPath)) {
           spinner_default.warn(`already exists: ${entry}`);
           skipped++;
           continue;
@@ -1538,17 +1596,17 @@ var scan = async ({ type, hardlink: useHardlink, dryRun, auto, force, interactiv
           if (isDir || isBookDir) {
             moveFolder(entryPath, destPath);
           } else {
-            mkdirSync3(destRoot, { recursive: true });
+            mkdirSync4(destRoot, { recursive: true });
             if (sameDev(entryPath, destRoot)) {
-              renameSync3(entryPath, destPath);
+              renameSync4(entryPath, destPath);
             } else {
               cpSync(entryPath, destPath);
-              rmSync2(entryPath);
+              rmSync3(entryPath);
             }
           }
-          recordImport(sessionId, entryPath, destPath, "move");
+          recordImport(sessionId, entryPath, destPath, "move", void 0, "book");
         }
-        spinner_default.succeed(`${dryRun ? "[dry] " : ""}${typeGlyph("book")} ${typeColor.book.encoder(entry)}${typeTag("book")}`);
+        spinner_default.succeed(`${dryRun ? "[dry] " : ""}${typeGlyph("book")} ${typeColor.book(entry)}${typeTag("book")}`);
         imported++;
         continue;
       }
@@ -1575,6 +1633,7 @@ var scan = async ({ type, hardlink: useHardlink, dryRun, auto, force, interactiv
       let resolvedYear = parsed.year;
       if (config.tmdbApiKey) {
         if (detectedType === "tv") {
+          spinner_default.text = `TMDb: ${parsed.title}`;
           const results = await searchTv(parsed.title, config.tmdbApiKey);
           if (results.length === 1) {
             tmdbId = results[0].id;
@@ -1629,7 +1688,7 @@ var scan = async ({ type, hardlink: useHardlink, dryRun, auto, force, interactiv
             continue;
           }
         }
-        const seasonFolderName = findSeasonFolder(showPath, parsed.season) ?? formatSeasonFolder(seasonFormat, parsed.season);
+        const seasonFolderName = parsed.season === 0 ? findSeasonFolder(showPath, 0, specialsFolder) ?? specialsFolder : findSeasonFolder(showPath, parsed.season) ?? formatSeasonFolder(seasonFormat, parsed.season);
         const seasonPath = resolve8(showPath, seasonFolderName);
         const videoFile = isDir ? findVideo(entryPath) : entry;
         if (!videoFile) {
@@ -1638,13 +1697,15 @@ var scan = async ({ type, hardlink: useHardlink, dryRun, auto, force, interactiv
           continue;
         }
         const videoExt = videoFile.match(/([^.]+$)/)?.[0];
+        if (tmdbId && config.tmdbApiKey) spinner_default.text = `TMDb: episode name for ${resolvedTitle}`;
         const tmdbEpisodeName = tmdbId && config.tmdbApiKey ? await getEpisodeName(tmdbId, parsed.season, parsed.episode ?? 1, config.tmdbApiKey) : null;
         const episodeName = formatEpisode(parsed.season, parsed.episode ?? 1, config.format?.episode, false, resolvedTitle, tmdbEpisodeName ?? void 0);
         const destVideoName = `${episodeName}.${videoExt}`;
         const destVideoPath = resolve8(seasonPath, destVideoName);
         const videoSourcePath = isDir ? resolve8(entryPath, videoFile) : entryPath;
-        if (existsSync9(destVideoPath)) {
-          let shouldReplace = force;
+        if (existsSync10(destVideoPath)) {
+          const isRepack = /\brepack\d*\b|\bproper\b/i.test(entry);
+          let shouldReplace = force || isRepack;
           if (!shouldReplace && interactive) {
             spinner_default.stop();
             const select = new Select2();
@@ -1662,7 +1723,7 @@ var scan = async ({ type, hardlink: useHardlink, dryRun, auto, force, interactiv
           }
           if (!dryRun) {
             for (const f of readdirSync7(seasonPath)) {
-              if (f.startsWith(`${episodeName}.`)) rmSync2(resolve8(seasonPath, f));
+              if (f.startsWith(`${episodeName}.`)) trashPath(resolve8(seasonPath, f));
             }
           }
         }
@@ -1672,7 +1733,7 @@ var scan = async ({ type, hardlink: useHardlink, dryRun, auto, force, interactiv
         const subtitleSourcePath = subtitle ? resolve8(entryPath, subtitle) : null;
         const destSubtitleName = subtitle && subtitleExt ? `${episodeName}.${subtitleExt}` : null;
         if (!dryRun) {
-          mkdirSync3(seasonPath, { recursive: true });
+          mkdirSync4(seasonPath, { recursive: true });
           let mode = "move";
           if (useHardlink) {
             try {
@@ -1687,17 +1748,17 @@ var scan = async ({ type, hardlink: useHardlink, dryRun, auto, force, interactiv
             if (subtitleSourcePath && destSubtitleName) cpSync(subtitleSourcePath, resolve8(seasonPath, destSubtitleName));
           } else {
             if (sameDev(videoSourcePath, seasonPath)) {
-              renameSync3(videoSourcePath, destVideoPath);
+              renameSync4(videoSourcePath, destVideoPath);
             } else {
               cpSync(videoSourcePath, destVideoPath);
-              rmSync2(videoSourcePath);
+              trashPath(videoSourcePath);
             }
-            if (subtitleSourcePath && destSubtitleName) renameSync3(subtitleSourcePath, resolve8(seasonPath, destSubtitleName));
-            if (isDir) rmSync2(entryPath, { recursive: true, force: true });
+            if (subtitleSourcePath && destSubtitleName) renameSync4(subtitleSourcePath, resolve8(seasonPath, destSubtitleName));
+            if (isDir) trashPath(entryPath, { recursive: true });
           }
-          recordImport(sessionId, entryPath, seasonPath, mode, tmdbId);
+          recordImport(sessionId, entryPath, seasonPath, mode, tmdbId, "tv");
         }
-        spinner_default.succeed(`${dryRun ? "[dry] " : ""}${typeGlyph("tv")} ${typeColor.tv.encoder(`${showFolderName} / ${seasonFolderName} / ${episodeName}`)}${typeTag("tv")}`);
+        spinner_default.succeed(`${dryRun ? "[dry] " : ""}${typeGlyph("tv")} ${typeColor.tv(`${showFolderName} / ${seasonFolderName} / ${episodeName}`)}${typeTag("tv")}`);
         imported++;
         continue;
       }
@@ -1758,37 +1819,68 @@ var scan = async ({ type, hardlink: useHardlink, dryRun, auto, force, interactiv
 var scan_default = scan;
 
 // src/actions/undo.ts
-import { renameSync as renameSync4 } from "fs";
+import { existsSync as existsSync11, renameSync as renameSync5 } from "fs";
 import { Color as Color10 } from "termkit";
 var undo = async () => {
   spinner_default.start();
-  const records = getLastSession();
-  if (records.length === 0) {
+  const renameRecords = getLastSession();
+  const importRecords = getLastImportSession();
+  if (renameRecords.length === 0 && importRecords.length === 0) {
     spinner_default.info("nothing to undo");
     spinner_default.stop();
     return;
   }
+  const useImports = importRecords.length > 0 && (renameRecords.length === 0 || importRecords[0].sessionId > renameRecords[0].sessionId);
+  if (!useImports) {
+    let undone2 = 0;
+    for (const record of renameRecords) {
+      renameSync5(record.newPath, record.oldPath);
+      spinner_default.succeed(`${Color10.green.encoder(record.newPath)} \u2192 ${Color10.white.encoder(record.oldPath)}`);
+      undone2++;
+    }
+    deleteSession(renameRecords[0].sessionId);
+    spinner_default.succeed(`undid ${undone2} renames`);
+    spinner_default.stop();
+    return;
+  }
   let undone = 0;
-  for (const record of records) {
-    renameSync4(record.newPath, record.oldPath);
-    spinner_default.succeed(`${Color10.green.encoder(record.newPath)} \u2192 ${Color10.white.encoder(record.oldPath)}`);
+  let skipped = 0;
+  for (const record of importRecords) {
+    if (record.mode !== "move") {
+      spinner_default.info(`skipped ${record.destinationPath} (${record.mode} \u2014 source file unchanged)`);
+      skipped++;
+      continue;
+    }
+    if (record.type === "tv") {
+      spinner_default.info(`skipped TV import \u2014 season folder cannot be cleanly reversed: ${record.destinationPath}`);
+      skipped++;
+      continue;
+    }
+    if (!existsSync11(record.destinationPath)) {
+      spinner_default.info(`skipped \u2014 destination no longer exists: ${record.destinationPath}`);
+      skipped++;
+      continue;
+    }
+    renameSync5(record.destinationPath, record.sourcePath);
+    spinner_default.succeed(`${Color10.green.encoder(record.destinationPath)} \u2192 ${Color10.white.encoder(record.sourcePath)}`);
     undone++;
   }
-  deleteSession(records[0].sessionId);
-  spinner_default.succeed(`undid ${undone} renames`);
+  deleteImportSession(importRecords[0].sessionId);
+  if (undone > 0) spinner_default.succeed(`undid ${undone} import${undone !== 1 ? "s" : ""}`);
+  if (skipped > 0) spinner_default.info(`skipped ${skipped} item${skipped !== 1 ? "s" : ""} (TV or non-move mode)`);
   spinner_default.stop();
 };
 var undo_default = undo;
 
 // src/actions/watch.ts
 import chokidar from "chokidar";
-import { cpSync as cpSync2, existsSync as existsSync10, linkSync as linkSync2, lstatSync as lstatSync5, mkdirSync as mkdirSync4, readdirSync as readdirSync8, renameSync as renameSync5, rmSync as rmSync3, statSync as statSync3 } from "fs";
-import { basename as basename3, dirname as dirname3, resolve as resolve9 } from "path";
+import { cpSync as cpSync2, existsSync as existsSync12, linkSync as linkSync2, lstatSync as lstatSync5, mkdirSync as mkdirSync5, readdirSync as readdirSync8, renameSync as renameSync6, rmSync as rmSync4, statSync as statSync3 } from "fs";
+import { basename as basename4, dirname as dirname3, resolve as resolve9 } from "path";
 import { Color as Color11 } from "termkit";
 var sameDev2 = (a, b) => {
   try {
     let bExisting = b;
-    while (!existsSync10(bExisting)) bExisting = dirname3(bExisting);
+    while (!existsSync12(bExisting)) bExisting = dirname3(bExisting);
     return statSync3(a).dev === statSync3(bExisting).dev;
   } catch {
     return false;
@@ -1796,10 +1888,10 @@ var sameDev2 = (a, b) => {
 };
 var moveItem = (src, dest) => {
   if (sameDev2(src, dest)) {
-    renameSync5(src, dest);
+    renameSync6(src, dest);
   } else {
     cpSync2(src, dest, { recursive: true });
-    rmSync3(src, { recursive: true, force: true });
+    rmSync4(src, { recursive: true, force: true });
   }
 };
 var findVideo2 = (dir) => readdirSync8(dir).find((f) => {
@@ -1828,7 +1920,7 @@ var expandWatchPath = (p) => {
     return [p];
   }
   if (!isDir) return [p];
-  const name = basename3(p);
+  const name = basename4(p);
   if (isTvEpisodeName2(name) || /(?<=\[).+?(?=\])/.test(name) || /^[A-Z]{4}\d{5}/i.test(name)) return [p];
   let children;
   try {
@@ -1887,7 +1979,7 @@ var expandWatchPath = (p) => {
   return [p];
 };
 var findSeasonFolder2 = (showPath, season) => {
-  if (!existsSync10(showPath)) return null;
+  if (!existsSync12(showPath)) return null;
   const folders = readdirSync8(showPath).filter((f) => {
     try {
       return lstatSync5(resolve9(showPath, f)).isDirectory();
@@ -1903,7 +1995,7 @@ var findSeasonFolder2 = (showPath, season) => {
 var processItem = async (entryPath, useHardlink, language, auto) => {
   const config = getConfig();
   const sessionId = (/* @__PURE__ */ new Date()).toISOString();
-  const entry = basename3(entryPath);
+  const entry = basename4(entryPath);
   const movieFormat = config.format?.movie ?? DEFAULT_MOVIE_FORMAT;
   const seasonFormat = config.format?.season ?? DEFAULT_SEASON_FORMAT;
   const isDir = lstatSync5(entryPath).isDirectory();
@@ -1933,33 +2025,33 @@ var processItem = async (entryPath, useHardlink, language, auto) => {
     if (!nameMatch || !id) return;
     const destName = `${nameMatch[0]} [${id}]`;
     const destPath = resolve9(destRoot, destName);
-    if (existsSync10(destPath)) {
+    if (existsSync12(destPath)) {
       spinner_default.warn(`already exists: ${destName}`);
       return;
     }
     moveItem(entryPath, destPath);
-    recordImport(sessionId, entryPath, destPath, "move");
+    recordImport(sessionId, entryPath, destPath, "move", void 0, "ps3");
     spinner_default.succeed(`imported ${Color11.green.encoder(destName)}`);
     return;
   }
   if (detectedType === "book") {
     const destPath = resolve9(destRoot, entry);
-    if (existsSync10(destPath)) {
+    if (existsSync12(destPath)) {
       spinner_default.warn(`already exists: ${entry}`);
       return;
     }
     if (isDir || isBookDir) {
       moveItem(entryPath, destPath);
     } else {
-      mkdirSync4(destRoot, { recursive: true });
+      mkdirSync5(destRoot, { recursive: true });
       if (sameDev2(entryPath, destRoot)) {
-        renameSync5(entryPath, destPath);
+        renameSync6(entryPath, destPath);
       } else {
         cpSync2(entryPath, destPath);
-        rmSync3(entryPath);
+        rmSync4(entryPath);
       }
     }
-    recordImport(sessionId, entryPath, destPath, "move");
+    recordImport(sessionId, entryPath, destPath, "move", void 0, "book");
     spinner_default.succeed(`imported ${Color11.green.encoder(entry)}`);
     return;
   }
@@ -2000,7 +2092,7 @@ var processItem = async (entryPath, useHardlink, language, auto) => {
     const destVideoName2 = `${episodeName}.${videoExt2}`;
     const destVideoPath = resolve9(seasonPath, destVideoName2);
     const videoSourcePath2 = isDir ? resolve9(entryPath, videoFile2) : entryPath;
-    if (existsSync10(destVideoPath)) {
+    if (existsSync12(destVideoPath)) {
       spinner_default.warn(`already exists: ${episodeName}`);
       return;
     }
@@ -2009,7 +2101,7 @@ var processItem = async (entryPath, useHardlink, language, auto) => {
     const subtitleExt2 = subtitle2?.match(/([^.]+$)/)?.[0];
     const subtitleSourcePath2 = subtitle2 ? resolve9(entryPath, subtitle2) : null;
     const destSubtitleName2 = subtitle2 && subtitleExt2 ? `${episodeName}.${subtitleExt2}` : null;
-    mkdirSync4(seasonPath, { recursive: true });
+    mkdirSync5(seasonPath, { recursive: true });
     let mode = "move";
     if (useHardlink) {
       try {
@@ -2024,22 +2116,22 @@ var processItem = async (entryPath, useHardlink, language, auto) => {
       if (subtitleSourcePath2 && destSubtitleName2) cpSync2(subtitleSourcePath2, resolve9(seasonPath, destSubtitleName2));
     } else {
       if (sameDev2(videoSourcePath2, seasonPath)) {
-        renameSync5(videoSourcePath2, destVideoPath);
+        renameSync6(videoSourcePath2, destVideoPath);
       } else {
         cpSync2(videoSourcePath2, destVideoPath);
-        rmSync3(videoSourcePath2);
+        rmSync4(videoSourcePath2);
       }
-      if (subtitleSourcePath2 && destSubtitleName2) renameSync5(subtitleSourcePath2, resolve9(seasonPath, destSubtitleName2));
-      if (isDir) rmSync3(entryPath, { recursive: true, force: true });
+      if (subtitleSourcePath2 && destSubtitleName2) renameSync6(subtitleSourcePath2, resolve9(seasonPath, destSubtitleName2));
+      if (isDir) rmSync4(entryPath, { recursive: true, force: true });
     }
-    recordImport(sessionId, entryPath, seasonPath, mode);
+    recordImport(sessionId, entryPath, seasonPath, mode, void 0, "tv");
     spinner_default.succeed(`imported ${Color11.green.encoder(`${showFolderName} / ${seasonFolderName} / ${episodeName}`)}`);
     return;
   }
   const edition = detectEdition(entry);
   const folderName = formatMovieName(movieFormat, parsed.title, parsed.year, edition);
   const destFolder = resolve9(destRoot, folderName);
-  if (existsSync10(destFolder)) {
+  if (existsSync12(destFolder)) {
     spinner_default.warn(`already exists: ${folderName}`);
     return;
   }
@@ -2057,7 +2149,7 @@ var processItem = async (entryPath, useHardlink, language, auto) => {
   const subtitleSourcePath = subtitle ? resolve9(entryPath, subtitle) : null;
   const destSubtitleName = subtitle && subtitleExt ? `${folderName}.${subtitleExt}` : null;
   if (useHardlink) {
-    mkdirSync4(destFolder, { recursive: true });
+    mkdirSync5(destFolder, { recursive: true });
     const destVideoPath = resolve9(destFolder, destVideoName);
     let mode;
     try {
@@ -2070,25 +2162,25 @@ var processItem = async (entryPath, useHardlink, language, auto) => {
       mode = "copy";
     }
     if (subtitleSourcePath && destSubtitleName) cpSync2(subtitleSourcePath, resolve9(destFolder, destSubtitleName));
-    recordImport(sessionId, entryPath, destFolder, mode);
+    recordImport(sessionId, entryPath, destFolder, mode, void 0, "movie");
   } else {
     if (isDir) {
       const keep = new Set([videoFile, subtitle].filter(Boolean));
-      for (const f of dirFiles.filter((f2) => !keep.has(f2))) rmSync3(resolve9(entryPath, f), { recursive: true, force: true });
-      renameSync5(videoSourcePath, resolve9(entryPath, destVideoName));
-      if (subtitleSourcePath && destSubtitleName) renameSync5(subtitleSourcePath, resolve9(entryPath, destSubtitleName));
+      for (const f of dirFiles.filter((f2) => !keep.has(f2))) rmSync4(resolve9(entryPath, f), { recursive: true, force: true });
+      renameSync6(videoSourcePath, resolve9(entryPath, destVideoName));
+      if (subtitleSourcePath && destSubtitleName) renameSync6(subtitleSourcePath, resolve9(entryPath, destSubtitleName));
       moveItem(entryPath, destFolder);
     } else {
-      mkdirSync4(destFolder, { recursive: true });
+      mkdirSync5(destFolder, { recursive: true });
       const destVideoPath = resolve9(destFolder, destVideoName);
       if (sameDev2(videoSourcePath, destRoot)) {
-        renameSync5(videoSourcePath, destVideoPath);
+        renameSync6(videoSourcePath, destVideoPath);
       } else {
         cpSync2(videoSourcePath, destVideoPath);
-        rmSync3(videoSourcePath);
+        rmSync4(videoSourcePath);
       }
     }
-    recordImport(sessionId, entryPath, destFolder, "move");
+    recordImport(sessionId, entryPath, destFolder, "move", void 0, "movie");
   }
   spinner_default.succeed(`imported ${Color11.green.encoder(folderName)}`);
 };
@@ -2136,6 +2228,7 @@ export {
   configSet,
   configShow,
   deleteImport,
+  deleteImportSession,
   deleteSession,
   destAdd,
   destRemove,
@@ -2148,6 +2241,7 @@ export {
   getConfig,
   getHistory,
   getImportByDest,
+  getLastImportSession,
   getLastSession,
   getMediaInfo,
   history_default as history,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reelsort",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "description": "CLI to rename, organize, and manage your movie and TV library — Plex-compatible naming, hardlink support, and automated watch mode.",
   "keywords": [
     "media",