Skip to content

fix: preserve structured upload variants #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CircleCrop wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: preserve structured upload variants #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions apps/internal-site/components/web-uploader/source-scanner.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,28 @@ describe("scanBrowserUploadFiles", () => {
expect(plan.frames[0].misc.map((asset) => asset.label)).toEqual(["Rip"]);
});

it("preserves explicit rip and flt variants inside an after directory", () => {
const plan = scanBrowserUploadFiles(
[
image("case/before/24_WATANARE_ANIME_VOL1_00000.gen.vpy-27240-src.png"),
image("case/after/24_WATANARE_ANIME_VOL1_00000.gen.vpy-27240-output.png"),
image("case/after/24_WATANARE_ANIME_VOL1_00000.gen.vpy-27240-rip.png"),
image("case/after/24_WATANARE_ANIME_VOL1_00000.gen.vpy-27240-flt.png"),
],
"case",
);

expect(plan.frames).toHaveLength(1);
expect(plan.frames[0].after.source.relativePath).toBe(
"after/24_WATANARE_ANIME_VOL1_00000.gen.vpy-27240-output.png",
);
expect(plan.frames[0].misc.map((asset) => asset.source.relativePath)).toEqual([
"after/24_WATANARE_ANIME_VOL1_00000.gen.vpy-27240-rip.png",
"after/24_WATANARE_ANIME_VOL1_00000.gen.vpy-27240-flt.png",
]);
expect(plan.frames[0].misc.map((asset) => asset.label)).toEqual(["Rip", "Flt"]);
});

it("pairs structured filenames even when only some variants keep the fps prefix", () => {
const plan = scanBrowserUploadFiles(
[
Expand Down
5 changes: 3 additions & 2 deletions apps/internal-site/components/web-uploader/source-scanner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,8 @@ function parseCandidate(entry: BrowserUploadFile, variantOverride?: string): Sou
return {
entry,
originalName: basename(entry.relativePath),
variant: (variantOverride ?? structured.variant).trim().toLowerCase(),
// Structured filenames must carry an explicit variant, so directory hints must not replace it.
variant: structured.variant.trim().toLowerCase(),
fps: structured.fps,
episode: structured.episode,
frameNumber: structured.frameNumber,
Expand All @@ -279,7 +280,7 @@ function parseCandidate(entry: BrowserUploadFile, variantOverride?: string): Sou
const prefix = match.groups.prefix;
const rawFrame = match.groups.frame;
const frameNumber = Number(rawFrame.replace(/^0+/, "") || "0");
const variant = (variantOverride ?? match.groups.variant ?? "output").trim().toLowerCase();
const variant = (match.groups.variant ?? variantOverride ?? "output").trim().toLowerCase();
const fps = extractFps(pathStem);
const episode = extractEpisode(prefix);
const title = `${fps}_${episode}_${frameNumber}`;
Expand Down