diff --git a/site/scripts/fixtures/landing-media.json b/site/scripts/fixtures/landing-media.json index a6bef0b6e..26aab1076 100644 --- a/site/scripts/fixtures/landing-media.json +++ b/site/scripts/fixtures/landing-media.json @@ -1,18 +1,18 @@ { "chat-dark": { - "mp4": "https://assets.fanout.run/landing/chat-dark-0123456789ab.mp4", - "webm": "https://assets.fanout.run/landing/chat-dark-0123456789ab.webm" + "mp4": "https://assets.fanout.run/videos/chat-dark-0123456789ab.mp4", + "webm": "https://assets.fanout.run/videos/chat-dark-0123456789ab.webm" }, "chat-light": { - "mp4": "https://assets.fanout.run/landing/chat-light-0123456789ab.mp4", - "webm": "https://assets.fanout.run/landing/chat-light-0123456789ab.webm" + "mp4": "https://assets.fanout.run/videos/chat-light-0123456789ab.mp4", + "webm": "https://assets.fanout.run/videos/chat-light-0123456789ab.webm" }, "dashboard-dark": { - "mp4": "https://assets.fanout.run/landing/dashboard-dark-0123456789ab.mp4", - "webm": "https://assets.fanout.run/landing/dashboard-dark-0123456789ab.webm" + "mp4": "https://assets.fanout.run/videos/dashboard-dark-0123456789ab.mp4", + "webm": "https://assets.fanout.run/videos/dashboard-dark-0123456789ab.webm" }, "dashboard-light": { - "mp4": "https://assets.fanout.run/landing/dashboard-light-0123456789ab.mp4", - "webm": "https://assets.fanout.run/landing/dashboard-light-0123456789ab.webm" + "mp4": "https://assets.fanout.run/videos/dashboard-light-0123456789ab.mp4", + "webm": "https://assets.fanout.run/videos/dashboard-light-0123456789ab.webm" } } diff --git a/site/scripts/landing-recordings.md b/site/scripts/landing-recordings.md index bb3238c2e..54a2c7ce6 100644 --- a/site/scripts/landing-recordings.md +++ b/site/scripts/landing-recordings.md @@ -10,7 +10,9 @@ Expected assets (all at 1280 × 800): Encoded videos stay local and are ignored by Git and Docker; PNG posters stay in the repository so Astro can optimize them. Published videos live in the -Cloudflare R2 bucket `fanout`, served at `https://assets.fanout.run/`. +Cloudflare R2 bucket `fanout` under `videos/`, served at +`https://assets.fanout.run/videos/`. The bucket holds public assets only, in one +folder per file type. Each slot stays poster-only until both themes have both video formats in `site/src/data/landing-media.json`. An absent manifest also shows posters. The diff --git a/site/scripts/upload-clips.mjs b/site/scripts/upload-clips.mjs index d6d5cc430..d85c71629 100644 --- a/site/scripts/upload-clips.mjs +++ b/site/scripts/upload-clips.mjs @@ -11,7 +11,7 @@ const formats = ["mp4", "webm"]; export function clipObject(name, format, contents) { const hash = createHash("sha256").update(contents).digest("hex").slice(0, 12); - const key = `landing/${name}-${hash}.${format}`; + const key = `videos/${name}-${hash}.${format}`; return { key, url: `https://assets.fanout.run/${key}` }; } diff --git a/site/scripts/upload-clips.test.mjs b/site/scripts/upload-clips.test.mjs index fcb4ec7ca..1753e73ed 100644 --- a/site/scripts/upload-clips.test.mjs +++ b/site/scripts/upload-clips.test.mjs @@ -19,8 +19,8 @@ function setup(t) { test("object keys and public URLs use the first 12 hex digits of SHA-256", () => { for (const format of ["webm", "mp4"]) { assert.deepEqual(clipObject("chat-light", format, Buffer.from("abc")), { - key: `landing/chat-light-ba7816bf8f01.${format}`, - url: `https://assets.fanout.run/landing/chat-light-ba7816bf8f01.${format}`, + key: `videos/chat-light-ba7816bf8f01.${format}`, + url: `https://assets.fanout.run/videos/chat-light-ba7816bf8f01.${format}`, }); assert.notEqual(clipObject("chat-light", format, Buffer.from("abcd")).key, clipObject("chat-light", format, Buffer.from("abc")).key); diff --git a/site/src/data/landing-media.json b/site/src/data/landing-media.json index b600aca5a..8c3b4b02b 100644 --- a/site/src/data/landing-media.json +++ b/site/src/data/landing-media.json @@ -1,18 +1,18 @@ { "chat-dark": { - "mp4": "https://assets.fanout.run/landing/chat-dark-df7f6aeae8ae.mp4", - "webm": "https://assets.fanout.run/landing/chat-dark-a40b083a1847.webm" + "mp4": "https://assets.fanout.run/videos/chat-dark-df7f6aeae8ae.mp4", + "webm": "https://assets.fanout.run/videos/chat-dark-a40b083a1847.webm" }, "chat-light": { - "mp4": "https://assets.fanout.run/landing/chat-light-aed5fb359884.mp4", - "webm": "https://assets.fanout.run/landing/chat-light-4d3bcc09f5de.webm" + "mp4": "https://assets.fanout.run/videos/chat-light-aed5fb359884.mp4", + "webm": "https://assets.fanout.run/videos/chat-light-4d3bcc09f5de.webm" }, "dashboard-dark": { - "mp4": "https://assets.fanout.run/landing/dashboard-dark-106bbe5a437d.mp4", - "webm": "https://assets.fanout.run/landing/dashboard-dark-5c4580915a9e.webm" + "mp4": "https://assets.fanout.run/videos/dashboard-dark-106bbe5a437d.mp4", + "webm": "https://assets.fanout.run/videos/dashboard-dark-5c4580915a9e.webm" }, "dashboard-light": { - "mp4": "https://assets.fanout.run/landing/dashboard-light-096a6eaf1685.mp4", - "webm": "https://assets.fanout.run/landing/dashboard-light-3c5456d88c86.webm" + "mp4": "https://assets.fanout.run/videos/dashboard-light-096a6eaf1685.mp4", + "webm": "https://assets.fanout.run/videos/dashboard-light-3c5456d88c86.webm" } }