Add optional flat MKV library collection per package

tests/download-manager.test.ts

@@ -3998,6 +3998,78 @@ describe("download manager", () => {
     expect(fs.existsSync(path.join(extractDir, unexpectedName))).toBe(false);
   });
 
+  it("moves extracted MKV files into a flat library folder per completed package", async () => {
+    const root = fs.mkdtempSync(path.join(os.tmpdir(), "rd-dm-"));
+    tempDirs.push(root);
+
+    const packageName = "Flat-Pack";
+    const sourceFileName = "Season 1/Episode01.mkv";
+    const { session, packageId, itemId, originalExtractedPath } = createCompletedArchiveSession(root, packageName, sourceFileName);
+    const mkvLibraryDir = path.join(root, "mkv-library");
+
+    const manager = new DownloadManager(
+      {
+        ...defaultSettings(),
+        token: "rd-token",
+        outputDir: path.join(root, "downloads"),
+        extractDir: path.join(root, "extract"),
+        autoExtract: true,
+        autoRename4sf4sj: false,
+        collectMkvToLibrary: true,
+        mkvLibraryDir,
+        enableIntegrityCheck: false,
+        cleanupMode: "none"
+      },
+      session,
+      createStoragePaths(path.join(root, "state"))
+    );
+
+    const flattenedPath = path.join(mkvLibraryDir, "Episode01.mkv");
+    await waitFor(() => fs.existsSync(flattenedPath), 12000);
+
+    expect(manager.getSnapshot().session.packages[packageId]?.status).toBe("completed");
+    expect(manager.getSnapshot().session.items[itemId]?.fullStatus).toBe("Entpackt");
+    expect(fs.existsSync(flattenedPath)).toBe(true);
+    expect(fs.existsSync(originalExtractedPath)).toBe(false);
+  });
+
+  it("keeps existing MKV names and appends a suffix while flattening", async () => {
+    const root = fs.mkdtempSync(path.join(os.tmpdir(), "rd-dm-"));
+    tempDirs.push(root);
+
+    const packageName = "Flat-Collision";
+    const sourceFileName = "Season 1/Episode01.mkv";
+    const { session } = createCompletedArchiveSession(root, packageName, sourceFileName);
+    const mkvLibraryDir = path.join(root, "mkv-library");
+    fs.mkdirSync(mkvLibraryDir, { recursive: true });
+    const existingPath = path.join(mkvLibraryDir, "Episode01.mkv");
+    fs.writeFileSync(existingPath, "already-here", "utf8");
+
+    new DownloadManager(
+      {
+        ...defaultSettings(),
+        token: "rd-token",
+        outputDir: path.join(root, "downloads"),
+        extractDir: path.join(root, "extract"),
+        autoExtract: true,
+        autoRename4sf4sj: false,
+        collectMkvToLibrary: true,
+        mkvLibraryDir,
+        enableIntegrityCheck: false,
+        cleanupMode: "none"
+      },
+      session,
+      createStoragePaths(path.join(root, "state"))
+    );
+
+    const suffixedPath = path.join(mkvLibraryDir, "Episode01 (2).mkv");
+    await waitFor(() => fs.existsSync(suffixedPath), 12000);
+
+    expect(fs.existsSync(existingPath)).toBe(true);
+    expect(fs.readFileSync(existingPath, "utf8")).toBe("already-here");
+    expect(fs.existsSync(suffixedPath)).toBe(true);
+  });
+
   it("throws a controlled error for invalid queue import JSON", () => {
     const root = fs.mkdtempSync(path.join(os.tmpdir(), "rd-dm-"));
     tempDirs.push(root);

tests/storage.test.ts

@@ -84,6 +84,7 @@ describe("settings storage", () => {
       speedLimitKbps: -1,
       outputDir: "   ",
       extractDir: "   ",
+      mkvLibraryDir: "   ",
       updateRepo: "   "
     });
 
@@ -99,6 +100,7 @@ describe("settings storage", () => {
     expect(normalized.speedLimitKbps).toBe(0);
     expect(normalized.outputDir).toBe(defaultSettings().outputDir);
     expect(normalized.extractDir).toBe(defaultSettings().extractDir);
+    expect(normalized.mkvLibraryDir).toBe(defaultSettings().mkvLibraryDir);
     expect(normalized.updateRepo).toBe(defaultSettings().updateRepo);
   });
 
@@ -418,6 +420,8 @@ describe("settings storage", () => {
     expect(loaded.speedLimitMode).toBe(defaults.speedLimitMode);
     expect(loaded.clipboardWatch).toBe(defaults.clipboardWatch);
     expect(loaded.minimizeToTray).toBe(defaults.minimizeToTray);
+    expect(loaded.collectMkvToLibrary).toBe(defaults.collectMkvToLibrary);
+    expect(loaded.mkvLibraryDir).toBe(defaults.mkvLibraryDir);
     expect(loaded.theme).toBe(defaults.theme);
     expect(loaded.bandwidthSchedules).toEqual(defaults.bandwidthSchedules);
     expect(loaded.updateRepo).toBe(defaults.updateRepo);