Skip to content

Commit db29935

Browse files
fix(cli): init tells the source in the folder by the file, not its spelling
On a case-blind disk --video original.mp4 names Original.MP4, so the folder check and the copy now compare device and inode; a source named in another case is accepted and never copied onto itself.
1 parent e6ccab9 commit db29935

2 files changed

Lines changed: 36 additions & 3 deletions

File tree

‎packages/cli/src/commands/init.sourceInFolder.test.ts‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {
66
mkdirSync,
77
mkdtempSync,
88
readFileSync,
9+
renameSync,
910
rmSync,
1011
writeFileSync,
1112
} from "node:fs";
@@ -20,6 +21,13 @@ vi.mock("../telemetry/events.js", () => ({ trackInitTemplate: vi.fn() }));
2021
const ffmpeg = spawnSync("ffmpeg", ["-version"]).status === 0;
2122
const hevc =
2223
ffmpeg && spawnSync("ffmpeg", ["-hide_banner", "-encoders"]).stdout.includes("libx265");
24+
const caseBlind = (() => {
25+
const probe = mkdtempSync(join(tmpdir(), "hf-case-"));
26+
writeFileSync(join(probe, "a"), "");
27+
const blind = existsSync(join(probe, "A"));
28+
rmSync(probe, { recursive: true, force: true });
29+
return blind;
30+
})();
2331
let dir: string;
2432
let project: string;
2533

@@ -79,6 +87,17 @@ it.skipIf(!ffmpeg)(
7987
},
8088
);
8189

90+
it.skipIf(!ffmpeg || !caseBlind)(
91+
"scaffolds when the video in the folder is named in another case on a case-blind disk",
92+
async () => {
93+
renameSync(join(project, "original.mp4"), join(project, "Original.MP4"));
94+
const video = readFileSync(join(project, "Original.MP4"));
95+
await initWithVideo(join(project, "original.mp4"));
96+
expect(existsSync(join(project, "index.html"))).toBe(true);
97+
expect(readFileSync(join(project, "Original.MP4")).equals(video)).toBe(true);
98+
},
99+
);
100+
82101
it.skipIf(!ffmpeg)("still refuses a folder holding anything else", async () => {
83102
writeFileSync(join(project, "notes.txt"), "mine");
84103
await initWithVideo().catch(() => undefined);

‎packages/cli/src/commands/init.ts‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import {
2525
existsSync,
2626
mkdirSync,
2727
copyFileSync,
28+
statSync,
2829
writeFileSync,
2930
readFileSync,
3031
readdirSync,
@@ -280,21 +281,34 @@ function getSharedTemplateDir(): string {
280281
const MEDIA_THE_SCAFFOLD_NEVER_WRITES =
281282
/\.(mp4|m4v|mov|webm|mkv|avi|mpe?g|wav|mp3|m4a|aac|ogg|oga|opus|flac)$/i;
282283

284+
function fileOnDisk(path: string): string | undefined {
285+
try {
286+
const { dev, ino } = statSync(path);
287+
return `${dev}:${ino}`;
288+
} catch {
289+
return undefined;
290+
}
291+
}
292+
283293
function holdsFilesBesideProjectConfigOrSources(
284294
dir: string,
285295
sources: (string | undefined)[] = [],
286296
): boolean {
287297
const kept = new Set(
288-
sources.flatMap((s) => (s && MEDIA_THE_SCAFFOLD_NEVER_WRITES.test(s) ? [resolve(s)] : [])),
298+
sources.flatMap((s) => (s && MEDIA_THE_SCAFFOLD_NEVER_WRITES.test(s) ? [fileOnDisk(s)] : [])),
289299
);
300+
kept.delete(undefined);
301+
const isKeptSource = (name: string) =>
302+
MEDIA_THE_SCAFFOLD_NEVER_WRITES.test(name) && kept.has(fileOnDisk(resolve(dir, name)));
290303
return (
291304
existsSync(dir) &&
292-
readdirSync(dir).some((name) => name !== "hyperframes.json" && !kept.has(resolve(dir, name)))
305+
readdirSync(dir).some((name) => name !== "hyperframes.json" && !isKeptSource(name))
293306
);
294307
}
295308

296309
function copyIntoProjectUnlessAlreadyThere(src: string, dest: string): void {
297-
if (resolve(src) !== resolve(dest)) copyFileSync(src, dest);
310+
const same = resolve(src) === resolve(dest) || fileOnDisk(src) === (fileOnDisk(dest) ?? "");
311+
if (!same) copyFileSync(src, dest);
298312
}
299313

300314
/** The longest folder name the common disks hold: 255 UTF-8 bytes on Linux, 255 UTF-16 units on macOS and Windows. */

0 commit comments

Comments
 (0)