Remove empty download package dirs after archive cleanup in v1.3.11
This commit is contained in:
@@ -1027,6 +1027,72 @@ describe("download manager", () => {
|
||||
expect(fs.existsSync(path.join(extractDir, "episode.mkv"))).toBe(true);
|
||||
});
|
||||
|
||||
it("removes empty download package directory after startup cleanup backfill", async () => {
|
||||
const root = fs.mkdtempSync(path.join(os.tmpdir(), "rd-dm-"));
|
||||
tempDirs.push(root);
|
||||
|
||||
const packageDir = path.join(root, "downloads", "legacy-empty");
|
||||
fs.mkdirSync(packageDir, { recursive: true });
|
||||
const part1 = path.join(packageDir, "legacy.empty.part01.rar");
|
||||
const part2 = path.join(packageDir, "legacy.empty.part02.rar");
|
||||
fs.writeFileSync(part1, "part1", "utf8");
|
||||
fs.writeFileSync(part2, "part2", "utf8");
|
||||
|
||||
const session = emptySession();
|
||||
const packageId = "legacy-empty-pkg";
|
||||
const itemId = "legacy-empty-item";
|
||||
const createdAt = Date.now() - 20_000;
|
||||
|
||||
session.packageOrder = [packageId];
|
||||
session.packages[packageId] = {
|
||||
id: packageId,
|
||||
name: "legacy-empty",
|
||||
outputDir: packageDir,
|
||||
extractDir: path.join(root, "extract", "legacy-empty"),
|
||||
status: "completed",
|
||||
itemIds: [itemId],
|
||||
cancelled: false,
|
||||
enabled: true,
|
||||
createdAt,
|
||||
updatedAt: createdAt
|
||||
};
|
||||
session.items[itemId] = {
|
||||
id: itemId,
|
||||
packageId,
|
||||
url: "https://dummy/legacy-empty",
|
||||
provider: "realdebrid",
|
||||
status: "completed",
|
||||
retries: 0,
|
||||
speedBps: 0,
|
||||
downloadedBytes: 123,
|
||||
totalBytes: 123,
|
||||
progressPercent: 100,
|
||||
fileName: path.basename(part1),
|
||||
targetPath: part1,
|
||||
resumable: true,
|
||||
attempts: 1,
|
||||
lastError: "",
|
||||
fullStatus: "Entpackt",
|
||||
createdAt,
|
||||
updatedAt: createdAt
|
||||
};
|
||||
|
||||
new DownloadManager(
|
||||
{
|
||||
...defaultSettings(),
|
||||
token: "rd-token",
|
||||
outputDir: path.join(root, "downloads"),
|
||||
extractDir: path.join(root, "extract"),
|
||||
autoExtract: false,
|
||||
cleanupMode: "delete"
|
||||
},
|
||||
session,
|
||||
createStoragePaths(path.join(root, "state"))
|
||||
);
|
||||
|
||||
await waitFor(() => !fs.existsSync(packageDir), 5000);
|
||||
});
|
||||
|
||||
it("does not over-clean packages that share one extract directory", async () => {
|
||||
const root = fs.mkdtempSync(path.join(os.tmpdir(), "rd-dm-"));
|
||||
tempDirs.push(root);
|
||||
|
||||
@@ -131,6 +131,63 @@ describe("extractor", () => {
|
||||
expect(fs.existsSync(path.join(targetDir, "episode.txt"))).toBe(true);
|
||||
});
|
||||
|
||||
it("removes empty package directory after archive cleanup", async () => {
|
||||
const root = fs.mkdtempSync(path.join(os.tmpdir(), "rd-extract-"));
|
||||
tempDirs.push(root);
|
||||
const packageDir = path.join(root, "pkg");
|
||||
const targetDir = path.join(root, "out");
|
||||
fs.mkdirSync(packageDir, { recursive: true });
|
||||
|
||||
const zipPath = path.join(packageDir, "release.zip");
|
||||
const zip = new AdmZip();
|
||||
zip.addFile("video.mkv", Buffer.from("ok"));
|
||||
zip.writeZip(zipPath);
|
||||
|
||||
const result = await extractPackageArchives({
|
||||
packageDir,
|
||||
targetDir,
|
||||
cleanupMode: "delete",
|
||||
conflictMode: "overwrite",
|
||||
removeLinks: false,
|
||||
removeSamples: false
|
||||
});
|
||||
|
||||
expect(result.extracted).toBe(1);
|
||||
expect(result.failed).toBe(0);
|
||||
expect(fs.existsSync(packageDir)).toBe(false);
|
||||
expect(fs.existsSync(path.join(targetDir, "video.mkv"))).toBe(true);
|
||||
});
|
||||
|
||||
it("keeps package directory when non-archive files remain", async () => {
|
||||
const root = fs.mkdtempSync(path.join(os.tmpdir(), "rd-extract-"));
|
||||
tempDirs.push(root);
|
||||
const packageDir = path.join(root, "pkg");
|
||||
const targetDir = path.join(root, "out");
|
||||
fs.mkdirSync(packageDir, { recursive: true });
|
||||
|
||||
const zipPath = path.join(packageDir, "release.zip");
|
||||
const keepPath = path.join(packageDir, "notes.nfo");
|
||||
const zip = new AdmZip();
|
||||
zip.addFile("video.mkv", Buffer.from("ok"));
|
||||
zip.writeZip(zipPath);
|
||||
fs.writeFileSync(keepPath, "keep", "utf8");
|
||||
|
||||
const result = await extractPackageArchives({
|
||||
packageDir,
|
||||
targetDir,
|
||||
cleanupMode: "delete",
|
||||
conflictMode: "overwrite",
|
||||
removeLinks: false,
|
||||
removeSamples: false
|
||||
});
|
||||
|
||||
expect(result.extracted).toBe(1);
|
||||
expect(result.failed).toBe(0);
|
||||
expect(fs.existsSync(packageDir)).toBe(true);
|
||||
expect(fs.existsSync(keepPath)).toBe(true);
|
||||
expect(fs.existsSync(path.join(targetDir, "video.mkv"))).toBe(true);
|
||||
});
|
||||
|
||||
it("treats ask conflict mode as skip in zip extraction", async () => {
|
||||
const root = fs.mkdtempSync(path.join(os.tmpdir(), "rd-extract-"));
|
||||
tempDirs.push(root);
|
||||
|
||||
Reference in New Issue
Block a user