reelsort 0.2.3 → 0.2.5

package/dist/cli.js

@@ -98,6 +98,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) => {
@@ -111,8 +115,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);
@@ -408,10 +420,10 @@ var import_path4 = require("path");
 var import_termkit4 = require("termkit");
 
 // 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) => {
@@ -1676,6 +1688,35 @@ var findShowFolder = (destRoot, title) => {
     }
   }).find((f) => normalize(f) === target) ?? null;
 };
+var findShowFolderByContent = (destRoot, title) => {
+  if (!(0, import_fs14.existsSync)(destRoot)) return null;
+  const normalize = (s) => s.toLowerCase().replace(/[^a-z0-9]/g, "");
+  const target = normalize(title);
+  const matchesTitle = (name) => {
+    if (!isTvEpisodeName(name)) return false;
+    const p = parseDownloadName(name);
+    return !!p && normalize(p.title) === target;
+  };
+  for (const folder of (0, import_fs14.readdirSync)(destRoot)) {
+    try {
+      const folderPath = (0, import_path14.resolve)(destRoot, folder);
+      if (!(0, import_fs14.lstatSync)(folderPath).isDirectory()) continue;
+      const children = (0, import_fs14.readdirSync)(folderPath);
+      if (children.some(matchesTitle)) return folder;
+      for (const child of children) {
+        if (!isSeasonDirName(child)) continue;
+        try {
+          const seasonPath = (0, import_path14.resolve)(folderPath, child);
+          if (!(0, import_fs14.lstatSync)(seasonPath).isDirectory()) continue;
+          if ((0, import_fs14.readdirSync)(seasonPath).some(matchesTitle)) return folder;
+        } catch {
+        }
+      }
+    } catch {
+    }
+  }
+  return null;
+};
 var findSeasonFolder = (showPath, season) => {
   if (!(0, import_fs14.existsSync)(showPath)) return null;
   const folders = (0, import_fs14.readdirSync)(showPath).filter((f) => {
@@ -1700,11 +1741,12 @@ var classifyMovieConfidence = (entry) => {
   return "ambiguous";
 };
 var typeColor = {
-  movie: import_termkit14.Color.white.cyan,
-  tv: import_termkit14.Color.white.green,
-  book: import_termkit14.Color.white.yellow,
-  ps3: import_termkit14.Color.white.magenta
+  movie: (s) => import_termkit14.Color.cyan.encoder(s),
+  tv: (s) => import_termkit14.Color.green.encoder(s),
+  book: (s) => import_termkit14.Color.yellow.encoder(s),
+  ps3: (s) => import_termkit14.Color.magenta.encoder(s)
 };
+var typeGlyph = (t) => typeColor[t]("\u25CF");
 var typeTag = (t) => isVerbose() ? import_termkit14.Color.white.faint.encoder(` (${t})`) : "";
 var scan = async ({ type, hardlink: useHardlink, dryRun, auto, force, interactive }) => {
   const config = getConfig();
@@ -1777,7 +1819,7 @@ var scan = async ({ type, hardlink: useHardlink, dryRun, auto, force, interactiv
           mode = "copy";
         }
         if (subtitleSourcePath && destSubtitleName) (0, import_fs14.cpSync)(subtitleSourcePath, (0, import_path14.resolve)(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));
@@ -1795,10 +1837,10 @@ var scan = async ({ type, hardlink: useHardlink, dryRun, auto, force, interactiv
             (0, import_fs14.rmSync)(videoSourcePath);
           }
         }
-        recordImport(sessionId, entryPath, destFolder, "move", tmdbId);
+        recordImport(sessionId, entryPath, destFolder, "move", tmdbId, "movie");
       }
     }
-    spinner_default.succeed(`${dryRun ? "[dry] " : ""}${typeColor.movie.encoder(folderName)}${typeTag("movie")}`);
+    spinner_default.succeed(`${dryRun ? "[dry] " : ""}${typeGlyph("movie")} ${typeColor.movie(folderName)}${typeTag("movie")}`);
     return true;
   };
   spinner_default.start();
@@ -1857,9 +1899,9 @@ var scan = async ({ type, hardlink: useHardlink, dryRun, auto, force, interactiv
         }
         if (!dryRun) {
           moveFolder(entryPath, destPath);
-          recordImport(sessionId, entryPath, destPath, "move");
+          recordImport(sessionId, entryPath, destPath, "move", void 0, "ps3");
         }
-        spinner_default.succeed(`${dryRun ? "[dry] " : ""}${typeColor.ps3.encoder(destName)}${typeTag("ps3")}`);
+        spinner_default.succeed(`${dryRun ? "[dry] " : ""}${typeGlyph("ps3")} ${typeColor.ps3(destName)}${typeTag("ps3")}`);
         imported++;
         continue;
       }
@@ -1882,9 +1924,9 @@ var scan = async ({ type, hardlink: useHardlink, dryRun, auto, force, interactiv
               (0, import_fs14.rmSync)(entryPath);
             }
           }
-          recordImport(sessionId, entryPath, destPath, "move");
+          recordImport(sessionId, entryPath, destPath, "move", void 0, "book");
         }
-        spinner_default.succeed(`${dryRun ? "[dry] " : ""}${typeColor.book.encoder(entry)}${typeTag("book")}`);
+        spinner_default.succeed(`${dryRun ? "[dry] " : ""}${typeGlyph("book")} ${typeColor.book(entry)}${typeTag("book")}`);
         imported++;
         continue;
       }
@@ -1952,7 +1994,7 @@ var scan = async ({ type, hardlink: useHardlink, dryRun, auto, force, interactiv
           showPath = registeredShow.path;
           showFolderName = showPath.split("/").pop() ?? registeredShow.path;
         } else {
-          const existingFolder = findShowFolder(destRoot, resolvedTitle);
+          const existingFolder = findShowFolder(destRoot, resolvedTitle) ?? findShowFolderByContent(destRoot, resolvedTitle);
           if (existingFolder) {
             showFolderName = existingFolder;
             showPath = (0, import_path14.resolve)(destRoot, existingFolder);
@@ -2031,9 +2073,9 @@ var scan = async ({ type, hardlink: useHardlink, dryRun, auto, force, interactiv
             if (subtitleSourcePath && destSubtitleName) (0, import_fs14.renameSync)(subtitleSourcePath, (0, import_path14.resolve)(seasonPath, destSubtitleName));
             if (isDir) (0, import_fs14.rmSync)(entryPath, { recursive: true, force: true });
           }
-          recordImport(sessionId, entryPath, seasonPath, mode, tmdbId);
+          recordImport(sessionId, entryPath, seasonPath, mode, tmdbId, "tv");
         }
-        spinner_default.succeed(`${dryRun ? "[dry] " : ""}${typeColor.tv.encoder(`${showFolderName} / ${seasonFolderName} / ${episodeName}`)}${typeTag("tv")}`);
+        spinner_default.succeed(`${dryRun ? "[dry] " : ""}${typeGlyph("tv")} ${typeColor.tv(`${showFolderName} / ${seasonFolderName} / ${episodeName}`)}${typeTag("tv")}`);
         imported++;
         continue;
       }
@@ -2046,7 +2088,7 @@ var scan = async ({ type, hardlink: useHardlink, dryRun, auto, force, interactiv
   }
   if (pendingMovies.length > 0) {
     spinner_default.warn(`${pendingMovies.length} uncertain movie match${pendingMovies.length > 1 ? "es" : ""} skipped \u2014 use -i to review or -f to import all`);
-    for (const p of pendingMovies) spinner_default.info(`  ${typeColor.movie.encoder("?")} ${p.entry.replace(/\/$/, "")}${typeTag("movie")}`);
+    for (const p of pendingMovies) spinner_default.info(`  ${typeGlyph("movie")} ${p.entry.replace(/\/$/, "")}${typeTag("movie")}`);
     let toProcess = [];
     if (interactive) {
       spinner_default.stop();
@@ -2075,7 +2117,7 @@ var scan = async ({ type, hardlink: useHardlink, dryRun, auto, force, interactiv
   }
   if (pendingTv.length > 0) {
     spinner_default.warn(`${pendingTv.length} TV show${pendingTv.length > 1 ? "s" : ""} skipped \u2014 no matching folder in destination`);
-    for (const p of pendingTv) spinner_default.info(`  ${typeColor.tv.encoder("?")} ${p.resolvedTitle} \u2014 ${p.entry.replace(/\/$/, "")}${typeTag("tv")}`);
+    for (const p of pendingTv) spinner_default.info(`  ${typeGlyph("tv")} ${p.resolvedTitle} \u2014 ${p.entry.replace(/\/$/, "")}${typeTag("tv")}`);
     skipped += pendingTv.length;
   }
   if (ignoreSet.size > 0) {
@@ -2212,20 +2254,51 @@ var import_fs17 = require("fs");
 var import_termkit17 = require("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) {
+      (0, import_fs17.renameSync)(record.newPath, record.oldPath);
+      spinner_default.succeed(`${import_termkit17.Color.green.encoder(record.newPath)} \u2192 ${import_termkit17.Color.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) {
-    (0, import_fs17.renameSync)(record.newPath, record.oldPath);
-    spinner_default.succeed(`${import_termkit17.Color.green.encoder(record.newPath)} \u2192 ${import_termkit17.Color.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 (!(0, import_fs17.existsSync)(record.destinationPath)) {
+      spinner_default.info(`skipped \u2014 destination no longer exists: ${record.destinationPath}`);
+      skipped++;
+      continue;
+    }
+    (0, import_fs17.renameSync)(record.destinationPath, record.sourcePath);
+    spinner_default.succeed(`${import_termkit17.Color.green.encoder(record.destinationPath)} \u2192 ${import_termkit17.Color.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;
@@ -2388,7 +2461,7 @@ var processItem = async (entryPath, useHardlink, language, auto) => {
       return;
     }
     moveItem(entryPath, destPath);
-    recordImport(sessionId, entryPath, destPath, "move");
+    recordImport(sessionId, entryPath, destPath, "move", void 0, "ps3");
     spinner_default.succeed(`imported ${import_termkit18.Color.green.encoder(destName)}`);
     return;
   }
@@ -2409,7 +2482,7 @@ var processItem = async (entryPath, useHardlink, language, auto) => {
         (0, import_fs18.rmSync)(entryPath);
       }
     }
-    recordImport(sessionId, entryPath, destPath, "move");
+    recordImport(sessionId, entryPath, destPath, "move", void 0, "book");
     spinner_default.succeed(`imported ${import_termkit18.Color.green.encoder(entry)}`);
     return;
   }
@@ -2482,7 +2555,7 @@ var processItem = async (entryPath, useHardlink, language, auto) => {
       if (subtitleSourcePath2 && destSubtitleName2) (0, import_fs18.renameSync)(subtitleSourcePath2, (0, import_path16.resolve)(seasonPath, destSubtitleName2));
       if (isDir) (0, import_fs18.rmSync)(entryPath, { recursive: true, force: true });
     }
-    recordImport(sessionId, entryPath, seasonPath, mode);
+    recordImport(sessionId, entryPath, seasonPath, mode, void 0, "tv");
     spinner_default.succeed(`imported ${import_termkit18.Color.green.encoder(`${showFolderName} / ${seasonFolderName} / ${episodeName}`)}`);
     return;
   }
@@ -2520,7 +2593,7 @@ var processItem = async (entryPath, useHardlink, language, auto) => {
       mode = "copy";
     }
     if (subtitleSourcePath && destSubtitleName) (0, import_fs18.cpSync)(subtitleSourcePath, (0, import_path16.resolve)(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));
@@ -2538,7 +2611,7 @@ var processItem = async (entryPath, useHardlink, language, auto) => {
         (0, import_fs18.rmSync)(videoSourcePath);
       }
     }
-    recordImport(sessionId, entryPath, destFolder, "move");
+    recordImport(sessionId, entryPath, destFolder, "move", void 0, "movie");
   }
   spinner_default.succeed(`imported ${import_termkit18.Color.green.encoder(folderName)}`);
 };
@@ -2580,7 +2653,7 @@ var watch = async ({ hardlink = false, auto = false }) => {
 var watch_default = watch;
 
 // package.json
-var version = "0.2.3";
+var version = "0.2.5";
 
 // src/program.ts
 var toCamel = (s) => s.replace(/-([a-z])/g, (_, c) => c.toUpperCase());
@@ -2618,6 +2691,12 @@ var program = import_termkit19.Program.command("reelsort").version(version).desc
 var program_default = program;
 
 // src/cli.ts
+if (!process.stdout.isTTY) {
+  const { FORCE_COLOR, MSYSTEM, WT_SESSION, TERM } = process.env;
+  if (FORCE_COLOR || MSYSTEM || WT_SESSION || TERM?.startsWith("xterm")) {
+    Object.defineProperty(process.stdout, "isTTY", { value: true, configurable: true });
+  }
+}
 var run = async (args) => {
   try {
     await program_default.parse(args);

package/dist/index.d.mts

@@ -122,11 +122,14 @@ interface RenameRecord {
 declare const recordRename: (sessionId: string, oldPath: string, newPath: string) => void;
 declare const getLastSession: () => RenameRecord[];
 declare const deleteSession: (sessionId: string) => void;
+declare const getLastImportSession: () => ImportRecord[];
+declare const deleteImportSession: (sessionId: string) => void;
 interface RenameSession {
     sessionId: string;
     records: RenameRecord[];
 }
 type ImportMode = 'move' | 'hardlink' | 'copy';
+type MediaType = 'movie' | 'tv' | 'ps3' | 'book';
 interface ImportRecord {
     id: number;
     sessionId: string;
@@ -134,9 +137,10 @@ interface ImportRecord {
     destinationPath: string;
     mode: ImportMode;
     tmdbId: number | null;
+    type: MediaType | null;
     importedAt: string;
 }
-declare const recordImport: (sessionId: string, sourcePath: string, destPath: string, mode: ImportMode, tmdbId?: number) => void;
+declare const recordImport: (sessionId: string, sourcePath: string, destPath: string, mode: ImportMode, tmdbId?: number, type?: MediaType) => void;
 interface MediaInfoRecord {
     id: number;
     filePath: string;
@@ -156,7 +160,7 @@ declare const getHistory: (limit?: number) => RenameSession[];
 
 declare const detectEdition: (filename: string) => string | null;
 
-declare const DEFAULT_EPISODE_FORMAT = "{s}x{ee}";
+declare const DEFAULT_EPISODE_FORMAT = "{s}x{ee} - {title}";
 declare const DEFAULT_SEASON_FORMAT = "Season {s}";
 declare const formatSeasonFolder: (format: string, season: number) => string;
 declare const formatEpisode: (season: number, episode: number, format?: string, double?: boolean, title?: string, name?: string) => string;
@@ -219,4 +223,4 @@ var videoExtensions = [
 	"yuv"
 ];
 
-export { type CleanOptions, type ConfigSetOptions, type ConfigShowOptions, DEFAULT_EPISODE_FORMAT, DEFAULT_MOVIE_FORMAT, DEFAULT_SEASON_FORMAT, type DestAddOptions, type DestRemoveOptions, type DifferencesOptions, type HistoryOptions, type ImportMode, type ImportRecord, type ListOptions, type MediaInfoRecord, type ParsedMediaName, type ProbeOptions, type Quality, type ReelSortConfig, type RenameOptions, type RenameRecord, type RenameSession, type ResetOptions, type ScanOptions, type SourceAddOptions, type SourceRemoveOptions, type WatchOptions, clean, configSet, configShow, deleteImport, deleteSession, destAdd, destRemove, detectEdition, differences, formatEpisode, formatMovieName, formatSeasonFolder, getCleanableImports, getConfig, getHistory, getImportByDest, getLastSession, getMediaInfo, history, list, normalizeCodec, normalizeResolution, parseDownloadName, parseQuality, probe, recordImport, recordRename, rename, reset, saveConfig, scan, sourceAdd, sourceRemove, _default as titleCase, undo, upsertMediaInfo, videoExtensions, watch };
+export { type CleanOptions, type ConfigSetOptions, type ConfigShowOptions, DEFAULT_EPISODE_FORMAT, DEFAULT_MOVIE_FORMAT, DEFAULT_SEASON_FORMAT, type DestAddOptions, type DestRemoveOptions, type DifferencesOptions, type HistoryOptions, type ImportMode, type ImportRecord, type ListOptions, type MediaInfoRecord, type MediaType, type ParsedMediaName, type ProbeOptions, type Quality, type ReelSortConfig, type RenameOptions, type RenameRecord, type RenameSession, type ResetOptions, type ScanOptions, type SourceAddOptions, type SourceRemoveOptions, type WatchOptions, clean, configSet, configShow, deleteImport, deleteImportSession, deleteSession, destAdd, destRemove, detectEdition, differences, formatEpisode, formatMovieName, formatSeasonFolder, getCleanableImports, getConfig, getHistory, getImportByDest, getLastImportSession, getLastSession, getMediaInfo, history, list, normalizeCodec, normalizeResolution, parseDownloadName, parseQuality, probe, recordImport, recordRename, rename, reset, saveConfig, scan, sourceAdd, sourceRemove, _default as titleCase, undo, upsertMediaInfo, videoExtensions, watch };

package/dist/index.d.ts

@@ -122,11 +122,14 @@ interface RenameRecord {
 declare const recordRename: (sessionId: string, oldPath: string, newPath: string) => void;
 declare const getLastSession: () => RenameRecord[];
 declare const deleteSession: (sessionId: string) => void;
+declare const getLastImportSession: () => ImportRecord[];
+declare const deleteImportSession: (sessionId: string) => void;
 interface RenameSession {
     sessionId: string;
     records: RenameRecord[];
 }
 type ImportMode = 'move' | 'hardlink' | 'copy';
+type MediaType = 'movie' | 'tv' | 'ps3' | 'book';
 interface ImportRecord {
     id: number;
     sessionId: string;
@@ -134,9 +137,10 @@ interface ImportRecord {
     destinationPath: string;
     mode: ImportMode;
     tmdbId: number | null;
+    type: MediaType | null;
     importedAt: string;
 }
-declare const recordImport: (sessionId: string, sourcePath: string, destPath: string, mode: ImportMode, tmdbId?: number) => void;
+declare const recordImport: (sessionId: string, sourcePath: string, destPath: string, mode: ImportMode, tmdbId?: number, type?: MediaType) => void;
 interface MediaInfoRecord {
     id: number;
     filePath: string;
@@ -156,7 +160,7 @@ declare const getHistory: (limit?: number) => RenameSession[];
 
 declare const detectEdition: (filename: string) => string | null;
 
-declare const DEFAULT_EPISODE_FORMAT = "{s}x{ee}";
+declare const DEFAULT_EPISODE_FORMAT = "{s}x{ee} - {title}";
 declare const DEFAULT_SEASON_FORMAT = "Season {s}";
 declare const formatSeasonFolder: (format: string, season: number) => string;
 declare const formatEpisode: (season: number, episode: number, format?: string, double?: boolean, title?: string, name?: string) => string;
@@ -219,4 +223,4 @@ var videoExtensions = [
 	"yuv"
 ];
 
-export { type CleanOptions, type ConfigSetOptions, type ConfigShowOptions, DEFAULT_EPISODE_FORMAT, DEFAULT_MOVIE_FORMAT, DEFAULT_SEASON_FORMAT, type DestAddOptions, type DestRemoveOptions, type DifferencesOptions, type HistoryOptions, type ImportMode, type ImportRecord, type ListOptions, type MediaInfoRecord, type ParsedMediaName, type ProbeOptions, type Quality, type ReelSortConfig, type RenameOptions, type RenameRecord, type RenameSession, type ResetOptions, type ScanOptions, type SourceAddOptions, type SourceRemoveOptions, type WatchOptions, clean, configSet, configShow, deleteImport, deleteSession, destAdd, destRemove, detectEdition, differences, formatEpisode, formatMovieName, formatSeasonFolder, getCleanableImports, getConfig, getHistory, getImportByDest, getLastSession, getMediaInfo, history, list, normalizeCodec, normalizeResolution, parseDownloadName, parseQuality, probe, recordImport, recordRename, rename, reset, saveConfig, scan, sourceAdd, sourceRemove, _default as titleCase, undo, upsertMediaInfo, videoExtensions, watch };
+export { type CleanOptions, type ConfigSetOptions, type ConfigShowOptions, DEFAULT_EPISODE_FORMAT, DEFAULT_MOVIE_FORMAT, DEFAULT_SEASON_FORMAT, type DestAddOptions, type DestRemoveOptions, type DifferencesOptions, type HistoryOptions, type ImportMode, type ImportRecord, type ListOptions, type MediaInfoRecord, type MediaType, type ParsedMediaName, type ProbeOptions, type Quality, type ReelSortConfig, type RenameOptions, type RenameRecord, type RenameSession, type ResetOptions, type ScanOptions, type SourceAddOptions, type SourceRemoveOptions, type WatchOptions, clean, configSet, configShow, deleteImport, deleteImportSession, deleteSession, destAdd, destRemove, detectEdition, differences, formatEpisode, formatMovieName, formatSeasonFolder, getCleanableImports, getConfig, getHistory, getImportByDest, getLastImportSession, getLastSession, getMediaInfo, history, list, normalizeCodec, normalizeResolution, parseDownloadName, parseQuality, probe, recordImport, recordRename, rename, reset, saveConfig, scan, sourceAdd, sourceRemove, _default as titleCase, undo, upsertMediaInfo, videoExtensions, watch };

package/dist/index.js

@@ -37,6 +37,7 @@ __export(index_exports, {
   configSet: () => configSet,
   configShow: () => configShow,
   deleteImport: () => deleteImport,
+  deleteImportSession: () => deleteImportSession,
   deleteSession: () => deleteSession,
   destAdd: () => destAdd,
   destRemove: () => destRemove,
@@ -49,6 +50,7 @@ __export(index_exports, {
   getConfig: () => getConfig,
   getHistory: () => getHistory,
   getImportByDest: () => getImportByDest,
+  getLastImportSession: () => getLastImportSession,
   getLastSession: () => getLastSession,
   getMediaInfo: () => getMediaInfo,
   history: () => history_default,
@@ -130,6 +132,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) => {
@@ -143,8 +149,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);
@@ -320,10 +334,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) => {
@@ -1386,6 +1400,35 @@ var findShowFolder = (destRoot, title) => {
     }
   }).find((f) => normalize(f) === target) ?? null;
 };
+var findShowFolderByContent = (destRoot, title) => {
+  if (!(0, import_fs10.existsSync)(destRoot)) return null;
+  const normalize = (s) => s.toLowerCase().replace(/[^a-z0-9]/g, "");
+  const target = normalize(title);
+  const matchesTitle = (name) => {
+    if (!isTvEpisodeName(name)) return false;
+    const p = parseDownloadName(name);
+    return !!p && normalize(p.title) === target;
+  };
+  for (const folder of (0, import_fs10.readdirSync)(destRoot)) {
+    try {
+      const folderPath = (0, import_path11.resolve)(destRoot, folder);
+      if (!(0, import_fs10.lstatSync)(folderPath).isDirectory()) continue;
+      const children = (0, import_fs10.readdirSync)(folderPath);
+      if (children.some(matchesTitle)) return folder;
+      for (const child of children) {
+        if (!isSeasonDirName(child)) continue;
+        try {
+          const seasonPath = (0, import_path11.resolve)(folderPath, child);
+          if (!(0, import_fs10.lstatSync)(seasonPath).isDirectory()) continue;
+          if ((0, import_fs10.readdirSync)(seasonPath).some(matchesTitle)) return folder;
+        } catch {
+        }
+      }
+    } catch {
+    }
+  }
+  return null;
+};
 var findSeasonFolder = (showPath, season) => {
   if (!(0, import_fs10.existsSync)(showPath)) return null;
   const folders = (0, import_fs10.readdirSync)(showPath).filter((f) => {
@@ -1410,11 +1453,12 @@ var classifyMovieConfidence = (entry) => {
   return "ambiguous";
 };
 var typeColor = {
-  movie: import_termkit10.Color.white.cyan,
-  tv: import_termkit10.Color.white.green,
-  book: import_termkit10.Color.white.yellow,
-  ps3: import_termkit10.Color.white.magenta
+  movie: (s) => import_termkit10.Color.cyan.encoder(s),
+  tv: (s) => import_termkit10.Color.green.encoder(s),
+  book: (s) => import_termkit10.Color.yellow.encoder(s),
+  ps3: (s) => import_termkit10.Color.magenta.encoder(s)
 };
+var typeGlyph = (t) => typeColor[t]("\u25CF");
 var typeTag = (t) => isVerbose() ? import_termkit10.Color.white.faint.encoder(` (${t})`) : "";
 var scan = async ({ type, hardlink: useHardlink, dryRun, auto, force, interactive }) => {
   const config = getConfig();
@@ -1487,7 +1531,7 @@ var scan = async ({ type, hardlink: useHardlink, dryRun, auto, force, interactiv
           mode = "copy";
         }
         if (subtitleSourcePath && destSubtitleName) (0, import_fs10.cpSync)(subtitleSourcePath, (0, import_path11.resolve)(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));
@@ -1505,10 +1549,10 @@ var scan = async ({ type, hardlink: useHardlink, dryRun, auto, force, interactiv
             (0, import_fs10.rmSync)(videoSourcePath);
           }
         }
-        recordImport(sessionId, entryPath, destFolder, "move", tmdbId);
+        recordImport(sessionId, entryPath, destFolder, "move", tmdbId, "movie");
       }
     }
-    spinner_default.succeed(`${dryRun ? "[dry] " : ""}${typeColor.movie.encoder(folderName)}${typeTag("movie")}`);
+    spinner_default.succeed(`${dryRun ? "[dry] " : ""}${typeGlyph("movie")} ${typeColor.movie(folderName)}${typeTag("movie")}`);
     return true;
   };
   spinner_default.start();
@@ -1567,9 +1611,9 @@ var scan = async ({ type, hardlink: useHardlink, dryRun, auto, force, interactiv
         }
         if (!dryRun) {
           moveFolder(entryPath, destPath);
-          recordImport(sessionId, entryPath, destPath, "move");
+          recordImport(sessionId, entryPath, destPath, "move", void 0, "ps3");
         }
-        spinner_default.succeed(`${dryRun ? "[dry] " : ""}${typeColor.ps3.encoder(destName)}${typeTag("ps3")}`);
+        spinner_default.succeed(`${dryRun ? "[dry] " : ""}${typeGlyph("ps3")} ${typeColor.ps3(destName)}${typeTag("ps3")}`);
         imported++;
         continue;
       }
@@ -1592,9 +1636,9 @@ var scan = async ({ type, hardlink: useHardlink, dryRun, auto, force, interactiv
               (0, import_fs10.rmSync)(entryPath);
             }
           }
-          recordImport(sessionId, entryPath, destPath, "move");
+          recordImport(sessionId, entryPath, destPath, "move", void 0, "book");
         }
-        spinner_default.succeed(`${dryRun ? "[dry] " : ""}${typeColor.book.encoder(entry)}${typeTag("book")}`);
+        spinner_default.succeed(`${dryRun ? "[dry] " : ""}${typeGlyph("book")} ${typeColor.book(entry)}${typeTag("book")}`);
         imported++;
         continue;
       }
@@ -1662,7 +1706,7 @@ var scan = async ({ type, hardlink: useHardlink, dryRun, auto, force, interactiv
           showPath = registeredShow.path;
           showFolderName = showPath.split("/").pop() ?? registeredShow.path;
         } else {
-          const existingFolder = findShowFolder(destRoot, resolvedTitle);
+          const existingFolder = findShowFolder(destRoot, resolvedTitle) ?? findShowFolderByContent(destRoot, resolvedTitle);
           if (existingFolder) {
             showFolderName = existingFolder;
             showPath = (0, import_path11.resolve)(destRoot, existingFolder);
@@ -1741,9 +1785,9 @@ var scan = async ({ type, hardlink: useHardlink, dryRun, auto, force, interactiv
             if (subtitleSourcePath && destSubtitleName) (0, import_fs10.renameSync)(subtitleSourcePath, (0, import_path11.resolve)(seasonPath, destSubtitleName));
             if (isDir) (0, import_fs10.rmSync)(entryPath, { recursive: true, force: true });
           }
-          recordImport(sessionId, entryPath, seasonPath, mode, tmdbId);
+          recordImport(sessionId, entryPath, seasonPath, mode, tmdbId, "tv");
         }
-        spinner_default.succeed(`${dryRun ? "[dry] " : ""}${typeColor.tv.encoder(`${showFolderName} / ${seasonFolderName} / ${episodeName}`)}${typeTag("tv")}`);
+        spinner_default.succeed(`${dryRun ? "[dry] " : ""}${typeGlyph("tv")} ${typeColor.tv(`${showFolderName} / ${seasonFolderName} / ${episodeName}`)}${typeTag("tv")}`);
         imported++;
         continue;
       }
@@ -1756,7 +1800,7 @@ var scan = async ({ type, hardlink: useHardlink, dryRun, auto, force, interactiv
   }
   if (pendingMovies.length > 0) {
     spinner_default.warn(`${pendingMovies.length} uncertain movie match${pendingMovies.length > 1 ? "es" : ""} skipped \u2014 use -i to review or -f to import all`);
-    for (const p of pendingMovies) spinner_default.info(`  ${typeColor.movie.encoder("?")} ${p.entry.replace(/\/$/, "")}${typeTag("movie")}`);
+    for (const p of pendingMovies) spinner_default.info(`  ${typeGlyph("movie")} ${p.entry.replace(/\/$/, "")}${typeTag("movie")}`);
     let toProcess = [];
     if (interactive) {
       spinner_default.stop();
@@ -1785,7 +1829,7 @@ var scan = async ({ type, hardlink: useHardlink, dryRun, auto, force, interactiv
   }
   if (pendingTv.length > 0) {
     spinner_default.warn(`${pendingTv.length} TV show${pendingTv.length > 1 ? "s" : ""} skipped \u2014 no matching folder in destination`);
-    for (const p of pendingTv) spinner_default.info(`  ${typeColor.tv.encoder("?")} ${p.resolvedTitle} \u2014 ${p.entry.replace(/\/$/, "")}${typeTag("tv")}`);
+    for (const p of pendingTv) spinner_default.info(`  ${typeGlyph("tv")} ${p.resolvedTitle} \u2014 ${p.entry.replace(/\/$/, "")}${typeTag("tv")}`);
     skipped += pendingTv.length;
   }
   if (ignoreSet.size > 0) {
@@ -1808,20 +1852,51 @@ var import_fs11 = require("fs");
 var import_termkit11 = require("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) {
+      (0, import_fs11.renameSync)(record.newPath, record.oldPath);
+      spinner_default.succeed(`${import_termkit11.Color.green.encoder(record.newPath)} \u2192 ${import_termkit11.Color.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) {
-    (0, import_fs11.renameSync)(record.newPath, record.oldPath);
-    spinner_default.succeed(`${import_termkit11.Color.green.encoder(record.newPath)} \u2192 ${import_termkit11.Color.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 (!(0, import_fs11.existsSync)(record.destinationPath)) {
+      spinner_default.info(`skipped \u2014 destination no longer exists: ${record.destinationPath}`);
+      skipped++;
+      continue;
+    }
+    (0, import_fs11.renameSync)(record.destinationPath, record.sourcePath);
+    spinner_default.succeed(`${import_termkit11.Color.green.encoder(record.destinationPath)} \u2192 ${import_termkit11.Color.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;
@@ -1984,7 +2059,7 @@ var processItem = async (entryPath, useHardlink, language, auto) => {
       return;
     }
     moveItem(entryPath, destPath);
-    recordImport(sessionId, entryPath, destPath, "move");
+    recordImport(sessionId, entryPath, destPath, "move", void 0, "ps3");
     spinner_default.succeed(`imported ${import_termkit12.Color.green.encoder(destName)}`);
     return;
   }
@@ -2005,7 +2080,7 @@ var processItem = async (entryPath, useHardlink, language, auto) => {
         (0, import_fs12.rmSync)(entryPath);
       }
     }
-    recordImport(sessionId, entryPath, destPath, "move");
+    recordImport(sessionId, entryPath, destPath, "move", void 0, "book");
     spinner_default.succeed(`imported ${import_termkit12.Color.green.encoder(entry)}`);
     return;
   }
@@ -2078,7 +2153,7 @@ var processItem = async (entryPath, useHardlink, language, auto) => {
       if (subtitleSourcePath2 && destSubtitleName2) (0, import_fs12.renameSync)(subtitleSourcePath2, (0, import_path12.resolve)(seasonPath, destSubtitleName2));
       if (isDir) (0, import_fs12.rmSync)(entryPath, { recursive: true, force: true });
     }
-    recordImport(sessionId, entryPath, seasonPath, mode);
+    recordImport(sessionId, entryPath, seasonPath, mode, void 0, "tv");
     spinner_default.succeed(`imported ${import_termkit12.Color.green.encoder(`${showFolderName} / ${seasonFolderName} / ${episodeName}`)}`);
     return;
   }
@@ -2116,7 +2191,7 @@ var processItem = async (entryPath, useHardlink, language, auto) => {
       mode = "copy";
     }
     if (subtitleSourcePath && destSubtitleName) (0, import_fs12.cpSync)(subtitleSourcePath, (0, import_path12.resolve)(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));
@@ -2134,7 +2209,7 @@ var processItem = async (entryPath, useHardlink, language, auto) => {
         (0, import_fs12.rmSync)(videoSourcePath);
       }
     }
-    recordImport(sessionId, entryPath, destFolder, "move");
+    recordImport(sessionId, entryPath, destFolder, "move", void 0, "movie");
   }
   spinner_default.succeed(`imported ${import_termkit12.Color.green.encoder(folderName)}`);
 };
@@ -2183,6 +2258,7 @@ var watch_default = watch;
   configSet,
   configShow,
   deleteImport,
+  deleteImportSession,
   deleteSession,
   destAdd,
   destRemove,
@@ -2195,6 +2271,7 @@ var watch_default = watch;
   getConfig,
   getHistory,
   getImportByDest,
+  getLastImportSession,
   getLastSession,
   getMediaInfo,
   history,

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) => {
@@ -1310,6 +1322,35 @@ var findShowFolder = (destRoot, title) => {
     }
   }).find((f) => normalize(f) === target) ?? null;
 };
+var findShowFolderByContent = (destRoot, title) => {
+  if (!existsSync9(destRoot)) return null;
+  const normalize = (s) => s.toLowerCase().replace(/[^a-z0-9]/g, "");
+  const target = normalize(title);
+  const matchesTitle = (name) => {
+    if (!isTvEpisodeName(name)) return false;
+    const p = parseDownloadName(name);
+    return !!p && normalize(p.title) === target;
+  };
+  for (const folder of readdirSync7(destRoot)) {
+    try {
+      const folderPath = resolve8(destRoot, folder);
+      if (!lstatSync4(folderPath).isDirectory()) continue;
+      const children = readdirSync7(folderPath);
+      if (children.some(matchesTitle)) return folder;
+      for (const child of children) {
+        if (!isSeasonDirName(child)) continue;
+        try {
+          const seasonPath = resolve8(folderPath, child);
+          if (!lstatSync4(seasonPath).isDirectory()) continue;
+          if (readdirSync7(seasonPath).some(matchesTitle)) return folder;
+        } catch {
+        }
+      }
+    } catch {
+    }
+  }
+  return null;
+};
 var findSeasonFolder = (showPath, season) => {
   if (!existsSync9(showPath)) return null;
   const folders = readdirSync7(showPath).filter((f) => {
@@ -1334,11 +1375,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]("\u25CF");
 var typeTag = (t) => isVerbose() ? Color9.white.faint.encoder(` (${t})`) : "";
 var scan = async ({ type, hardlink: useHardlink, dryRun, auto, force, interactive }) => {
   const config = getConfig();
@@ -1411,7 +1453,7 @@ 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));
@@ -1429,10 +1471,10 @@ var scan = async ({ type, hardlink: useHardlink, dryRun, auto, force, interactiv
             rmSync2(videoSourcePath);
           }
         }
-        recordImport(sessionId, entryPath, destFolder, "move", tmdbId);
+        recordImport(sessionId, entryPath, destFolder, "move", tmdbId, "movie");
       }
     }
-    spinner_default.succeed(`${dryRun ? "[dry] " : ""}${typeColor.movie.encoder(folderName)}${typeTag("movie")}`);
+    spinner_default.succeed(`${dryRun ? "[dry] " : ""}${typeGlyph("movie")} ${typeColor.movie(folderName)}${typeTag("movie")}`);
     return true;
   };
   spinner_default.start();
@@ -1491,9 +1533,9 @@ var scan = async ({ type, hardlink: useHardlink, dryRun, auto, force, interactiv
         }
         if (!dryRun) {
           moveFolder(entryPath, destPath);
-          recordImport(sessionId, entryPath, destPath, "move");
+          recordImport(sessionId, entryPath, destPath, "move", void 0, "ps3");
         }
-        spinner_default.succeed(`${dryRun ? "[dry] " : ""}${typeColor.ps3.encoder(destName)}${typeTag("ps3")}`);
+        spinner_default.succeed(`${dryRun ? "[dry] " : ""}${typeGlyph("ps3")} ${typeColor.ps3(destName)}${typeTag("ps3")}`);
         imported++;
         continue;
       }
@@ -1516,9 +1558,9 @@ var scan = async ({ type, hardlink: useHardlink, dryRun, auto, force, interactiv
               rmSync2(entryPath);
             }
           }
-          recordImport(sessionId, entryPath, destPath, "move");
+          recordImport(sessionId, entryPath, destPath, "move", void 0, "book");
         }
-        spinner_default.succeed(`${dryRun ? "[dry] " : ""}${typeColor.book.encoder(entry)}${typeTag("book")}`);
+        spinner_default.succeed(`${dryRun ? "[dry] " : ""}${typeGlyph("book")} ${typeColor.book(entry)}${typeTag("book")}`);
         imported++;
         continue;
       }
@@ -1586,7 +1628,7 @@ var scan = async ({ type, hardlink: useHardlink, dryRun, auto, force, interactiv
           showPath = registeredShow.path;
           showFolderName = showPath.split("/").pop() ?? registeredShow.path;
         } else {
-          const existingFolder = findShowFolder(destRoot, resolvedTitle);
+          const existingFolder = findShowFolder(destRoot, resolvedTitle) ?? findShowFolderByContent(destRoot, resolvedTitle);
           if (existingFolder) {
             showFolderName = existingFolder;
             showPath = resolve8(destRoot, existingFolder);
@@ -1665,9 +1707,9 @@ var scan = async ({ type, hardlink: useHardlink, dryRun, auto, force, interactiv
             if (subtitleSourcePath && destSubtitleName) renameSync3(subtitleSourcePath, resolve8(seasonPath, destSubtitleName));
             if (isDir) rmSync2(entryPath, { recursive: true, force: true });
           }
-          recordImport(sessionId, entryPath, seasonPath, mode, tmdbId);
+          recordImport(sessionId, entryPath, seasonPath, mode, tmdbId, "tv");
         }
-        spinner_default.succeed(`${dryRun ? "[dry] " : ""}${typeColor.tv.encoder(`${showFolderName} / ${seasonFolderName} / ${episodeName}`)}${typeTag("tv")}`);
+        spinner_default.succeed(`${dryRun ? "[dry] " : ""}${typeGlyph("tv")} ${typeColor.tv(`${showFolderName} / ${seasonFolderName} / ${episodeName}`)}${typeTag("tv")}`);
         imported++;
         continue;
       }
@@ -1680,7 +1722,7 @@ var scan = async ({ type, hardlink: useHardlink, dryRun, auto, force, interactiv
   }
   if (pendingMovies.length > 0) {
     spinner_default.warn(`${pendingMovies.length} uncertain movie match${pendingMovies.length > 1 ? "es" : ""} skipped \u2014 use -i to review or -f to import all`);
-    for (const p of pendingMovies) spinner_default.info(`  ${typeColor.movie.encoder("?")} ${p.entry.replace(/\/$/, "")}${typeTag("movie")}`);
+    for (const p of pendingMovies) spinner_default.info(`  ${typeGlyph("movie")} ${p.entry.replace(/\/$/, "")}${typeTag("movie")}`);
     let toProcess = [];
     if (interactive) {
       spinner_default.stop();
@@ -1709,7 +1751,7 @@ var scan = async ({ type, hardlink: useHardlink, dryRun, auto, force, interactiv
   }
   if (pendingTv.length > 0) {
     spinner_default.warn(`${pendingTv.length} TV show${pendingTv.length > 1 ? "s" : ""} skipped \u2014 no matching folder in destination`);
-    for (const p of pendingTv) spinner_default.info(`  ${typeColor.tv.encoder("?")} ${p.resolvedTitle} \u2014 ${p.entry.replace(/\/$/, "")}${typeTag("tv")}`);
+    for (const p of pendingTv) spinner_default.info(`  ${typeGlyph("tv")} ${p.resolvedTitle} \u2014 ${p.entry.replace(/\/$/, "")}${typeTag("tv")}`);
     skipped += pendingTv.length;
   }
   if (ignoreSet.size > 0) {
@@ -1728,37 +1770,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 existsSync10, renameSync as renameSync4 } 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) {
+      renameSync4(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 (!existsSync10(record.destinationPath)) {
+      spinner_default.info(`skipped \u2014 destination no longer exists: ${record.destinationPath}`);
+      skipped++;
+      continue;
+    }
+    renameSync4(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 { cpSync as cpSync2, existsSync as existsSync11, 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 { Color as Color11 } from "termkit";
 var sameDev2 = (a, b) => {
   try {
     let bExisting = b;
-    while (!existsSync10(bExisting)) bExisting = dirname3(bExisting);
+    while (!existsSync11(bExisting)) bExisting = dirname3(bExisting);
     return statSync3(a).dev === statSync3(bExisting).dev;
   } catch {
     return false;
@@ -1857,7 +1930,7 @@ var expandWatchPath = (p) => {
   return [p];
 };
 var findSeasonFolder2 = (showPath, season) => {
-  if (!existsSync10(showPath)) return null;
+  if (!existsSync11(showPath)) return null;
   const folders = readdirSync8(showPath).filter((f) => {
     try {
       return lstatSync5(resolve9(showPath, f)).isDirectory();
@@ -1903,18 +1976,18 @@ 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 (existsSync11(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 (existsSync11(destPath)) {
       spinner_default.warn(`already exists: ${entry}`);
       return;
     }
@@ -1929,7 +2002,7 @@ var processItem = async (entryPath, useHardlink, language, auto) => {
         rmSync3(entryPath);
       }
     }
-    recordImport(sessionId, entryPath, destPath, "move");
+    recordImport(sessionId, entryPath, destPath, "move", void 0, "book");
     spinner_default.succeed(`imported ${Color11.green.encoder(entry)}`);
     return;
   }
@@ -1970,7 +2043,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 (existsSync11(destVideoPath)) {
       spinner_default.warn(`already exists: ${episodeName}`);
       return;
     }
@@ -2002,14 +2075,14 @@ var processItem = async (entryPath, useHardlink, language, auto) => {
       if (subtitleSourcePath2 && destSubtitleName2) renameSync5(subtitleSourcePath2, resolve9(seasonPath, destSubtitleName2));
       if (isDir) rmSync3(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 (existsSync11(destFolder)) {
     spinner_default.warn(`already exists: ${folderName}`);
     return;
   }
@@ -2040,7 +2113,7 @@ 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));
@@ -2058,7 +2131,7 @@ var processItem = async (entryPath, useHardlink, language, auto) => {
         rmSync3(videoSourcePath);
       }
     }
-    recordImport(sessionId, entryPath, destFolder, "move");
+    recordImport(sessionId, entryPath, destFolder, "move", void 0, "movie");
   }
   spinner_default.succeed(`imported ${Color11.green.encoder(folderName)}`);
 };
@@ -2106,6 +2179,7 @@ export {
   configSet,
   configShow,
   deleteImport,
+  deleteImportSession,
   deleteSession,
   destAdd,
   destRemove,
@@ -2118,6 +2192,7 @@ export {
   getConfig,
   getHistory,
   getImportByDest,
+  getLastImportSession,
   getLastSession,
   getMediaInfo,
   history_default as history,

package/package.json

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