From 5bb38451fd28b52a758ae470a4c165499efdc89f Mon Sep 17 00:00:00 2001 From: Justin Bennett Date: Wed, 14 Jan 2026 21:01:15 -0500 Subject: [PATCH] Expand asset upload script to include audio files and rename tasks - Rename upload task from upload-images to upload-assets for clarity - Update script to handle additional audio file types (m4a, mp3, wav, ogg, aac, flac) alongside images - Modify scanning, hashing, uploading, and manifest generation to support both images and audio - Improve manifest and variable names to reflect broader asset coverage - Ensure idempotence by skipping already uploaded assets - Update logs to reflect total assets processed, enhancing monitoring and debugging --- mise.toml | 6 +-- .../{upload-images.ts => upload-assets.ts} | 49 ++++++++++--------- 2 files changed, 30 insertions(+), 25 deletions(-) rename scripts/{upload-images.ts => upload-assets.ts} (72%) diff --git a/mise.toml b/mise.toml index f3784b1a..c2b26a05 100644 --- a/mise.toml +++ b/mise.toml @@ -36,9 +36,9 @@ run = "vitest --ui" [tasks.prefix-codes] run = "bun scripts/prefix-codes.ts" -[tasks.upload-images] -run = "bun scripts/upload-images.ts" -description = "Upload images to R2 and update manifest" +[tasks.upload-assets] +run = "bun scripts/upload-assets.ts" +description = "Upload assets (images, audio) to R2 and update manifest" [tasks.deploy] run = "wrangler deploy" diff --git a/scripts/upload-images.ts b/scripts/upload-assets.ts similarity index 72% rename from scripts/upload-images.ts rename to scripts/upload-assets.ts index 1f3aa298..42f525de 100644 --- a/scripts/upload-images.ts +++ b/scripts/upload-assets.ts @@ -1,14 +1,14 @@ #!/usr/bin/env bun /** - * Upload images from public/assets to Cloudflare R2 + * Upload assets (images, audio) from public/assets to Cloudflare R2 * * This script: - * - Scans public/assets for images (png, jpg, jpeg, webp, gif, svg) - * - Generates SHA-256 hash for each image + * - Scans public/assets for media files (images: png, jpg, jpeg, webp, gif, svg; audio: m4a, mp3, wav, ogg) + * - Generates SHA-256 hash for each file * - Uploads to R2 with content-addressable key (hash.ext) * - Creates manifest mapping original paths to R2 URLs - * - Skips uploads for images already in R2 (idempotent) + * - Skips uploads for files already in R2 (idempotent) * * Path structure: * - Local: public/assets/talks/codegen-in-rust/slide-1.png @@ -29,10 +29,10 @@ import { join, relative } from "path"; const BUCKET_NAME = "just-be-dev-assets"; const CUSTOM_DOMAIN = "https://assets.just-be.dev"; -const IMAGE_DIR = join(import.meta.dir, "../public/assets"); +const ASSETS_DIR = join(import.meta.dir, "../public/assets"); const MANIFEST_PATH = join(import.meta.dir, "../src/content/image-manifest.json"); -interface ImageManifest { +interface AssetManifest { version: string; images: Record { return createHash("sha256").update(content).digest("hex"); } -async function findImages(dir: string): Promise { - const imageExtensions = ['.png', '.jpg', '.jpeg', '.webp', '.gif', '.svg']; +async function findAssets(dir: string): Promise { + const assetExtensions = [ + // Images + '.png', '.jpg', '.jpeg', '.webp', '.gif', '.svg', + // Audio + '.m4a', '.mp3', '.wav', '.ogg', '.aac', '.flac' + ]; const results: string[] = []; async function walk(currentDir: string): Promise { @@ -58,7 +63,7 @@ async function findImages(dir: string): Promise { await walk(fullPath); } else if (entry.isFile()) { const ext = entry.name.toLowerCase().slice(entry.name.lastIndexOf('.')); - if (imageExtensions.includes(ext)) { + if (assetExtensions.includes(ext)) { results.push(fullPath); } } @@ -83,13 +88,13 @@ async function uploadToR2(localPath: string, key: string): Promise { await $`wrangler r2 object put ${BUCKET_NAME}/${key} --file ${localPath} --remote`; } -async function uploadImages() { - console.log(`Scanning images in: ${IMAGE_DIR}\n`); +async function uploadAssets() { + console.log(`Scanning assets in: ${ASSETS_DIR}\n`); - const imagePaths = await findImages(IMAGE_DIR); - console.log(`Found ${imagePaths.length} images\n`); + const assetPaths = await findAssets(ASSETS_DIR); + console.log(`Found ${assetPaths.length} assets\n`); - const manifest: ImageManifest = { + const manifest: AssetManifest = { version: "1.0", images: {}, }; @@ -97,13 +102,13 @@ async function uploadImages() { let uploadCount = 0; let skipCount = 0; - for (const imagePath of imagePaths) { - const hash = await hashFile(imagePath); - const ext = imagePath.split(".").pop()!; + for (const assetPath of assetPaths) { + const hash = await hashFile(assetPath); + const ext = assetPath.split(".").pop()!; const key = `${hash}.${ext}`; // Store path relative to public/assets (e.g., "talks/codegen-in-rust/slide-1.png") - const originalPath = relative(join(import.meta.dir, "../public/assets"), imagePath); + const originalPath = relative(join(import.meta.dir, "../public/assets"), assetPath); const exists = await checkR2Exists(key); @@ -112,11 +117,11 @@ async function uploadImages() { skipCount++; } else { console.log(`ā¬† ${originalPath} ā†’ ${key}`); - await uploadToR2(imagePath, key); + await uploadToR2(assetPath, key); uploadCount++; } - const stats = await Bun.file(imagePath).stat(); + const stats = await Bun.file(assetPath).stat(); manifest.images[originalPath] = { hash, size: stats.size, @@ -126,10 +131,10 @@ async function uploadImages() { await writeFile(MANIFEST_PATH, JSON.stringify(manifest, null, 2) + "\n"); console.log(`\nāœ… Manifest written to ${MANIFEST_PATH}`); - console.log(`\nUploaded: ${uploadCount}, Skipped: ${skipCount}, Total: ${imagePaths.length}`); + console.log(`\nUploaded: ${uploadCount}, Skipped: ${skipCount}, Total: ${assetPaths.length}`); } -uploadImages().catch((error) => { +uploadAssets().catch((error) => { console.error("Fatal error:", error); process.exit(1); });