diff --git a/.gitignore b/.gitignore index 49a40c4..0e62f24 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ -# nix build artifact +# build artifacts result +target # Vim swap files *.swp # Generated website files diff --git a/Makefile b/Makefile index 08cd7ed..5070c2b 100644 --- a/Makefile +++ b/Makefile @@ -48,9 +48,9 @@ $(THUMB_DIR)/%.webp: $(DIST_DIR)/%.jpg $(BUILD_DIR)/index.json: $(build_metas) build-index.py ./build-index.py $(filter-out build-index.py,$^) > $@ -$(BUILD_DIR)/%.meta.json: $(DIST_DIR)/%.jpg $(THUMB_DIR)/%.webp extract-metadata.py +$(BUILD_DIR)/%.meta.json: $(DIST_DIR)/%.jpg $(THUMB_DIR)/%.webp @mkdir -p $(BUILD_DIR) - ./extract-metadata.py --root $(DIST_DIR) --dist-path $(patsubst $(BUILD_DIR)/%.meta.json,$(DIST_DIR)/%.html,$@) --key $(patsubst $(BUILD_DIR)/%.meta.json,%,$@) --thumbnail $(patsubst $(BUILD_DIR)/%.meta.json,$(THUMB_DIR)/%.webp,$@) $< > $@ + squeezer --root $(DIST_DIR) --dist-path $(patsubst $(BUILD_DIR)/%.meta.json,$(DIST_DIR)/%.html,$@) --key $(patsubst $(BUILD_DIR)/%.meta.json,%,$@) --thumbnail $(patsubst $(BUILD_DIR)/%.meta.json,$(THUMB_DIR)/%.webp,$@) $< > $@ $(DIST_DIR)/index.html: $(BUILD_DIR)/index.json index.hbs @mkdir -p $(DIST_DIR) diff --git a/extract-metadata.py b/extract-metadata.py deleted file mode 100755 index 87921bd..0000000 --- a/extract-metadata.py +++ /dev/null @@ -1,80 +0,0 @@ -#!/usr/bin/env python3 - -import clize -import exif -import json - - -from datetime import datetime -from enum import Enum -from pathlib import Path -from typing import Any - - -def exif_content_to_json(tag, content): - match content: - case Enum() as e: - return e.name - case int() as i: - return i - case float() as f: - return f - case str() as s: - if tag.startswith("datetime"): - dt = datetime.strptime(s, "%Y:%m:%d %H:%M:%S") - return dt.strftime("%Y-%m-%d %H:%M") - return s - case _: - return {"pyType": str(type(content)), "stringified": str(content)} - - -def extract_exif_data(image_path: Path) -> dict[str, Any]: - with image_path.open("rb") as image_file: - image = exif.Image(image_file) - - exif_data = {} - for tag in image.list_all(): - try: - content = image[tag] - except: - # Some keys are in list_all() but can't be accessed for my camera :( - # Skip them. - continue - exif_data[tag] = exif_content_to_json(tag, content) - - return exif_data - - -def extract_stat_data(image_path: Path): - FIELDS = ["st_size"] - - s = image_path.stat() - stat_data = {} - for field in FIELDS: - stat_data[field] = getattr(s, field) - - return stat_data - - - -def extract_metadata(image_path: Path, *, root: Path, dist_path: Path, key: str, thumbnail: Path): - exif_data = extract_exif_data(image_path) - stat_data = extract_stat_data(image_path) - - metadata = { - "exif": exif_data, - "stat": stat_data, - "path": { - "name": image_path.name, - "relativeToRoot": str(image_path.relative_to(root)), - "distRelativeToRoot": str(dist_path.relative_to(root)), - "thumbnailRelativeToRoot": str(thumbnail.relative_to(root)), - }, - "key": key, - } - - print(json.dumps(metadata, indent=2)) - - -if __name__ == "__main__": - clize.run(extract_metadata) diff --git a/flake.nix b/flake.nix index de2ce78..a7f7496 100644 --- a/flake.nix +++ b/flake.nix @@ -18,14 +18,19 @@ in rec { packages.handlebars-rust = naersk-lib.buildPackage handlebars-rust-src; + packages.squeezer = naersk-lib.buildPackage ./squeezer; devShell = pkgs.mkShell { nativeBuildInputs = [ packages.handlebars-rust + packages.squeezer pkgs.imagemagick pkgs.gnumake pkgs.jq pkgs.zip - (pkgs.python3.withPackages (ps: [ps.clize ps.exif])) + (pkgs.python3.withPackages (ps: [ps.clize])) + + pkgs.cargo + pkgs.rustc ]; }; } diff --git a/photo.hbs b/photo.hbs index 7ee3095..827e47f 100644 --- a/photo.hbs +++ b/photo.hbs @@ -15,9 +15,10 @@

prev · next · up

{{ exif.datetime }}

- exposure time {{ exif.exposure_time }}s
- aperture f{{ exif.aperture_value }}
- iso {{ exif.photographic_sensitivity }} + exposure time ???
+ aperture ???
+ iso ???
+ resolution {{ exif.PixelXDimension }}x{{ exif.PixelYDimension }}

diff --git a/squeezer/Cargo.lock b/squeezer/Cargo.lock new file mode 100644 index 0000000..1c7562c --- /dev/null +++ b/squeezer/Cargo.lock @@ -0,0 +1,312 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[package]] +name = "anstream" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" + +[[package]] +name = "anstyle-parse" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" +dependencies = [ + "anstyle", + "once_cell", + "windows-sys", +] + +[[package]] +name = "clap" +version = "4.5.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92b7b18d71fad5313a1e320fa9897994228ce274b60faa4d694fe0ea89cd9e6d" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a35db2071778a7344791a4fb4f95308b5673d219dee3ae348b86642574ecc90c" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.5.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4ced95c6f4a675af3da73304b9ac4ed991640c36374e4b46795c49e17cf1ed" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" + +[[package]] +name = "colorchoice" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + +[[package]] +name = "itoa" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" + +[[package]] +name = "kamadak-exif" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1130d80c7374efad55a117d715a3af9368f0fa7a2c54573afc15a188cd984837" +dependencies = [ + "mutate_once", +] + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "mutate_once" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" + +[[package]] +name = "once_cell" +version = "1.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e" + +[[package]] +name = "proc-macro2" +version = "1.0.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "ryu" +version = "1.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd" + +[[package]] +name = "serde" +version = "1.0.217" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.217" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.138" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "squeezer" +version = "0.1.0" +dependencies = [ + "clap", + "kamadak-exif", + "serde", + "serde_json", +] + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "syn" +version = "2.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "unicode-ident" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" diff --git a/squeezer/Cargo.toml b/squeezer/Cargo.toml new file mode 100644 index 0000000..b39f574 --- /dev/null +++ b/squeezer/Cargo.toml @@ -0,0 +1,14 @@ +[package] +name = "squeezer" +version = "0.1.0" +edition = "2021" + +[dependencies] +clap = { version = "4.5", features = ["derive"] } +kamadak-exif = "0.6" +serde = "1.0" +serde_json = "1.0" + +[profile.release] +strip = true +lto = true diff --git a/squeezer/src/main.rs b/squeezer/src/main.rs new file mode 100644 index 0000000..92ae063 --- /dev/null +++ b/squeezer/src/main.rs @@ -0,0 +1,62 @@ +use clap::Parser; +use serde_json::{Map, Value}; +use std::path::PathBuf; + +fn map_to_value(tag: exif::Tag, value: exif::Value) -> Value { + if let Some(n) = value.get_uint(0) { + return Value::Number(n.into()); + } + if let exif::Value::Rational(rs) = value { + return serde_json::json!({ + "num": Value::Number(rs[0].num.into()), + "denom": Value::Number(rs[0].denom.into()), + }); + } + Value::String(value.display_as(tag).to_string()) +} + +fn extract_exif_data(image_path: &PathBuf) -> Value { + let image_file = std::fs::File::open(image_path).unwrap(); + let mut reader = std::io::BufReader::new(image_file); + let exifreader = exif::Reader::new(); + let exif = exifreader.read_from_container(&mut reader).unwrap(); + + let mut exif_data = Map::new(); + for f in exif.fields() { + let t = format!("{}", f.tag); + exif_data.insert(t, map_to_value(f.tag, f.value.clone())); + } + Value::Object(exif_data) +} + +#[derive(Debug)] +#[derive(Parser)] +struct Cli { + image_path: PathBuf, + #[arg(long)] + root: PathBuf, + #[arg(long)] + dist_path: PathBuf, + #[arg(long)] + key: String, + #[arg(long)] + thumbnail: PathBuf, +} + +fn main() { + let cli = Cli::parse(); + + let exif_data = extract_exif_data(&cli.image_path); + + let metadata = serde_json::json!({ + "exif": exif_data, + "path": { + "name": cli.image_path.file_name().unwrap().to_str(), + "relativeToRoot": cli.image_path.strip_prefix(&cli.root).unwrap(), + "distRelativeToRoot": cli.dist_path.strip_prefix(&cli.root).unwrap(), + "thumbnailRelativeToRoot": cli.thumbnail.strip_prefix(&cli.root).unwrap(), + }, + "key": cli.key, + }); + println!("{}", metadata); +}