Commit c776c2c6068df0f5910424eff3270e312f5f10ce | sitegen

author	clover caruso <git@paperclover.net> 2026-02-02 03:43:13-08:00
committer	clover caruso <git@paperclover.net> 2026-02-02 03:50:47-08:00
log	c776c2c6068df0f5910424eff3270e312f5f10ce
tree	98944a6adaebc145d444a16813fb32f0230f6eee
parent	d04d6837a37f36f46b8badbb14eb9f15c30d38b4
signature	Signed by SSH key SHA256:xbd+BjjhyBfwk7GVoURf9Yx0gzDerHbvYv7SddNWmAs

resolves #60

4 files changed, 20 insertions(+), 10 deletions(-)

run.js+8-5

...	...	@@ -17,13 +17,13 @@ process.emit = function (event, error) {
17	17
18	18	let hot;
19	19	try {
20		// required APIs
	20	// zstd is not supported in node 22
21	21	await new Promise((resolve) => zlib.zstdCompress(new Uint8Array(), resolve));
22	22
23		// seems to fail in bun
	23	// seems to fail in bun, run it earlier to catch
24	24	(await import("source-map-support")).install({ hookRequire: true });
25	25
26		// Init hooks
	26	// init hooks. some runtimes have bugs here. and long term this system should be rebuilt
27	27	hot = await import("./framework/hot.ts");
28	28	hot.load("./lib/log.ts");
29	29	} catch (e) {
...	...	@@ -70,9 +70,12 @@ if (process.argv[1].startsWith(import.meta.filename.slice(0, -".js".length))) {
70	70	process.exit(1);
71	71	}
72	72	let found;
73		for (const dir of ["./", "./src/", "./framework/"]) {
	73	for (const dir of fs.globSync("{lib,{src,framework},{src,lib}/**/bin}")) {
74	74	try {
75		found = hot.resolveFrom(import.meta.filename, dir + process.argv[2]);
	75	found = hot.resolveFrom(
	76	import.meta.filename,
	77	`./${dir}/${process.argv[2]}`,
	78	);
76	79	break;
77	80	} catch (e) {
78	81	continue;

src/bin/download-db.ts+2-2

...	...	@@ -1,6 +1,6 @@
1	1	export async function main() {
2	2	await rsync.spawn({
3		cwd: Path.resolve(import.meta.dirname).parent!.toString(),
	3	cwd: Path.resolve("."),
4	4	args: [
5	5	"-a",
6	6	"--progress",
...	...	@@ -10,7 +10,7 @@ export async function main() {
10	10	progress: progress.start("download file cache"),
11	11	});
12	12	await rsync.spawn({
13		cwd: Path.resolve(import.meta.dirname).parent!.toString(),
	13	cwd: Path.resolve("."),
14	14	args: [
15	15	"-a",
16	16	"--progress",

src/file-viewer/rsync.ts+3-2

...	...	@@ -25,7 +25,7 @@ export interface SpawnOptions {
25	25	args: string[];
26	26	rsync?: string;
27	27	progress: progress.Node;
28		cwd?: string;
	28	cwd?: Path;
29	29	}
30	30
31	31	export async function spawn(options: SpawnOptions) {
...	...	@@ -33,7 +33,7 @@ export async function spawn(options: SpawnOptions) {
33	33	using node = options.progress;
34	34	const proc = child_process.spawn(rsync, [...defaultExtraOptions, ...args], {
35	35	stdio: ["ignore", "pipe", "pipe"],
36		cwd,
	36	cwd: cwd?.toString(),
37	37	});
38	38	const parser = new Parse();
39	39	let running = true;
...	...	@@ -186,3 +186,4 @@ import events from "node:events";
186	186	import * as progress from "lib/progress.ts";
187	187	import { formatSize } from "@/file-viewer/format.ts";
188	188	import { UNWRAP } from "lib/assert.ts";
	189	import { Path } from "#sitegen/path";

src/tags/photo-grid.tsx+7-1

...	...	@@ -12,6 +12,7 @@ export interface PhotoGridProps {
12	12	type Item = [img: string, options?: ItemOptions];
13	13
14	14	interface ItemOptions {
	15	s?: number;
15	16	w?: number;
16	17	h?: number;
17	18	align?: keyof typeof alignments;
...	...	@@ -55,9 +56,14 @@ export function PhotoGrid({
55	56	let y = 0;
56	57	let contents = [];
57	58	for (const item of items) {
58		const [img, { w = 1, h = 1, align } = {}] = isArray(item) ? item : [item];
	59	const [
	60	img,
	61	{ w = 1, h = 1, align, s } = {},
	62	] = isArray(item) ? item : [item];
59	63	if (w > width) throw new Error(`Item ${img} too wide (${w} > ${width})`);
60	64
	65	x += s ?? 0;
	66
61	67	while (anyCollide(x, y, w, h)) {
62	68	x += 1;
63	69	if (x > width - w) x = 0, y += 1;