Have photo.download() write to the save path of the Photo's own file copy

Photo.download() now hands the content cache the file copy the Photo holds, the one savePath and isLocal are dated from, instead of the fileID the cache then looked up in the store. A Photo held across a refresh that brings a date edited in Ente is now downloaded to the path its savePath names. A test covers that case. Model: opus-5-5
Date download() and backup by the album copy photo.savePath uses
2026-10-01 21:01:33 +00:00 · 2026-10-01 20:56:39 +00:00 · 2026-10-01 20:56:39 +00:00 · 2026-10-01 20:56:39 +00:00 · 2026-10-01 20:56:39 +00:00
24 changed files with 220 additions and 1281 deletions
@@ -1,12 +1,9 @@
 # Mirrors .gitignore, with one deliberate exception: .gitignore itself stays
 # in the build context, because prettier 3 reads it as a default ignore file
 # and dropping it would change what the lint phase's prettier check sees.
-#
-# .git is deliberately NOT excluded: the build derives the version it stamps
-# from it (script/version). It is sent without its config, which holds the
-# clone's remote URL and any credential in it, and which the build stage, the
-# final image, would otherwise carry. git describe does not need it.
-.git/config
+
+# VCS
+.git

 # OS
 .DS_Store
@@ -61,12 +61,9 @@ RUN script/bootstrap

 COPY . .

-# Version stamped into the build: the VERSION build arg when one is given,
-# otherwise what script/version derives from the .git the build context
-# carries (script/bootstrap installed git), so any `docker build .` of a
-# clone stamps its commit. The label can only carry the build arg, and is
-# empty without one.
-ARG VERSION
+# The version is computed on the host and passed in, because
+# .dockerignore excludes .git.
+ARG VERSION=dev
 LABEL org.opencontainers.image.version="${VERSION}"

 RUN make build
@@ -26,10 +26,8 @@ check:
 build:
 	@script/build

-# Bundles the built dist/, so the binary reports the version script/build
-# stamped.
-build-bin: build
-	nix-shell -p bun --run "bun build dist/bin/quak.js --compile --outfile bin/quak"
+build-bin:
+	nix-shell -p bun --run "bun build bin/quak.ts --compile --outfile bin/quak"

 install: build-bin
 	mkdir -p ~/bin
@@ -80,37 +80,6 @@ await lib.close();
 The lower-level `Client` (login, session serialization, and the raw
 enumeration/download calls) is exported too and documented under Design below.

-## Examples
-
-`examples/download-albums.ts` downloads every album's photos and their metadata
-into a directory, `photos` in the working directory unless you name another. The
-build compiles it; run it after `yarn install`:
-
-```bash
-yarn build
-QUAK_EMAIL=… QUAK_PASSWORD=… node dist/examples/download-albums.js [dir]
-```
-
-It opens the library with `precacheThumbnails` and `precacheOriginals` off, as
-`quak backup` does, so the only file content it fetches is the originals it
-saves. It asks on the terminal for a two-factor or email code when the account
-requires one, and writes:
-
- each photo's original at its save path under `dir`, as `photo.download()`
-  writes it: `YYYY/YYYY-MM/YYYY-MM-DD/YYYY-MM-DD.<fileID>.<ext>`, and for a live
-  photo its image, its video and the `.livephoto.json` file naming them
- beside each original, a JSON file named after it with `.json` added, for
-  example `2026-03-01.12345.jpg.json`: the photo's record (`photo.record()`)
-  without its cache paths, and every EXIF tag of the photo (`photo.exif()`)
-  under `exif`
- `albums/<collectionID>.json` for each album: its `collectionID`, its `name`,
-  and under `savePaths` the save paths of its photos relative to `dir`, newest
-  first
-
-A photo in several albums is downloaded once. A second run downloads nothing and
-rewrites only the JSON files whose content changed. A failed download stops the
-run; running it again carries on, since every photo already saved is skipped.
-
 ## Entrypoints

 This repository adheres to the
@@ -126,12 +95,9 @@ alpine. We provide:
  `script/bootstrap`, then `script/install-precommit`
 - `script/projectname` — output the project name (our own extension); used by
  `script/docker` for the image tag
- `script/build` — compile the TypeScript sources into `dist/`, stamp the
-  version into `dist/package.json`, then verify that the entrypoints
-  `package.json` declares (`main`, `types`, `bin`) are among the files the
-  compiler wrote, and make the CLI executable (our own extension)
- `script/version` — print the version `script/build` stamps (our own
-  extension); see Version below
+- `script/build` — compile the TypeScript sources into `dist/`, then verify that
+  the entrypoints `package.json` declares (`main`, `types`, `bin`) are among the
+  files the compiler wrote, and make the CLI executable (our own extension)
 - `script/test` — run the test suite, by building the `test` phase of the
  `Dockerfile` (vitest, 90s timeout, verbose rerun on failure); requires docker
 - `script/lint` — run eslint and a prettier check, by building the `lint` phase
@@ -179,34 +145,6 @@ an exact version, installed from `yarn.lock` under `--frozen-lockfile` in both
 places, and reads `.gitignore` as its default ignore file — which is why
 `.dockerignore` keeps `.gitignore` in the build context.

-### Version
-
-`quak --version` reports the `version` of `dist/package.json`, which
-`script/build` writes after compiling; the repo's own `package.json` keeps
-`0.0.0`, and that is what the tests, which run from source, report.
-`script/version` decides what is written:
-
- the `VERSION` environment variable, or the `Dockerfile`'s `VERSION` build arg
-  (`--build-arg VERSION=...`), when one is given and not empty;
- otherwise, in a checkout with `.git`, `git describe --tags --always`: the tag
-  on a tagged commit; the tag, the commits since it and the short commit on a
-  later commit (`v1.2.3-4-gabc1234`); the short commit when no tag is reachable;
- otherwise, as in a source tarball, the version `package.json` declares.
-
-The build fails if the checkout has `.git` and the version still comes out
-empty, `dev` or `unknown`: such a build could not be traced back to its commit.
-
-`.dockerignore` therefore does not leave out `.git`, so any `docker build .` of
-a clone stamps the commit it was built from; a shallow clone stamps a tag only
-when the cloned commit itself carries one, and otherwise the short commit. It
-leaves out `.git/config`, which holds the clone's remote URL and any credential
-in it, so the image carries `.git` without its config; `git describe` does not
-need that file. `script/docker` (and so `make docker`) and `script/cibuild` pass
-the version they resolve on the host, with `--dirty`, as the build arg, which
-takes precedence. The image's `org.opencontainers.image.version` label carries
-that build arg only, so a build given none leaves it empty. `make build-bin`
-bundles the built `dist/`, so the single binary reports the stamped version too.
-
 ## Rationale

 Ente is one of very few photo services with a credible end-to-end encryption
@@ -301,9 +239,6 @@ quak/
        index.ts        public library exports
    bin/
        quak.ts         CLI entrypoint (commander.js)
-    examples/
-        download-albums.ts
-                        download every album's photos and metadata
    test/               unit + integration tests (vitest)
    Makefile
    Dockerfile          lint phase, test phase, compile
@@ -312,11 +247,10 @@ quak/
 ```

 `make build` compiles that tree into `dist/`, preserving its shape: the library
-lands in `dist/src/`, the examples in `dist/examples/`, and the CLI in
-`dist/bin/quak.js`, which is what `package.json` points `main`, `types` and
-`bin` at. The compiler's `rootDir` is the repository root rather than `src/`,
-because `bin/` is compiled too and `rootDir` has to contain everything that is
-compiled.
+lands in `dist/src/` and the CLI in `dist/bin/quak.js`, which is what
+`package.json` points `main`, `types` and `bin` at. The compiler's `rootDir` is
+the repository root rather than `src/`, because `bin/` is compiled too and
+`rootDir` has to contain everything that is compiled.

 ### Cryptography

@@ -792,7 +726,7 @@ synchronous getters look at the disk and never touch the network:
 - `photo.isLocal` → `boolean` — whether the whole original is at `savePath`. A
  copy only in the cache does not count.

-These async methods may download:
+Five async methods may download:

 - `await photo.original(opts?)` → `{ path, bytes, videoPath? }` — the
  full-resolution file. For a live photo, `path` and `bytes` are its image's and
@@ -805,25 +739,15 @@ These async methods may download:
 - `await photo.thumbnail(opts?)` → `{ path, bytes }`.
 - `await photo.content(opts?)` → `Uint8Array` — the original's bytes, read
  through `original()`; for a live photo, its image's.
- `await photo.exif(opts?)` → `ExifTags` — every EXIF tag in the file, keyed by
-  tag name, each as exifreader decodes it, with its `id`, `value`, `description`
-  and `computed` value: for example `Make` is
-  `{ id: 271, value: ["Canon"], description: "Canon", computed: "Canon" }`. A
-  tag exifreader has no name for is keyed `undefined-<tag number>`. The embedded
-  thumbnail's tags are under `Thumbnail`, so they cannot hide the main image's
-  tags of the same name; the thumbnail image itself is left out. EXIF is read
-  from any image format exifreader reads (such as JPEG, HEIC/HEIF, AVIF, PNG,
-  WebP and TIFF), a live photo's image included. Any other original gives `{}`,
-  and a video gives `{}` without being downloaded.
- `await photo.make(opts?)`, and likewise `model()`, `lensModel()`,
-  `dateTimeOriginal()`, `offsetTimeOriginal()`, `exposureTime()`, `fNumber()`,
-  `iso()`, `focalLength()`, `orientation()`, `gpsLatitude()`, `gpsLongitude()`
-  and `gpsAltitude()` → one common field each, picked from the tags `exif()`
-  returns and typed as in `PhotoExif`, or `undefined` when the file lacks it.
-  GPS values are signed decimal degrees and metres. `dateTimeOriginal()` is the
-  camera's clock reading held in the `Date`'s UTC fields;
-  `offsetTimeOriginal()`, when present, is that clock's offset from UTC. Each
-  calls `exif()` with its `opts`, so each call reads the original again.
+- `await photo.exif(opts?)` → `PhotoExif` — `make`, `model`, `lensModel`,
+  `dateTimeOriginal`, `offsetTimeOriginal`, `exposureTime`, `fNumber`, `iso`,
+  `focalLength`, `orientation`, `gpsLatitude`, `gpsLongitude` and `gpsAltitude`,
+  each absent when the file lacks it. GPS values are signed decimal degrees and
+  metres. `dateTimeOriginal` is the camera's clock reading held in the `Date`'s
+  UTC fields; `offsetTimeOriginal`, when present, is that clock's offset from
+  UTC. EXIF is read from any image format exifreader reads (such as JPEG,
+  HEIC/HEIF, AVIF, PNG, WebP and TIFF), a live photo's image included. Any other
+  original gives `{}`, and a video gives `{}` without being downloaded.

 They serve from the on-disk content cache when the bytes are present and
 otherwise fetch through the pools; `original()`, `content()` and `exif()` also
@@ -915,7 +839,10 @@ current account's records name.

 A live photo's original is cached as at its save path: its image and its video,
 each `originals/<fileID>.<ext>` with its own extension, and
-`originals/<fileID>.livephoto.json` naming them; the two are evicted together.
+`originals/<fileID>.livephoto.json` naming them; the two are evicted together. A
+live photo that an earlier version cached as its ZIP is not served: the library
+removes the ZIP when it opens the cache, and fetches the two files when the
+photo is next read or precached.

 A stored file appears only via an atomic temp-then-rename, so its presence means
 it is complete. Every downloaded original (by `quak get`, the cache, or
@@ -940,7 +867,7 @@ from a very old client, is stored unchecked.
 - `src/library/records.ts`: `PhotoRecord`, `AlbumRecord`, `LibrarySnapshot`,
  `LibraryChange`
 - `src/library/mlsearch.ts`: `MLDataAPI`, `SimilarResult`
- `src/exif.ts`: `ExifTags`, `PhotoExif`
+- `src/exif.ts`: `PhotoExif`
 - `src/library/pools.ts`: `RequestPools`, `RequestPoolsOptions`, `BoundedPool`
 - `src/backup.ts`: `BackupOptions`, `BackupResult`, `BackupError`
 - `src/client.ts`: `Client`, `LoginOptions`, `ClientSnapshot`
@@ -25,42 +25,6 @@ declares one.

 # Completed Steps

- 2026-10-02: `docker build .` stamps the commit's tag or short commit, not
-  `dev` (issue 154). `script/build` writes the version `script/version` prints
-  into `dist/package.json`: the `VERSION` environment variable or build arg when
-  one is given, otherwise `git describe --tags --always`, otherwise the version
-  `package.json` declares. `.dockerignore` sends `.git`, and a checkout with
-  `.git` whose version comes out empty, `dev` or `unknown` fails the build.
-  `make build-bin` bundles the built `dist/`, so the single binary reports the
-  same version.
-
- 2026-10-02: `photo.exif()` returns every EXIF tag in the file as `ExifTags`,
-  keyed by tag name, each as exifreader decodes it, not only the thirteen common
-  fields (issue 156). The embedded thumbnail's tags are under `Thumbnail`,
-  without the thumbnail image. The thirteen typed methods stay, each picking its
-  field from the tags `exif()` returns, typed as in `PhotoExif`. The example
-  script's JSON files now carry every tag.
-
- 2026-10-01: The content cache no longer looks for a live photo that an earlier
-  version cached as one ZIP (issue 151). When the cache opens, a live photo's
-  file that no JSON file names is now always left alone.
-
- 2026-10-01: `examples/download-albums.ts` logs in, opens the library, and for
-  every album downloads each photo to its save path, writes the photo's record
-  and EXIF fields to a JSON file beside it, and writes the album's photos to
-  `albums/<collectionID>.json` (issue 144). The build compiles it to
-  `dist/examples/`; the README's "Examples" section says how to run it.
-
- 2026-10-01: A `Photo` has one async method for each field of `exif()`, named
-  and typed as in `PhotoExif`: `make()`, `model()`, `lensModel()`,
-  `dateTimeOriginal()`, `offsetTimeOriginal()`, `exposureTime()`, `fNumber()`,
-  `iso()`, `focalLength()`, `orientation()`, `gpsLatitude()`, `gpsLongitude()`
-  and `gpsAltitude()` (issue 148). Each calls `exif()` and returns its one
-  field, or undefined when the file lacks it. `Photo` implements a type with one
-  method per `PhotoExif` field, so the build's type check fails when a field has
-  no method. A test checks, on the JPEG and the HEIC, that each method gives the
-  same value as `exif()`.
-
 - 2026-10-01: Each original's save path is
  `YYYY/YYYY-MM/YYYY-MM-DD/YYYY-MM-DD.<fileID>.<ext>` under the library's
  download directory, which defaults to `photos` in the working directory (issue
@@ -1,129 +0,0 @@
-// Download every album's photos to a directory, with each photo's metadata
-// beside it, using only quak's public API. The README's "Examples" section
-// describes the files it writes.
-//
-//     yarn build
-//     QUAK_EMAIL=… QUAK_PASSWORD=… node dist/examples/download-albums.js [dir]
-
-import { realpathSync } from "node:fs";
-import { mkdir, readFile, writeFile } from "node:fs/promises";
-import { join, relative } from "node:path";
-import { stdin, stdout } from "node:process";
-import { createInterface } from "node:readline/promises";
-import { pathToFileURL } from "node:url";
-
-import { Client, Library } from "../src/index.js";
-
-// Write `text` to `path` unless the file already holds exactly that, so a
-// second run rewrites nothing.
-async function writeIfChanged(path: string, text: string): Promise<void> {
-    const current = await readFile(path, "utf-8").catch(() => undefined);
-    if (current !== text) await writeFile(path, text);
-}
-
-const pretty = (value: unknown): string =>
-    JSON.stringify(value, null, 2) + "\n";
-
-// For every album in `lib`, download each photo to its save path, write the
-// photo's metadata to `{savePath}.json`, and write the album's photos to
-// `{dir}/albums/{collectionID}.json`. Returns how many photos it downloaded
-// and how many were already at their save paths.
-export async function downloadAlbums(
-    lib: Library,
-    dir: string,
-): Promise<{ downloaded: number; alreadyLocal: number }> {
-    let downloaded = 0;
-    let alreadyLocal = 0;
-    // A photo in several albums is handled once.
-    const done = new Set<number>();
-    // fresh() waits for a refresh from the server and throws if it fails, so
-    // albums and photos added since the cache was last written are included.
-    const { albums } = await lib.fresh();
-    for (const album of albums.list()) {
-        const savePaths: string[] = [];
-        for (const photo of album.photos.list()) {
-            if (!done.has(photo.fileID)) {
-                done.add(photo.fileID);
-                if (photo.isLocal) alreadyLocal++;
-                else downloaded++;
-                await photo.download();
-                // The cache paths say where quak's cache keeps copies, not
-                // anything about the photo.
-                const record = { ...photo.record() };
-                delete record.thumbnailPath;
-                delete record.originalPath;
-                const exif = await photo.exif();
-                // savePath is read after download(): a live photo's names its
-                // image only once the image is stored.
-                await writeIfChanged(
-                    `${photo.savePath}.json`,
-                    pretty({ ...record, exif }),
-                );
-            }
-            savePaths.push(relative(dir, photo.savePath));
-        }
-        await mkdir(join(dir, "albums"), { recursive: true });
-        await writeIfChanged(
-            join(dir, "albums", `${album.collectionID}.json`),
-            pretty({
-                collectionID: album.collectionID,
-                name: album.name,
-                savePaths,
-            }),
-        );
-    }
-    return { downloaded, alreadyLocal };
-}
-
-// Ask for a login code on the terminal. Client.login calls this only when the
-// account requires a code.
-async function ask(question: string): Promise<string> {
-    const terminal = createInterface({ input: stdin, output: stdout });
-    try {
-        return await terminal.question(question);
-    } finally {
-        terminal.close();
-    }
-}
-
-async function main(): Promise<void> {
-    const email = process.env.QUAK_EMAIL;
-    const password = process.env.QUAK_PASSWORD;
-    if (!email || !password) {
-        console.error(
-            "Set QUAK_EMAIL and QUAK_PASSWORD to the account's email and password.",
-        );
-        process.exit(1);
-    }
-    const dir = process.argv[2] ?? "photos";
-
-    const client = await Client.login({
-        email,
-        password,
-        totp: () => ask("Two-factor code: "),
-        emailOTP: () => ask("Code sent to your email: "),
-    });
-    const lib = await Library.open({
-        client,
-        downloadDirectory: dir,
-        // As in `quak backup`: fetch only the originals this script saves,
-        // not every thumbnail and the recent originals into the cache too.
-        precacheThumbnails: false,
-        precacheOriginals: false,
-    });
-    try {
-        const { downloaded, alreadyLocal } = await downloadAlbums(lib, dir);
-        console.log(
-            `${downloaded} photos downloaded, ${alreadyLocal} already local, in ${dir}`,
-        );
-    } finally {
-        await lib.close();
-    }
-}
-
-// Run main() when node runs this file, not when a test imports it. argv[1] is
-// the path as given, and import.meta.url has symlinks resolved.
-const script = process.argv[1];
-if (script && pathToFileURL(realpathSync(script)).href === import.meta.url) {
-    await main();
-}
@@ -1,7 +1,7 @@
 #!/bin/sh
-# script/build: compile the TypeScript sources into dist/, stamp the version
-# script/version prints into it, then verify that the artifacts package.json
-# advertises are among the files the compiler actually wrote. tsc reports success by exit status alone and knows nothing
+# script/build: compile the TypeScript sources into dist/, then verify that
+# the artifacts package.json advertises are among the files the compiler
+# actually wrote. tsc reports success by exit status alone and knows nothing
 # about the manifest, so without this step a green build can still ship a
 # package whose main, types or bin resolve to nothing. Our own extension to
 # scripts-to-rule-them-all.
@@ -46,24 +46,13 @@ for (const bin of bins) {
 }

 # src/index.ts imports ../package.json for the version, which tsc copies to
-# dist/package.json. The version script/version prints is written into that
-# copy only; the repo's own package.json is left as it is.
-stamp_version() {
-    node -e '
-const { readFileSync, writeFileSync } = require("node:fs");
-
-const pkg = JSON.parse(readFileSync("dist/package.json", "utf-8"));
-pkg.version = process.argv[1];
-writeFileSync("dist/package.json", JSON.stringify(pkg, null, 4) + "\n");
-' "$1"
-}
-
-# Running the built CLI proves the import resolves from dist/ and reports
-# the stamped version.
+# dist/package.json. Running the built CLI proves that import resolves from
+# dist/ and reports the version package.json declares.
 verify_version() {
    built="$(node dist/bin/quak.js --version)"
-    if [ "$built" != "$1" ]; then
-        echo "build: dist/bin/quak.js reports $built, the build stamped $1" >&2
+    declared="$(node -p 'require("./package.json").version')"
+    if [ "$built" != "$declared" ]; then
+        echo "build: dist/bin/quak.js reports $built, package.json declares $declared" >&2
        exit 1
    fi
    echo "build: dist/bin/quak.js reports version $built"
@@ -71,12 +60,9 @@ verify_version() {

 main() {
    cd "$ROOT"
-    # Own line, so that a failing script/version stops the build.
-    version="$("$ROOT/script/version")"
    yarn run tsc
-    stamp_version "$version"
    verify_entrypoints
-    verify_version "$version"
+    verify_version
 }

 main "$@"
@@ -15,9 +15,9 @@ main() {
    cd "$ROOT"
    # Own line: a failing command substitution inside an argument does
    # not trip `set -e`, so the inline form degrades silently to an
-    # empty constant. The version resolved here goes in as the VERSION
-    # build arg, which takes precedence over what the build would derive
-    # from the .git in its context.
+    # empty constant. VERSION is computed here because .dockerignore
+    # excludes .git, so `git describe` in a build stage yields an empty
+    # version without failing.
    version="$(git describe --tags --always --dirty 2>/dev/null || true)"
    [ -n "$version" ] || version="unknown"
    docker build --no-cache \
@@ -12,9 +12,9 @@ main() {
    cd "$ROOT"
    # Own line: a failing command substitution inside an argument does
    # not trip `set -e`, so the inline form degrades silently to an
-    # empty constant. The version resolved here goes in as the VERSION
-    # build arg, which takes precedence over what the build would derive
-    # from the .git in its context.
+    # empty constant. VERSION is computed here because .dockerignore
+    # excludes .git, so `git describe` in a build stage yields an empty
+    # version without failing.
    version="$(git describe --tags --always --dirty 2>/dev/null || true)"
    [ -n "$version" ] || version="unknown"
    docker build --no-cache \
@@ -1,41 +0,0 @@
-#!/bin/sh
-# script/version: print the version script/build stamps into the built
-# package. Our own extension to scripts-to-rule-them-all.
-#
-# Order of precedence:
-#
-#   1. $VERSION, if set and not empty: an explicit value, such as the
-#      Dockerfile's VERSION build arg.
-#   2. If this checkout has .git, `git describe --tags --always`: the tag
-#      on a tagged commit; the tag, the commits since it and the short
-#      commit on a later commit (v1.2.3-4-gabc1234); the short commit when
-#      no tag is reachable.
-#   3. Otherwise, as in a source tarball, the version package.json declares.
-#
-# A checkout with .git whose version still comes out empty, dev or unknown
-# fails: git is missing or could not read the checkout, and the build could
-# not be traced back to its commit.
-set -eu
-
-ROOT="$(cd "$(dirname "$0")/.." && pwd -P)"
-
-main() {
-    cd "$ROOT"
-    version="${VERSION:-}"
-    if [ -e .git ]; then
-        if [ -z "$version" ]; then
-            version="$(git describe --tags --always || true)"
-        fi
-        case "$version" in
-            "" | dev | unknown)
-                echo "version: $ROOT has .git, but the version came out '$version'" >&2
-                exit 1
-                ;;
-        esac
-    elif [ -z "$version" ]; then
-        version="$(node -p 'require("./package.json").version')"
-    fi
-    echo "$version"
-}
-
-main "$@"
@@ -361,8 +361,8 @@ const openPart = async (
 // written unpacked: each part is named `destination` with the extension
 // replaced by its own entry's, and the two must differ ignoring case. When the
 // file records a hash, `<imageHash>:<videoHash>` must match it, each over that
-// part's own bytes. Only then are the image, then the video, renamed into
-// place; on any failure neither is stored.
+// part's own bytes. Only then is whatever was at `destination` removed and the
+// image, then the video, renamed into place; on any failure neither is stored.
 //
 // The ZIP is chosen by its uploader and may expand enormously, so each part is
 // written as it decompresses and never held, and the ZIP is refused once the
@@ -486,6 +486,7 @@ const decryptLivePhoto = async (
            await part.handle.sync();
            await part.handle.close();
        }
+        await rm(destination, { force: true });
        await rename(image.tmpPath, path);
        try {
            await rename(video.tmpPath, videoPath);
@@ -569,7 +570,8 @@ const fetchAndDecrypt = async (
    }, api.getRetryOptions());

 // Write `file`'s original to `outPath`. A live photo is written as its image
-// and its video beside `outPath` instead (see `decryptLivePhoto`).
+// and its video beside `outPath` instead, and whatever was at `outPath` is
+// removed (see `decryptLivePhoto`).
 export const downloadFile = async (
    api: ApiClient,
    file: EnteFile,
@@ -1,19 +1,19 @@
 // EXIF in an original's bytes, read with exifreader, which reads it from JPEG,
 // HEIC/HEIF, AVIF, PNG, WebP and the other image formats it supports.
 // `backup-metadata --exif` records every EXIF tag it finds except the
-// thumbnail's. `Photo.exif()` returns every tag, the thumbnail's included, and
-// `Photo`'s typed methods return the common fields picked from them here.
+// thumbnail's; `Photo.exif()` returns the common fields picked from them here.

 import ExifReader, { type ExpandedTags } from "exifreader";

-// The EXIF tags in `bytes` (`exif`), the embedded thumbnail's tags
-// (`Thumbnail`), and where the EXIF block lies in `bytes` (`metadataRange`).
+// The EXIF tags in `bytes` (`exif`), the GPS position exifreader computes from
+// them (`gps`), and where the EXIF block lies in `bytes` (`metadataRange`).
 // Undefined when exifreader cannot read the file at all, such as a video. An
-// EXIF block it finds but reads no tag from comes back as an empty `exif`. A
-// tag exifreader has no name for is keyed `undefined-<tag number>`. Each tag's
-// `computed` holds its value as a string or number, or as an array of them for
-// a tag with several values, such as `GPSLatitude`'s `[40, 26, 46]`. A
-// fraction with a zero denominator computes to null.
+// EXIF block it finds but reads no tag from comes back as an empty `exif`.
+// `exif` holds every tag except the thumbnail's; a tag exifreader has no name
+// for is keyed `undefined-<tag number>`. Each tag's `computed` holds its value
+// as a string or number, or as an array of them for a tag with several values,
+// such as `GPSLatitude`'s `[40, 26, 46]`. A fraction with a zero denominator
+// computes to null.
 export const readExifTags = (bytes: Uint8Array): ExpandedTags | undefined => {
    try {
        return ExifReader.loadView(
@@ -23,7 +23,7 @@ export const readExifTags = (bytes: Uint8Array): ExpandedTags | undefined => {
                computed: true,
                includeOffsets: true,
                includeUnknown: true,
-                includeTags: { exif: true, thumbnail: true },
+                includeTags: { exif: true, gps: true },
            },
        );
    } catch {
@@ -31,35 +31,7 @@ export const readExifTags = (bytes: Uint8Array): ExpandedTags | undefined => {
    }
 };

-// Every EXIF tag of an original, keyed by name, each as exifreader decodes it
-// (see `readExifTags`). The embedded thumbnail's own tags are under
-// `Thumbnail`, so its `Orientation` or `ImageWidth` cannot hide the main
-// image's.
-export type ExifTags = Omit<NonNullable<ExpandedTags["exif"]>, "Thumbnail"> & {
-    Thumbnail?: Omit<
-        NonNullable<ExpandedTags["Thumbnail"]>,
-        "type" | "image" | "base64"
-    >;
-};
-
-// Every EXIF tag in `bytes`: `{}` when the file has no EXIF, exifreader cannot
-// read its EXIF, or it is not an image exifreader reads.
-export const readAllExifTags = (bytes: Uint8Array): ExifTags => {
-    const tags = readExifTags(bytes);
-    if (!tags?.Thumbnail) return tags?.exif ?? {};
-    // exifreader puts the thumbnail's JPEG image beside its tags, as `type`,
-    // `image` and `base64`. The image is not a tag, so it is left out.
-    const {
-        type: _type,
-        image: _image,
-        base64: _base64,
-        ...thumbnail
-    } = tags.Thumbnail;
-    return { ...tags.exif, Thumbnail: thumbnail };
-};
-
-// The common EXIF fields of an original, one for each of `Photo`'s typed
-// methods. Each is absent when the file lacks it.
+// The common EXIF fields of an original. Each is absent when the file lacks it.
 export interface PhotoExif {
    make?: string;
    model?: string;
@@ -108,51 +80,30 @@ const asDate = (v: unknown): Date | undefined => {
    return Number.isNaN(date.getTime()) ? undefined : date;
 };

-// GPSLatitude and GPSLongitude hold degrees, minutes and seconds, computed as
-// three numbers. This is them in decimal degrees, negative when `ref`, the
-// GPSLatitudeRef or GPSLongitudeRef tag, is `negativeRef` ("S" or "W").
-// Without that tag the hemisphere is unknown, so it is undefined.
-const asDegrees = (
-    dms: unknown,
-    ref: unknown,
-    negativeRef: string,
-): number | undefined => {
-    if (!Array.isArray(dms) || ref === undefined) return undefined;
-    const [d, m, s] = dms.map(asNumber);
-    if (d === undefined || m === undefined || s === undefined) return undefined;
-    const degrees = d + m / 60 + s / 3600;
-    return ref === negativeRef ? -degrees : degrees;
-};
-
-// The common fields picked from an original's EXIF tags, `readAllExifTags`'s
-// result: `{}` when there are none.
-export const readPhotoExif = (tags: ExifTags): PhotoExif => {
-    const altitude = asNumber(tags.GPSAltitude?.computed);
+// The common fields of an original's EXIF: `{}` when the file has no EXIF,
+// exifreader cannot read its EXIF, or it is not an image exifreader reads.
+export const readPhotoExif = (bytes: Uint8Array): PhotoExif => {
+    const tags = readExifTags(bytes);
+    const exif = tags?.exif;
+    const gps = tags?.gps;
+    const altitude = asNumber(exif?.GPSAltitude?.computed);
    const fields: PhotoExif = {
-        make: asString(tags.Make?.computed),
-        model: asString(tags.Model?.computed),
-        lensModel: asString(tags.LensModel?.computed),
-        dateTimeOriginal: asDate(tags.DateTimeOriginal?.computed),
-        offsetTimeOriginal: asString(tags.OffsetTimeOriginal?.computed),
-        exposureTime: asNumber(tags.ExposureTime?.computed),
-        fNumber: asNumber(tags.FNumber?.computed),
+        make: asString(exif?.Make?.computed),
+        model: asString(exif?.Model?.computed),
+        lensModel: asString(exif?.LensModel?.computed),
+        dateTimeOriginal: asDate(exif?.DateTimeOriginal?.computed),
+        offsetTimeOriginal: asString(exif?.OffsetTimeOriginal?.computed),
+        exposureTime: asNumber(exif?.ExposureTime?.computed),
+        fNumber: asNumber(exif?.FNumber?.computed),
        // Only when the tag holds a single number, as most cameras write it.
-        iso: asNumber(tags.ISOSpeedRatings?.computed),
-        focalLength: asNumber(tags.FocalLength?.computed),
-        orientation: asNumber(tags.Orientation?.computed),
-        gpsLatitude: asDegrees(
-            tags.GPSLatitude?.computed,
-            tags.GPSLatitudeRef?.computed,
-            "S",
-        ),
-        gpsLongitude: asDegrees(
-            tags.GPSLongitude?.computed,
-            tags.GPSLongitudeRef?.computed,
-            "W",
-        ),
+        iso: asNumber(exif?.ISOSpeedRatings?.computed),
+        focalLength: asNumber(exif?.FocalLength?.computed),
+        orientation: asNumber(exif?.Orientation?.computed),
+        gpsLatitude: asNumber(gps?.Latitude),
+        gpsLongitude: asNumber(gps?.Longitude),
        // A GPSAltitudeRef of 1 means the altitude is below sea level.
        gpsAltitude:
-            altitude !== undefined && tags.GPSAltitudeRef?.value === 1
+            altitude !== undefined && exif?.GPSAltitudeRef?.value === 1
                ? -altitude
                : altitude,
    };
@@ -1,7 +1,5 @@
-// A build reports the version script/build stamps into dist/package.json;
-// package.json's own version is reported only when running from source. tsc
-// copies package.json to dist/package.json, so this path resolves from source
-// and from dist/src/.
+// package.json is the one place the version is written. tsc copies it to
+// dist/package.json, so this path resolves from source and from dist/src/.
 import pkg from "../package.json" with { type: "json" };

 export const VERSION: string = pkg.version;
@@ -87,7 +85,7 @@ export type {
    LibrarySnapshot,
    LibraryChange,
 } from "./library/records.js";
-export type { ExifTags, PhotoExif } from "./exif.js";
+export type { PhotoExif } from "./exif.js";
 export { decryptCollection, decryptFile } from "./model/index.js";
 export { downloadFile, downloadThumbnail } from "./download/index.js";
 export type {
@@ -29,7 +29,14 @@
 // the cache does not count as saved there, but is copied there rather than
 // fetched again.

-import { existsSync, readFileSync, statSync } from "node:fs";
+import {
+    closeSync,
+    existsSync,
+    openSync,
+    readFileSync,
+    readSync,
+    statSync,
+} from "node:fs";
 import {
    chmod,
    copyFile,
@@ -274,6 +281,25 @@ const fileSize = (path: string): number | undefined => {
 const hasContent = (path: string | undefined): boolean =>
    path !== undefined && (fileSize(path) ?? 0) > 0;

+// Whether the file at `path` begins as a ZIP does, with `PK\x03\x04`. False
+// when it cannot be read.
+const isZip = (path: string): boolean => {
+    try {
+        const fd = openSync(path, "r");
+        try {
+            const head = Buffer.alloc(4);
+            return (
+                readSync(fd, head, 0, 4, 0) === 4 &&
+                head.toString("latin1") === "PK\x03\x04"
+            );
+        } finally {
+            closeSync(fd);
+        }
+    } catch {
+        return false;
+    }
+};
+
 // A live photo's image and video are named with the extensions from inside its
 // ZIP, so their names alone do not say which is which. Wherever the cache or a
 // save path stores one, a JSON file of this name beside them names both.
@@ -687,10 +713,8 @@ export class ContentCache implements PhotoContent, ThumbnailsAPI {
                    await this.touch(cached.path);
                return { ...cached, bytes: size, cached: true };
            }
-            // A recorded file that has since gone re-fetches below. So does a
-            // live photo recorded with no video: the cache opened before the
-            // library's records said it is a live photo, while its image and
-            // video had no JSON file beside them yet.
+            // A recorded file that has since gone, or a live photo an earlier
+            // version stored as one ZIP, re-fetches below.
            known.delete(fileID);
        }

@@ -959,14 +983,20 @@ export class ContentCache implements PhotoContent, ThumbnailsAPI {
            if (id === undefined || !existsSync(path)) continue;
            // A live photo's image and video are one entry, as the JSON file
            // beside them names them. A live photo's file with no such JSON
-            // file is not its original and is left alone: another process may
-            // have just stored it and not yet written the JSON file.
+            // file is not its original. If it is a ZIP, it is the one an
+            // earlier version stored under the image's name, and is removed.
+            // Any other is left alone: another process may have just stored
+            // it and not yet written the JSON file.
            const livePhoto = names.has(livePhotoJSONName(String(id)))
                ? readLivePhotoJSON(dir, String(id))
                : undefined;
            if (livePhoto !== undefined) {
                into.set(id, livePhoto);
-            } else if (!isLivePhoto(id)) {
+            } else if (isLivePhoto(id)) {
+                if (isZip(path)) {
+                    await rm(path, { force: true }).catch(() => undefined);
+                }
+            } else {
                into.set(id, { path });
            }
        }
@@ -12,20 +12,15 @@
 // plain records are the serializable surface, and `record()` returns one.
 //
 // A `Photo` also fetches its own bytes: `original()`, `thumbnail()`,
-// `download()`, `content()`, `exif()` and the methods that each return one
-// EXIF field go through the on-disk content cache (issue #46), and are
-// the one place in this module that may touch the network. A library opened
-// without a content source leaves that cache absent, and those methods then
-// throw. `savePath` and `isLocal` look only at the disk and need no cache.
+// `download()`, `content()` and `exif()` go through the on-disk content cache
+// (issue #46), and are the one place in this module that may touch the
+// network. A library opened without a content source leaves that cache absent,
+// and those methods then throw. `savePath` and `isLocal` look only at the disk
+// and need no cache.

 import { readFile } from "node:fs/promises";

-import {
-    readAllExifTags,
-    readPhotoExif,
-    type ExifTags,
-    type PhotoExif,
-} from "../exif.js";
+import { readPhotoExif, type PhotoExif } from "../exif.js";
 import type { CollectionType, EnteFile, FileType } from "../model/types.js";
 import type { ContentOptions, ContentResult, PhotoContent } from "./content.js";
 import type { AlbumRecord, PhotoRecord, DerivedRecords } from "./records.js";
@@ -47,18 +42,11 @@ const byNewest = (a: PhotoRecord, b: PhotoRecord): number =>
 const byNewestAlbum = (a: AlbumRecord, b: AlbumRecord): number =>
    b.updationTime - a.updationTime || b.collectionID - a.collectionID;

-// A method for each `PhotoExif` field, named after it, taking the options
-// `exif()` takes and giving that field. `Photo` implements it, so the build's
-// type check fails when `PhotoExif` has a field `Photo` has no method for.
-type PhotoExifMethods = {
-    [K in keyof PhotoExif]-?: (opts?: ContentOptions) => Promise<PhotoExif[K]>;
-};
-
 // A single photo. Field access mirrors `PhotoRecord`; `record()` returns the
 // underlying plain record for callers that need the IPC-safe value. `file` is
 // the membership the record is read from, so the save path carries the date of
 // `takenAt` and stays known after a refresh removes the file from the library.
-export class Photo implements PhotoExifMethods {
+export class Photo {
    constructor(
        private readonly rec: PhotoRecord,
        private readonly file: EnteFile,
@@ -161,75 +149,15 @@ export class Photo implements PhotoExifMethods {
        return readFile(path);
    }

-    // Every EXIF tag of the original, keyed by name (see `ExifTags`), read
-    // from `content()`, so this may download it. EXIF is read from any image
-    // format exifreader reads, JPEG and HEIC/HEIF among them; any other file
-    // gives `{}`, and a video gives it without fetching anything. Like the
-    // other content methods, it throws when there is no content cache, video
-    // or not.
-    async exif(opts?: ContentOptions): Promise<ExifTags> {
+    // The common EXIF fields of the original, read from `content()`, so this
+    // may download it. EXIF is read from any image format exifreader reads,
+    // JPEG and HEIC/HEIF among them; any other file gives `{}`, and a video
+    // gives it without fetching anything. Like the other content methods, it
+    // throws when there is no content cache, video or not.
+    async exif(opts?: ContentOptions): Promise<PhotoExif> {
        this.cacheOrThrow();
        if (this.rec.fileType === "video") return {};
-        return readAllExifTags(await this.content(opts));
-    }
-
-    // One field each, named and typed as in `PhotoExif`, picked from the tags
-    // `exif()` returns, and undefined when the file lacks it. Each call runs
-    // `exif()`, which reads the original again.
-    async make(opts?: ContentOptions): Promise<PhotoExif["make"]> {
-        return readPhotoExif(await this.exif(opts)).make;
-    }
-    async model(opts?: ContentOptions): Promise<PhotoExif["model"]> {
-        return readPhotoExif(await this.exif(opts)).model;
-    }
-    async lensModel(opts?: ContentOptions): Promise<PhotoExif["lensModel"]> {
-        return readPhotoExif(await this.exif(opts)).lensModel;
-    }
-    async dateTimeOriginal(
-        opts?: ContentOptions,
-    ): Promise<PhotoExif["dateTimeOriginal"]> {
-        return readPhotoExif(await this.exif(opts)).dateTimeOriginal;
-    }
-    async offsetTimeOriginal(
-        opts?: ContentOptions,
-    ): Promise<PhotoExif["offsetTimeOriginal"]> {
-        return readPhotoExif(await this.exif(opts)).offsetTimeOriginal;
-    }
-    async exposureTime(
-        opts?: ContentOptions,
-    ): Promise<PhotoExif["exposureTime"]> {
-        return readPhotoExif(await this.exif(opts)).exposureTime;
-    }
-    async fNumber(opts?: ContentOptions): Promise<PhotoExif["fNumber"]> {
-        return readPhotoExif(await this.exif(opts)).fNumber;
-    }
-    async iso(opts?: ContentOptions): Promise<PhotoExif["iso"]> {
-        return readPhotoExif(await this.exif(opts)).iso;
-    }
-    async focalLength(
-        opts?: ContentOptions,
-    ): Promise<PhotoExif["focalLength"]> {
-        return readPhotoExif(await this.exif(opts)).focalLength;
-    }
-    async orientation(
-        opts?: ContentOptions,
-    ): Promise<PhotoExif["orientation"]> {
-        return readPhotoExif(await this.exif(opts)).orientation;
-    }
-    async gpsLatitude(
-        opts?: ContentOptions,
-    ): Promise<PhotoExif["gpsLatitude"]> {
-        return readPhotoExif(await this.exif(opts)).gpsLatitude;
-    }
-    async gpsLongitude(
-        opts?: ContentOptions,
-    ): Promise<PhotoExif["gpsLongitude"]> {
-        return readPhotoExif(await this.exif(opts)).gpsLongitude;
-    }
-    async gpsAltitude(
-        opts?: ContentOptions,
-    ): Promise<PhotoExif["gpsAltitude"]> {
-        return readPhotoExif(await this.exif(opts)).gpsAltitude;
+        return readPhotoExif(await this.content(opts));
    }

    private cacheOrThrow(): PhotoContent {
@@ -3,18 +3,14 @@
 * `quak backup-metadata --exif` records.
 *
 * The originals come from users' libraries, so a truncated or corrupt file
- * must neither hang the read nor throw out of it: `readAllExifTags` gives `{}`,
+ * must neither hang the read nor throw out of it: `readPhotoExif` gives `{}`,
 * and `backup-metadata` tells an EXIF block it cannot read apart from a file
 * that simply has no EXIF, carrying the reason in `exifError`. Each JPEG below
 * is a short hand-built byte array; the HEIC is a real file.
 */

 import { describe, expect, it } from "vitest";
-import {
-    readAllExifTags,
-    readExifTags,
-    readPhotoExif,
-} from "../../src/exif.js";
+import { readPhotoExif } from "../../src/exif.js";
 import { extractImageMetadata } from "../../src/metadata-backup.js";
 import { HEIC_WITH_EXIF } from "../exif-heic.js";

@@ -67,51 +63,6 @@ const TIFF_ALTITUDE_WITHOUT_REF = [
    ...[0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x02], // 25/2, at 44
 ];

-// A big-endian TIFF block holding a GPSLatitude of 33° 30' 0" and a
-// GPSLatitudeRef of "S".
-const TIFF_SOUTHERN_LATITUDE = [
-    ...[0x4d, 0x4d, 0x00, 0x2a, 0x00, 0x00, 0x00, 0x08], // the first IFD at 8
-    // The first IFD, at 8: one entry, then no next IFD.
-    ...[0x00, 0x01],
-    // The GPS IFD's offset (0x8825), LONG, 26.
-    ...[0x88, 0x25, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x1a],
-    ...[0x00, 0x00, 0x00, 0x00],
-    // The GPS IFD, at 26: two entries, then no next IFD.
-    ...[0x00, 0x02],
-    // GPSLatitudeRef (0x0001), 2 ASCII bytes: "S".
-    ...[0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x53, 0x00, 0x00, 0x00],
-    // GPSLatitude (0x0002), three RATIONALs at 56.
-    ...[0x00, 0x02, 0x00, 0x05, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x38],
-    ...[0x00, 0x00, 0x00, 0x00],
-    ...[0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00, 0x01], // 33/1, at 56
-    ...[0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x01], // 30/1
-    ...[0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01], // 0/1
-];
-
-// A big-endian TIFF block holding a GPSLatitude of 40° 26' 46" and a
-// GPSLongitude of 79° 58' 56", and neither GPSLatitudeRef nor GPSLongitudeRef.
-const TIFF_POSITION_WITHOUT_REFS = [
-    ...[0x4d, 0x4d, 0x00, 0x2a, 0x00, 0x00, 0x00, 0x08], // the first IFD at 8
-    // The first IFD, at 8: one entry, then no next IFD.
-    ...[0x00, 0x01],
-    // The GPS IFD's offset (0x8825), LONG, 26.
-    ...[0x88, 0x25, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x1a],
-    ...[0x00, 0x00, 0x00, 0x00],
-    // The GPS IFD, at 26: two entries, then no next IFD.
-    ...[0x00, 0x02],
-    // GPSLatitude (0x0002), three RATIONALs at 56.
-    ...[0x00, 0x02, 0x00, 0x05, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x38],
-    // GPSLongitude (0x0004), three RATIONALs at 80.
-    ...[0x00, 0x04, 0x00, 0x05, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x50],
-    ...[0x00, 0x00, 0x00, 0x00],
-    ...[0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x01], // 40/1, at 56
-    ...[0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x01], // 26/1
-    ...[0x00, 0x00, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x01], // 46/1
-    ...[0x00, 0x00, 0x00, 0x4f, 0x00, 0x00, 0x00, 0x01], // 79/1, at 80
-    ...[0x00, 0x00, 0x00, 0x3a, 0x00, 0x00, 0x00, 0x01], // 58/1
-    ...[0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x01], // 56/1
-];
-
 // A big-endian TIFF block holding Orientation 6 and a Make whose value lies
 // past the end of the file.
 const TIFF_MAKE_PAST_END = [
@@ -136,27 +87,6 @@ const TIFF_UNNAMED_TAG = [
    ...[0x00, 0x00, 0x00, 0x00],
 ];

-// A big-endian TIFF block holding Orientation 6, and a thumbnail IFD holding
-// its own Orientation 1 and a 4-byte JPEG thumbnail.
-const TIFF_WITH_THUMBNAIL = [
-    ...[0x4d, 0x4d, 0x00, 0x2a, 0x00, 0x00, 0x00, 0x08], // the first IFD at 8
-    // The first IFD, at 8: one entry, then the thumbnail IFD at 26.
-    ...[0x00, 0x01],
-    // Orientation (0x0112), SHORT, 6.
-    ...[0x01, 0x12, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x06, 0x00, 0x00],
-    ...[0x00, 0x00, 0x00, 0x1a],
-    // The thumbnail IFD, at 26: three entries, then no next IFD.
-    ...[0x00, 0x03],
-    // Orientation (0x0112), SHORT, 1.
-    ...[0x01, 0x12, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00],
-    // JPEGInterchangeFormat (0x0201), LONG: the thumbnail is at 68.
-    ...[0x02, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x44],
-    // JPEGInterchangeFormatLength (0x0202), LONG: 4 bytes.
-    ...[0x02, 0x02, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04],
-    ...[0x00, 0x00, 0x00, 0x00],
-    ...[0xff, 0xd8, 0xff, 0xd9], // the thumbnail, at 68: an empty JPEG
-];
-
 // An APP1 segment whose length field matches its data.
 const app1 = (data: number[]): number[] => {
    const len = data.length + 2;
@@ -166,90 +96,31 @@ const app1 = (data: number[]): number[] => {
 const bytes = (...parts: number[][]): Uint8Array =>
    new Uint8Array(parts.flat());

-describe("readAllExifTags", () => {
-    it("keys a tag exifreader has no name for by its number", () => {
-        const data = [...EXIF_HEADER, ...TIFF_UNNAMED_TAG];
-        expect(readAllExifTags(bytes(SOI, app1(data), SOS))).toStrictEqual({
-            "undefined-49152": {
-                id: 49152,
-                value: 7,
-                description: 7,
-                computed: 7,
-            },
-        });
-    });
-
-    it("puts the thumbnail's tags under Thumbnail, without its image", () => {
-        const input = bytes(
-            SOI,
-            app1([...EXIF_HEADER, ...TIFF_WITH_THUMBNAIL]),
-            SOS,
-        );
-        // exifreader finds the thumbnail's image.
-        expect(readExifTags(input)?.Thumbnail?.type).toBe("image/jpeg");
-        const tags = readAllExifTags(input);
-        expect(tags.Orientation?.value).toBe(6);
-        expect(Object.keys(tags.Thumbnail ?? {}).sort()).toEqual([
-            "JPEGInterchangeFormat",
-            "JPEGInterchangeFormatLength",
-            "Orientation",
-        ]);
-        expect(tags.Thumbnail?.Orientation?.value).toBe(1);
-        expect(readPhotoExif(tags)).toStrictEqual({ orientation: 6 });
-    });
-});
-
 describe("readPhotoExif", () => {
    it("reads the common fields of a valid JPEG", () => {
        const data = [...EXIF_HEADER, ...TIFF_ORIENTATION_6];
-        expect(
-            readPhotoExif(readAllExifTags(bytes(SOI, app1(data), SOS))),
-        ).toStrictEqual({
+        expect(readPhotoExif(bytes(SOI, app1(data), SOS))).toStrictEqual({
            orientation: 6,
        });
    });

    it("gives no dateTimeOriginal for a DateTimeOriginal of 0000:00:00 00:00:00", () => {
        const data = [...EXIF_HEADER, ...TIFF_UNSET_DATE];
-        expect(
-            readPhotoExif(readAllExifTags(bytes(SOI, app1(data), SOS))),
-        ).toStrictEqual({
+        expect(readPhotoExif(bytes(SOI, app1(data), SOS))).toStrictEqual({
            orientation: 6,
        });
    });

    it("reads a GPSAltitude without GPSAltitudeRef as above sea level", () => {
        const data = [...EXIF_HEADER, ...TIFF_ALTITUDE_WITHOUT_REF];
-        expect(
-            readPhotoExif(readAllExifTags(bytes(SOI, app1(data), SOS))),
-        ).toStrictEqual({
+        expect(readPhotoExif(bytes(SOI, app1(data), SOS))).toStrictEqual({
            gpsAltitude: 12.5,
        });
    });

-    it("reads a GPSLatitude with GPSLatitudeRef S as south of the equator", () => {
-        const data = [...EXIF_HEADER, ...TIFF_SOUTHERN_LATITUDE];
-        expect(
-            readPhotoExif(readAllExifTags(bytes(SOI, app1(data), SOS))),
-        ).toStrictEqual({
-            gpsLatitude: -33.5,
-        });
-    });
-
-    it("gives no gpsLatitude or gpsLongitude without their reference tags", () => {
-        const data = [...EXIF_HEADER, ...TIFF_POSITION_WITHOUT_REFS];
-        const tags = readAllExifTags(bytes(SOI, app1(data), SOS));
-        // The position is read; only its hemisphere is unknown.
-        expect(tags.GPSLatitude?.computed).toStrictEqual([40, 26, 46]);
-        expect(tags.GPSLongitude?.computed).toStrictEqual([79, 58, 56]);
-        expect(readPhotoExif(tags)).toStrictEqual({});
-    });
-
    it("gives no make for a Make whose value lies past the end of the file", () => {
        const data = [...EXIF_HEADER, ...TIFF_MAKE_PAST_END];
-        expect(
-            readPhotoExif(readAllExifTags(bytes(SOI, app1(data), SOS))),
-        ).toStrictEqual({
+        expect(readPhotoExif(bytes(SOI, app1(data), SOS))).toStrictEqual({
            orientation: 6,
        });
    });
@@ -304,9 +175,8 @@ describe("readPhotoExif", () => {
            "an EXIF block that cannot be parsed",
            bytes(SOI, app1([...EXIF_HEADER, 0x58, 0x58]), SOS),
        ],
-    ])("returns no tags and no fields for %s", (_, input) => {
-        expect(readAllExifTags(input)).toStrictEqual({});
-        expect(readPhotoExif(readAllExifTags(input))).toStrictEqual({});
+    ])("returns no fields for %s", (_, input) => {
+        expect(readPhotoExif(input)).toStrictEqual({});
    });
 });

@@ -1883,6 +1883,15 @@ describe("downloadFile live photos", () => {
        expect(readdirSync(t.dir).sort()).toEqual(["f.JPG", "f.bin"]);
    });

+    it("replaces what was at the destination, such as an earlier ZIP of the two", async () => {
+        const t = setup(livePhotoZip(), livePhoto);
+        writeFileSync(t.outPath, livePhotoZip());
+
+        await t.run();
+
+        expect(readdirSync(t.dir).sort()).toEqual(["f.heic", "f.mov"]);
+    });
+
    it("renames the image and then the video into place, each from its own temp file", async () => {
        const t = setup(livePhotoZip(), livePhoto);

@@ -1,303 +0,0 @@
-/**
- * The example script `examples/download-albums.ts` (issue #144), run twice
- * against a stand-in account, as a user would run it twice.
- *
- * The account has two albums sharing one photo, and one of its photos is a
- * live photo whose image is a HEIC with EXIF. The first run puts every
- * original at its save path, writes each photo's metadata beside it and each
- * album's photos under `albums/`. Before the second run the account gains an
- * album holding a new photo. The second run downloads that photo and writes
- * its files and the new album's, and fetches nothing else and changes no
- * other file.
- */
-
-import { describe, it, expect, beforeEach, afterEach } from "vitest";
-import {
-    existsSync,
-    mkdtempSync,
-    readdirSync,
-    readFileSync,
-    rmSync,
-    statSync,
-    utimesSync,
-    writeFileSync,
-} from "node:fs";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-
-import { downloadAlbums } from "../../examples/download-albums.js";
-import { Library, type ContentSource } from "../../src/index.js";
-import type { CollectionsPage, FilesPage } from "../../src/client.js";
-import type { Collection, EnteFile } from "../../src/model/types.js";
-import { readAllExifTags } from "../../src/exif.js";
-import { HEIC_WITH_EXIF } from "../exif-heic.js";
-import {
-    asLivePhoto,
-    cdnSource,
-    livePhotoHash,
-    livePhotoZip,
-    VIDEO,
-} from "../live-photo.js";
-
-const USER_ID = 7;
-
-// Every photo is taken at noon local time on 2026-03-01, so the machine's time
-// zone cannot move it to another day; it is saved in the folder `DAY`. Ente
-// stores times in microseconds.
-const TAKEN_MS = new Date(2026, 2, 1, 12).getTime();
-const DAY = join("2026", "2026-03", "2026-03-01");
-
-const collection = (id: number, name: string): Collection => ({
-    id,
-    ownerID: USER_ID,
-    key: new Uint8Array([id]),
-    name,
-    type: "album",
-    updationTime: 1,
-    isShared: false,
-});
-
-const file = (id: number, collectionID: number): EnteFile => ({
-    id,
-    collectionID,
-    ownerID: USER_ID,
-    key: new Uint8Array([id]),
-    metadata: {
-        title: `file-${id}.jpg`,
-        fileType: "image",
-        creationTime: TAKEN_MS * 1000,
-        modificationTime: TAKEN_MS * 1000,
-    },
-    file: { decryptionHeader: "aGVhZGVy" },
-    thumbnail: { decryptionHeader: "dGh1bWI=" },
-    updationTime: 1,
-});
-
-let root: string;
-
-beforeEach(() => {
-    root = mkdtempSync(join(tmpdir(), "quak-download-albums-"));
-});
-
-afterEach(() => {
-    if (root && existsSync(root))
-        rmSync(root, { recursive: true, force: true });
-});
-
-// Every file and directory under `dir`, by path.
-const entries = (dir: string): string[] =>
-    readdirSync(dir, { recursive: true, encoding: "utf-8" });
-
-// Set the modification time of everything under `dir` to the epoch, so that
-// anything written there afterwards has a later one, however soon it comes.
-const backdate = (dir: string): void => {
-    for (const name of entries(dir)) utimesSync(join(dir, name), 0, 0);
-};
-
-// The modification time of everything under `dir`, by path.
-const mtimes = (dir: string): Map<string, number> =>
-    new Map(
-        entries(dir).map((name) => [name, statSync(join(dir, name)).mtimeMs]),
-    );
-
-const readJSON = (path: string): unknown =>
-    JSON.parse(readFileSync(path, "utf-8"));
-
-describe("examples/download-albums.ts", () => {
-    it("downloads every album's photos with their metadata, and on a second run only what the account gained", async () => {
-        // Album 1, "Trip", holds photos 1 and 2. Album 2, "Family", holds
-        // photo 2 and photo 3, a live photo.
-        const live = await asLivePhoto(
-            file(3, 2),
-            livePhotoZip({ "image.heic": HEIC_WITH_EXIF, "video.mov": VIDEO }),
-            livePhotoHash(HEIC_WITH_EXIF, VIDEO),
-        );
-        const collections = [collection(1, "Trip"), collection(2, "Family")];
-        const filesByAlbum = new Map<number, EnteFile[]>([
-            [1, [file(1, 1), file(2, 1)]],
-            [2, [file(2, 2), live.file]],
-        ]);
-        const client = {
-            whoami: () => ({ email: "u@example.com", userID: USER_ID }),
-            collectionsSince: async (): Promise<CollectionsPage> => ({
-                collections: [...collections],
-                deleted: [],
-                cursor: 1,
-            }),
-            filesSince: async (args: {
-                collectionID: number;
-            }): Promise<FilesPage> => ({
-                files: filesByAlbum.get(args.collectionID) ?? [],
-                deleted: [],
-                cursor: 1,
-            }),
-        };
-
-        // Photo 3 comes from a stand-in server, encrypted as Ente serves a
-        // live photo. Any other original is a few bytes naming its photo.
-        // `calls` counts every fetch, thumbnails included.
-        const server = cdnSource(new Map([[3, live.body]]));
-        let calls = 0;
-        const source: ContentSource = {
-            original: async (args) => {
-                calls++;
-                if (args.file.id === 3) return server.original(args);
-                const bytes = `original-${args.file.id}`;
-                writeFileSync(args.destination, bytes);
-                return { bytesWritten: bytes.length };
-            },
-            thumbnail: async (args) => {
-                calls++;
-                return server.thumbnail(args);
-            },
-        };
-
-        const dir = join(root, "photos");
-        const open = (): Promise<Library> =>
-            Library.open({
-                client,
-                cacheDirectory: join(root, "cache"),
-                downloadDirectory: dir,
-                contentSource: source,
-                refreshIntervalSeconds: 3600,
-                precacheThumbnails: false,
-                precacheOriginals: false,
-            });
-
-        const first = await open();
-        // The cache already holds photo 1's original, so its record names a
-        // cache path, which the metadata leaves out. download() copies it
-        // from the cache rather than fetching it again.
-        await first.photos.byID({ fileID: 1 })!.original();
-        expect(await downloadAlbums(first, dir)).toEqual({
-            downloaded: 3,
-            alreadyLocal: 0,
-        });
-        await first.close();
-        expect(calls).toBe(3);
-
-        // Each original at its save path, a live photo as its image, its video
-        // and the file naming them, and each photo's metadata beside it.
-        const day = join(dir, DAY);
-        expect(readdirSync(day).sort()).toEqual([
-            "2026-03-01.1.jpg",
-            "2026-03-01.1.jpg.json",
-            "2026-03-01.2.jpg",
-            "2026-03-01.2.jpg.json",
-            "2026-03-01.3.heic",
-            "2026-03-01.3.heic.json",
-            "2026-03-01.3.livephoto.json",
-            "2026-03-01.3.mov",
-        ]);
-        expect(readFileSync(join(day, "2026-03-01.1.jpg"), "utf-8")).toBe(
-            "original-1",
-        );
-        expect(readFileSync(join(day, "2026-03-01.2.jpg"), "utf-8")).toBe(
-            "original-2",
-        );
-        expect(readFileSync(join(day, "2026-03-01.3.heic"))).toEqual(
-            Buffer.from(HEIC_WITH_EXIF),
-        );
-        expect(readFileSync(join(day, "2026-03-01.3.mov"))).toEqual(
-            Buffer.from(VIDEO),
-        );
-
-        // The metadata is the photo's record and its EXIF tags. The originals
-        // of photos 1 and 2 are not image data, so they have no EXIF tags.
-        // Photo 3's are every tag of its image, as `photo.exif()` returns
-        // them. `record` holds the fields the three records share.
-        const record = {
-            takenAt: TAKEN_MS,
-            modifiedAt: TAKEN_MS,
-            fileType: "image",
-            isArchived: false,
-            isHidden: false,
-        };
-        expect(readJSON(join(day, "2026-03-01.1.jpg.json"))).toEqual({
-            ...record,
-            fileID: 1,
-            albumIDs: [1],
-            title: "file-1.jpg",
-            exif: {},
-        });
-        expect(readJSON(join(day, "2026-03-01.2.jpg.json"))).toEqual({
-            ...record,
-            fileID: 2,
-            albumIDs: [1, 2],
-            title: "file-2.jpg",
-            exif: {},
-        });
-        expect(readJSON(join(day, "2026-03-01.3.heic.json"))).toEqual({
-            ...record,
-            fileID: 3,
-            albumIDs: [2],
-            title: "file-3.jpg",
-            fileType: "livePhoto",
-            hash: livePhotoHash(HEIC_WITH_EXIF, VIDEO),
-            exif: readAllExifTags(HEIC_WITH_EXIF),
-        });
-
-        // Each album's photos, newest first, by save path relative to `dir`.
-        // Photo 2 is in both.
-        expect(readdirSync(join(dir, "albums")).sort()).toEqual([
-            "1.json",
-            "2.json",
-        ]);
-        expect(readJSON(join(dir, "albums", "1.json"))).toEqual({
-            collectionID: 1,
-            name: "Trip",
-            savePaths: [
-                join(DAY, "2026-03-01.2.jpg"),
-                join(DAY, "2026-03-01.1.jpg"),
-            ],
-        });
-        expect(readJSON(join(dir, "albums", "2.json"))).toEqual({
-            collectionID: 2,
-            name: "Family",
-            savePaths: [
-                join(DAY, "2026-03-01.3.heic"),
-                join(DAY, "2026-03-01.2.jpg"),
-            ],
-        });
-
-        // Before the second run the account gains album 3, "Garden", holding
-        // a new photo 4. The second run, with a newly opened library, opens
-        // the cache written by the first and still downloads photo 4. It finds
-        // the other photos already local and fetches nothing else.
-        collections.push(collection(3, "Garden"));
-        filesByAlbum.set(3, [file(4, 3)]);
-        backdate(dir);
-        const before = mtimes(dir);
-        const second = await open();
-        expect(await downloadAlbums(second, dir)).toEqual({
-            downloaded: 1,
-            alreadyLocal: 3,
-        });
-        await second.close();
-        expect(calls).toBe(4);
-        expect(readFileSync(join(day, "2026-03-01.4.jpg"), "utf-8")).toBe(
-            "original-4",
-        );
-        expect(readJSON(join(dir, "albums", "3.json"))).toEqual({
-            collectionID: 3,
-            name: "Garden",
-            savePaths: [join(DAY, "2026-03-01.4.jpg")],
-        });
-
-        // The second run adds only photo 4's files and album 3's, and
-        // rewrites, renames or removes no file from the first run. The two
-        // directories that gain a file are the only other changes.
-        const after = mtimes(dir);
-        expect(
-            [...after.keys()].filter((name) => !before.has(name)).sort(),
-        ).toEqual([
-            join(DAY, "2026-03-01.4.jpg"),
-            join(DAY, "2026-03-01.4.jpg.json"),
-            join("albums", "3.json"),
-        ]);
-        for (const [name, mtime] of before) {
-            if (name === DAY || name === "albums") continue;
-            expect(after.get(name), name).toBe(mtime);
-        }
-    });
-});
@@ -7,7 +7,7 @@
 * a cached path shows up on the projected record. A library opened without a
 * content source leaves those methods throwing rather than silently doing
 * nothing. It also covers a `Photo`'s `savePath`, `isLocal`, `download()`,
- * `content()`, `exif()` and the methods that each return one EXIF field.
+ * `content()` and `exif()`.
 */

 import { describe, it, expect, beforeEach, afterEach, vi } from "vitest";
@@ -27,7 +27,7 @@ import { Library, type LibraryOptions } from "../../src/library/index.js";
 import type { ContentSource } from "../../src/library/content.js";
 import type { CollectionsPage, FilesPage } from "../../src/client.js";
 import type { Collection, EnteFile } from "../../src/model/types.js";
-import { readPhotoExif, type PhotoExif } from "../../src/exif.js";
+import type { PhotoExif } from "../../src/exif.js";
 import { HEIC_WITH_EXIF } from "../exif-heic.js";
 import {
    asLivePhoto,
@@ -176,7 +176,7 @@ describe("Library content wiring", () => {
        await lib.close();
    });

-    it("does not take a live photo's image or video with no JSON file as its original when it opens, and precaches both", async () => {
+    it("removes a live photo's ZIP an earlier version cached when it opens, and precaches its image and video", async () => {
        const { file: live, body } = await asLivePhoto(file(1, 1));
        class LiveClient extends MockClient {
            override async filesSince(): Promise<FilesPage> {
@@ -197,8 +197,7 @@ describe("Library content wiring", () => {
        // A first run records the library, so the next one knows that file 1
        // is a live photo when it opens the cache.
        await (await open({})).close();
-        writeFileSync(join(originals, "1.heic"), "an image");
-        writeFileSync(join(originals, "1.mov"), "a video");
+        writeFileSync(join(originals, "1.jpg"), livePhotoZip());

        let precached!: () => void;
        const done = new Promise<void>((r) => (precached = r));
@@ -209,9 +208,7 @@ describe("Library content wiring", () => {
                    precached();
            },
        });
-        expect(
-            lib.photos.byID({ fileID: 1 })!.record().originalPath,
-        ).toBeUndefined();
+        expect(existsSync(join(originals, "1.jpg"))).toBe(false);
        await done;

        expect(readdirSync(originals).sort()).toEqual([
@@ -219,17 +216,6 @@ describe("Library content wiring", () => {
            "1.livephoto.json",
            "1.mov",
        ]);
-        expect(readFileSync(join(originals, "1.heic"))).toEqual(
-            Buffer.from(IMAGE),
-        );
-        expect(readFileSync(join(originals, "1.mov"))).toEqual(
-            Buffer.from(VIDEO),
-        );
-        expect(
-            JSON.parse(
-                readFileSync(join(originals, "1.livephoto.json"), "utf-8"),
-            ),
-        ).toEqual({ image: "1.heic", video: "1.mov" });
        expect(lib.photos.byID({ fileID: 1 })!.record().originalPath).toBe(
            join(originals, "1.heic"),
        );
@@ -273,10 +259,10 @@ const entry = (
    value: number[],
 ): number[] => [...u16(tag), ...u16(type), ...u32(count), ...value];

-// The TIFF block of a JPEG's EXIF segment, holding every field `Photo`'s typed
-// methods return: the camera in the first IFD, the exposure in the Exif IFD,
-// and a GPS position of 40°26'46" N, 79°58'56" W, 12.5 m below sea level.
-// Offsets count from the start of this block.
+// The TIFF block of a JPEG's EXIF segment, holding every field `exif()` picks:
+// the camera in the first IFD, the exposure in the Exif IFD, and a GPS position
+// of 40°26'46" N, 79°58'56" W, 12.5 m below sea level. Offsets count from the
+// start of this block.
 const TIFF = [
    ...[0x4d, 0x4d, 0x00, 0x2a], // big-endian TIFF
    ...u32(8), // the first IFD's offset
@@ -637,72 +623,9 @@ describe("Photo save path, local copy, content and EXIF", () => {
        await lib.close();
    });

-    // Every tag in JPEG_WITH_EXIF, by name, in the order of its IFDs.
-    const jpegTags = [
-        "Make",
-        "Model",
-        "Orientation",
-        "Exif IFD Pointer",
-        "GPS Info IFD Pointer",
-        "ExposureTime",
-        "FNumber",
-        "ISOSpeedRatings",
-        "DateTimeOriginal",
-        "OffsetTimeOriginal",
-        "FocalLength",
-        "LensModel",
-        "GPSLatitudeRef",
-        "GPSLatitude",
-        "GPSLongitudeRef",
-        "GPSLongitude",
-        "GPSAltitudeRef",
-        "GPSAltitude",
-    ];
-    // HEIC_WITH_EXIF holds those and the tags exiftool adds to every file.
-    const heicTags = [
-        ...jpegTags,
-        "YCbCrPositioning",
-        "ExifVersion",
-        "ComponentsConfiguration",
-        "ColorSpace",
-        "GPSVersionID",
-    ];
-
-    it.each([
-        [
-            "JPEG",
-            JPEG_WITH_EXIF,
-            jpegTags,
-            {
-                "Exif IFD Pointer": { value: 88 },
-                GPSLatitudeRef: { value: ["N"], description: "North latitude" },
-            },
-        ],
-        [
-            "HEIC",
-            HEIC_WITH_EXIF,
-            heicTags,
-            {
-                ColorSpace: { value: 0xffff, description: "Uncalibrated" },
-                ExifVersion: { description: "0232" },
-            },
-        ],
-    ])(
-        "returns every EXIF tag of a %s original, by name",
-        async (_, bytes, names, others) => {
-            const lib = await open({ contentSource: stubSource(bytes) });
-            const exif = await lib.photos.byID({ fileID: 1 })!.exif();
-            expect(Object.keys(exif).sort()).toEqual([...names].sort());
-            // Tags outside the thirteen fields, as exifreader decodes them.
-            expect(exif).toMatchObject(others);
-            await lib.close();
-        },
-    );
-
-    it("picks the common EXIF fields from a JPEG original's tags", async () => {
+    it("reads the common EXIF fields of a JPEG original", async () => {
        const lib = await open({ contentSource: stubSource(JPEG_WITH_EXIF) });
-        const exif = await lib.photos.byID({ fileID: 1 })!.exif();
-        expect(readPhotoExif(exif)).toStrictEqual({
+        expect(await lib.photos.byID({ fileID: 1 })!.exif()).toStrictEqual({
            make: "Canon",
            model: "EOS R5",
            lensModel: "RF50mm F1.8 STM",
@@ -721,8 +644,8 @@ describe("Photo save path, local copy, content and EXIF", () => {
        await lib.close();
    });

-    // The fields picked from HEIC_WITH_EXIF's tags, and from JPEG_WITH_EXIF's,
-    // which hold the same values.
+    // What exif() returns for HEIC_WITH_EXIF, which holds the same values as
+    // JPEG_WITH_EXIF.
    const heicFields: PhotoExif = {
        make: "Canon",
        model: "EOS R5",
@@ -739,10 +662,11 @@ describe("Photo save path, local copy, content and EXIF", () => {
        gpsAltitude: -12.5,
    };

-    it("picks the same common EXIF fields from a HEIC original's tags", async () => {
+    it("reads the same common EXIF fields from a HEIC original", async () => {
        const lib = await open({ contentSource: stubSource(HEIC_WITH_EXIF) });
-        const exif = await lib.photos.byID({ fileID: 1 })!.exif();
-        expect(readPhotoExif(exif)).toStrictEqual(heicFields);
+        expect(await lib.photos.byID({ fileID: 1 })!.exif()).toStrictEqual(
+            heicFields,
+        );
        await lib.close();
    });

@@ -756,44 +680,19 @@ describe("Photo save path, local copy, content and EXIF", () => {
            client: new FilesClient([live]),
            contentSource: cdnSource(new Map([[1, body]])),
        });
-        const exif = await lib.photos.byID({ fileID: 1 })!.exif();
-        expect(readPhotoExif(exif)).toStrictEqual(heicFields);
+        expect(await lib.photos.byID({ fileID: 1 })!.exif()).toStrictEqual(
+            heicFields,
+        );
        await lib.close();
    });

-    // The build's type check, not this test, makes sure `Photo` has a method
-    // for every `PhotoExif` field, whatever the fixtures hold: `Photo`
-    // implements a type with one method per field. This test checks that each
-    // method gives the field picked from the tags exif() returns.
-    it.each([
-        ["JPEG", JPEG_WITH_EXIF],
-        ["HEIC", HEIC_WITH_EXIF],
-    ])(
-        "has a method for each field, agreeing with the tags exif() returns, for a %s",
-        async (_, bytes) => {
-            const lib = await open({ contentSource: stubSource(bytes) });
-            const photo = lib.photos.byID({ fileID: 1 })!;
-            const fields = readPhotoExif(await photo.exif());
-            // The file holds every field, so every method is checked.
-            expect(fields).toStrictEqual(heicFields);
-            for (const [field, value] of Object.entries(fields)) {
-                expect(await photo[field as keyof PhotoExif]()).toStrictEqual(
-                    value,
-                );
-            }
-            await lib.close();
-        },
-    );
-
-    it("returns no EXIF tags for an original that is not an image", async () => {
+    it("returns no EXIF fields for an original that is not an image", async () => {
        const lib = await open();
-        const photo = lib.photos.byID({ fileID: 1 })!;
-        expect(await photo.exif()).toStrictEqual({});
-        expect(await photo.dateTimeOriginal()).toBeUndefined();
+        expect(await lib.photos.byID({ fileID: 1 })!.exif()).toStrictEqual({});
        await lib.close();
    });

-    it("returns no EXIF tags for a JPEG whose EXIF cannot be parsed", async () => {
+    it("returns no EXIF fields for a JPEG whose EXIF cannot be parsed", async () => {
        const lib = await open({
            contentSource: stubSource(JPEG_WITH_BAD_EXIF),
        });
@@ -814,7 +713,7 @@ describe("Photo save path, local copy, content and EXIF", () => {
        await lib.close();
    });

-    it("returns no EXIF tags for a video, without fetching it", async () => {
+    it("returns no EXIF fields for a video, without fetching it", async () => {
        const video = file(1, 1);
        video.metadata.fileType = "video";
        const source = stubSource(JPEG_WITH_EXIF);
@@ -566,6 +566,43 @@ describe("ContentCache live photos", () => {
        expect(events).toEqual(["skipped"]);
    });

+    it("replaces a live photo an earlier version stored as a ZIP under the image's name", async () => {
+        const { file: live, body } = await asLivePhoto(file(5, "IMG_5.HEIC"));
+        mkdirSync(originals(), { recursive: true });
+        writeFileSync(join(originals(), "5.HEIC"), livePhotoZip());
+        const cache = cacheOf([live], new Map([[5, body]]));
+        // Opened without being told that file 5 is a live photo, the cache
+        // records the ZIP, and does not serve it.
+        await cache.open();
+
+        const result = await cache.original(5);
+
+        expect(result.videoPath).toBe(join(originals(), "5.mov"));
+        expect(readdirSync(originals()).sort()).toEqual([
+            "5.heic",
+            "5.livephoto.json",
+            "5.mov",
+        ]);
+    });
+
+    it("removes a live photo's ZIP an earlier version stored when it opens, so the precache fetches the image and video", async () => {
+        const { file: live, body } = await asLivePhoto(file(5, "IMG_5.HEIC"));
+        mkdirSync(originals(), { recursive: true });
+        writeFileSync(join(originals(), "5.HEIC"), livePhotoZip());
+        const cache = cacheOf([live], new Map([[5, body]]));
+
+        await cache.open((fileID) => fileID === 5);
+
+        expect(readdirSync(originals())).toEqual([]);
+        expect(cache.pathsFor(5)).toEqual({});
+        const [fetched] = await cache.ensureOriginals({ fileIDs: [5] });
+        expect(fetched).toEqual({
+            fileID: 5,
+            path: join(originals(), "5.heic"),
+        });
+        expect(cache.pathsFor(5)).toEqual({ originalPath: fetched!.path });
+    });
+
    it("leaves the image and video another process has just stored when it opens before their JSON file is written", async () => {
        const { file: live, body } = await asLivePhoto(file(5, "IMG_5.HEIC"));
        const server = cdnSource(new Map([[5, body]]));
@@ -596,36 +633,6 @@ describe("ContentCache live photos", () => {
        expect(second!.pathsFor(5)).toEqual({});
    });

-    it("fetches a live photo's image and video again when the cache opened before knowing it is a live photo and no JSON file names them", async () => {
-        const { file: live, body } = await asLivePhoto(file(5, "IMG_5.HEIC"));
-        mkdirSync(originals(), { recursive: true });
-        writeFileSync(join(originals(), "5.heic"), "an image");
-        writeFileSync(join(originals(), "5.mov"), "a video");
-        const cache = cacheOf([live], new Map([[5, body]]));
-        // Opened without being told that file 5 is a live photo, the cache
-        // records one of the two files as its original, with no video.
-        await cache.open();
-
-        const events: string[] = [];
-        const result = await cache.original(5, {
-            onProgress: (e) => events.push(e.status),
-        });
-
-        expect(events.at(-1)).toBe("done");
-        expect(result).toEqual({
-            path: join(originals(), "5.heic"),
-            videoPath: join(originals(), "5.mov"),
-            bytes: IMAGE.length,
-        });
-        expect(readFileSync(result.path)).toEqual(Buffer.from(IMAGE));
-        expect(readFileSync(result.videoPath!)).toEqual(Buffer.from(VIDEO));
-        expect(
-            JSON.parse(
-                readFileSync(join(originals(), "5.livephoto.json"), "utf-8"),
-            ),
-        ).toEqual({ image: "5.heic", video: "5.mov" });
-    });
-
    it.each(["missing", "empty"])(
        "fetches a live photo again when the video its JSON file names is %s",
        async (state) => {
@@ -9,10 +9,8 @@
 // Excluding too much: Prettier 3 reads `.gitignore` as a default ignore file,
 // so dropping it from the context silently changes which files the lint
 // phase's prettier check looks at compared to `make fmt-check` on the host.
-// And without `.git`, a `docker build .` given no `VERSION` build arg cannot
-// derive the version (`script/version`) and stamps `package.json`'s instead.
 //
-// None of these shows up as a build failure, so they are asserted here.
+// Neither shows up as a build failure, so they are asserted here.
 import { describe, expect, it } from "vitest";
 import { existsSync, readFileSync } from "node:fs";
 import { fileURLToPath } from "node:url";
@@ -49,17 +47,6 @@ describe(".dockerignore", () => {
        expect(dockerignore).not.toContain(".gitignore");
    });

-    it("leaves .git in the build context for the version", () => {
-        expect(dockerignore).not.toContain(".git");
-        expect(dockerignore).not.toContain(".git/");
-    });
-
-    // The build stage is the final image, so a .git/config sent in would
-    // ship the clone's remote URL and any credential in it.
-    it("sends .git without its config", () => {
-        expect(dockerignore).toContain(".git/config");
-    });
-
    // BuildKit lets a `Dockerfile.dockerignore` shadow the root one; such a
    // file would silently give the build a different, unreviewed context —
    // and eslint's flat config does not ignore dot-directories, so a stray
@@ -1,137 +0,0 @@
-// `script/version` prints the version `script/build` stamps into
-// `dist/package.json`, which is what `quak --version` reports from a build.
-// A `docker build .` of a clone is given no `VERSION` build arg, so the
-// version has to come from the `.git` in its context: the tag on a tagged
-// commit; the tag, the commits since it and the short commit on a later commit;
-// the short commit when no tag is reachable. A checkout with `.git` that still
-// yields no usable version must fail the build, not ship a version nobody can
-// trace back to its commit.
-//
-// Each test copies the script into a fresh directory, which the script then
-// treats as the checkout, and executes it there.
-import { afterEach, describe, expect, it } from "vitest";
-import { execFileSync, spawnSync } from "node:child_process";
-import {
-    chmodSync,
-    copyFileSync,
-    mkdirSync,
-    mkdtempSync,
-    rmSync,
-    writeFileSync,
-} from "node:fs";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-import { fileURLToPath } from "node:url";
-
-const repoRoot = fileURLToPath(new URL("../../", import.meta.url));
-
-let checkout = "";
-
-afterEach(() => {
-    rmSync(checkout, { recursive: true, force: true });
-});
-
-// A checkout holding the script and a package.json that declares 0.0.0, with
-// no .git yet.
-const makeCheckout = (): void => {
-    checkout = mkdtempSync(join(tmpdir(), "quak-version-"));
-    mkdirSync(join(checkout, "script"));
-    copyFileSync(
-        join(repoRoot, "script/version"),
-        join(checkout, "script/version"),
-    );
-    chmodSync(join(checkout, "script/version"), 0o755);
-    writeFileSync(join(checkout, "package.json"), '{ "version": "0.0.0" }\n');
-};
-
-// git in the checkout, with an identity and no commit signing, whatever the
-// host's own git config says.
-const git = (...args: string[]): string =>
-    execFileSync(
-        "git",
-        [
-            "-c",
-            "user.name=quak",
-            "-c",
-            "user.email=quak@example.invalid",
-            "-c",
-            "commit.gpgsign=false",
-            ...args,
-        ],
-        { cwd: checkout, encoding: "utf-8", stdio: ["ignore", "pipe", "pipe"] },
-    ).trim();
-
-const makeCommittedCheckout = (): void => {
-    makeCheckout();
-    git("init", "-q");
-    git("add", "package.json");
-    git("commit", "-q", "-m", "first");
-};
-
-// Runs the script with nothing in its environment but PATH and, when given,
-// VERSION.
-const runVersion = (version?: string) =>
-    spawnSync(join(checkout, "script/version"), {
-        cwd: checkout,
-        encoding: "utf-8",
-        env: { PATH: process.env.PATH, VERSION: version },
-    });
-
-describe("script/version", () => {
-    it("prints the short commit of an untagged commit", () => {
-        makeCommittedCheckout();
-        expect(runVersion().stdout.trim()).toBe(
-            git("rev-parse", "--short", "HEAD"),
-        );
-    });
-
-    it("prints the tag of a tagged commit", () => {
-        makeCommittedCheckout();
-        git("tag", "v1.2.3");
-        expect(runVersion().stdout.trim()).toBe("v1.2.3");
-    });
-
-    // script/docker and script/cibuild pass the version they resolve on the
-    // host as the VERSION build arg.
-    it("prints the VERSION it is given over what git would derive", () => {
-        makeCommittedCheckout();
-        expect(runVersion("x").stdout.trim()).toBe("x");
-    });
-
-    // `--build-arg VERSION=` must not stamp an empty version.
-    it("treats an empty VERSION as unset", () => {
-        makeCommittedCheckout();
-        expect(runVersion("").stdout.trim()).toBe(
-            git("rev-parse", "--short", "HEAD"),
-        );
-    });
-
-    // A source tarball has no .git: it keeps the version package.json
-    // declares, and must still build.
-    it("prints package.json's version where there is no .git", () => {
-        makeCheckout();
-        const result = runVersion();
-        expect(result.status).toBe(0);
-        expect(result.stdout.trim()).toBe("0.0.0");
-    });
-
-    // A repository with no commits stands in for any .git that git cannot
-    // describe: git missing from the image, or refusing to read the checkout.
-    it("fails where .git yields no version", () => {
-        makeCheckout();
-        git("init", "-q");
-        const result = runVersion();
-        expect(result.status).not.toBe(0);
-        expect(result.stdout).toBe("");
-    });
-
-    it.each(["dev", "unknown"])(
-        "fails where there is .git and the version is %s",
-        (version) => {
-            makeCommittedCheckout();
-            const result = runVersion(version);
-            expect(result.status).not.toBe(0);
-            expect(result.stdout).toBe("");
-        },
-    );
-});
@@ -787,13 +787,12 @@ describe("fixMissingThumbnails", () => {
    });

    it("re-encodes smaller until the thumbnail fits the recorded size", async () => {
-        // A noisy 64x48 JPEG, which the default encoding (quality 50, not
+        // A noisy 400x300 JPEG, which the default encoding (quality 50, not
        // resized because it is under 720 px) cannot compress below the size
-        // recorded here: one byte less than that encoding's ciphertext. It is
-        // small so that each encode is quick even on a busy host.
+        // recorded here: one byte less than that encoding's ciphertext.
        const fixMock = await buildThumbMock();
-        const w = 64;
-        const h = 48;
+        const w = 400;
+        const h = 300;
        const noisy = new Uint8Array(
            jpegJs.encode(
                {
@@ -18,5 +18,5 @@
        "sourceMap": true,
        "resolveJsonModule": true
    },
-    "include": ["src/**/*", "bin/**/*", "examples/**/*"]
+    "include": ["src/**/*", "bin/**/*"]
 }
Author	SHA1	Message	Date
sneak	fc06b9100b	Have photo.download() write to the save path of the Photo's own file copy check / check (push) Successful in 4m9s Details Photo.download() now hands the content cache the file copy the Photo holds, the one savePath and isLocal are dated from, instead of the fileID the cache then looked up in the store. A Photo held across a refresh that brings a date edited in Ente is now downloaded to the path its savePath names. A test covers that case. Model: opus-5-5	2026-10-01 21:01:33 +00:00
sneak	8992c7c5a9	Date download() and backup by the album copy photo.savePath uses Export `representative` from records.ts: the album's copy of a file that its record is read from. `store.getFileByID` now returns that copy, so `download()` writes under the date `photo.savePath` names. `lib.backup()` takes each file's copy by the same rule from all of its albums, and every album links that one path. Tests cover one file in two albums whose copies carry different edited dates, for `download()` and for `lib.backup()`. Model: opus-5-5	2026-10-01 20:56:39 +00:00
sneak	2323da4727	Date a Photo's save path by the membership its record is read from A Photo kept the first membership of its file, while its record (and so takenAt and year) comes from the most recently synced one. The record projection now keeps that same membership for the Photo, so savePath and isLocal carry the date of takenAt. A test covers one file in two albums whose edited times differ. Model: opus-5-5	2026-10-01 20:56:39 +00:00
sneak	4c72e05002	Keep a Photo's save path after its file leaves; refuse an empty download directory A Photo now keeps the file its record was made from (the record projection holds one membership of each file), so savePath and isLocal still answer after a refresh removes the file. Library.open rejects an empty downloadDirectory. A backup clears leftover temp files in every date folder under its directory, not only in those of the files in its scope. placeOriginal no longer deletes what is at the save path before copying a live photo, and the tests that depended on that are removed. The TODO.md entry for issue 143 describes only the current layout. Model: opus-5-5	2026-10-01 20:56:39 +00:00
sneak	bab19660f5	Save originals at photos/YYYY/YYYY-MM/YYYY-MM-DD/YYYY-MM-DD.fileID.ext; add photo.download() (closes #143 ) Each original's save path is now YYYY/YYYY-MM/YYYY-MM-DD/YYYY-MM-DD.<fileID><ext> under the library's download directory, dated by takenAt in the machine's time zone. The directory defaults to photos/ in the working directory, resolved once at open. savePath is always a string, with or without a content cache, and isLocal is true only when the original is there. photo.download() puts the original at its save path: copied from the cache when the cache holds it, fetched straight there otherwise. lib.backup() uses the same code for each file, writes each file's JSON beside it, and links collections/ to the save paths. The backup has no originals/ folder. Model: opus-5-5	2026-10-01 20:56:39 +00:00