Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0b97156c00 | ||
|
|
7878ff3812 | ||
|
|
8e120a4f49 |
No files matched your search
@@ -26,10 +26,8 @@ check:
|
|||||||
build:
|
build:
|
||||||
@script/build
|
@script/build
|
||||||
|
|
||||||
# Bundles the built dist/, so the binary reports the version script/build
|
build-bin:
|
||||||
# stamped.
|
@script/build-bin
|
||||||
build-bin: build
|
|
||||||
nix-shell -p bun --run "bun build dist/bin/quak.js --compile --outfile bin/quak"
|
|
||||||
|
|
||||||
install: build-bin
|
install: build-bin
|
||||||
mkdir -p ~/bin
|
mkdir -p ~/bin
|
||||||
|
|||||||
@@ -135,10 +135,16 @@ requests. The "Library reference" below covers both.
|
|||||||
## Running the backup from cron
|
## Running the backup from cron
|
||||||
|
|
||||||
`quak backup` never prompts, so cron can run it. `make install` builds quak as
|
`quak backup` never prompts, so cron can run it. `make install` builds quak as
|
||||||
one binary and copies it to `~/bin/quak`. Besides what Getting Started needs,
|
one binary and copies it to `~/bin/quak`. It uses bun, a JavaScript runtime, to
|
||||||
`make install` needs `make` and [nix](https://nixos.org/download). It uses bun,
|
bundle the built `dist/` into one executable. Besides what Getting Started
|
||||||
a JavaScript runtime, to bundle the built `dist/` into one executable. It runs
|
needs, `make install` needs `make`. On Linux it downloads bun from GitHub with
|
||||||
bun through `nix-shell -p bun`.
|
`curl` and unpacks it with `unzip`. It checks the download against a SHA-256
|
||||||
|
hash in the repo. On macOS it runs bun through `nix-shell -p bun`, so it needs
|
||||||
|
[nix](https://nixos.org/download).
|
||||||
|
|
||||||
|
On Linux systems that use the musl C library, such as Alpine, `make install`
|
||||||
|
downloads bun's musl build. On Alpine, both that bun and `~/bin/quak` need the
|
||||||
|
`libstdc++` and `libgcc` packages.
|
||||||
|
|
||||||
Log in once with `~/bin/quak`, as the user the cron job will run as:
|
Log in once with `~/bin/quak`, as the user the cron job will run as:
|
||||||
|
|
||||||
@@ -302,7 +308,7 @@ title, with unsafe characters replaced (see "File names from the server"). With
|
|||||||
original is kept in the cache as well.
|
original is kept in the cache as well.
|
||||||
|
|
||||||
A file ID that no collection holds gives `File <id> not found`, and the exit
|
A file ID that no collection holds gives `File <id> not found`, and the exit
|
||||||
status is 1. The option `--collection <id>` is accepted and ignored.
|
status is 1.
|
||||||
|
|
||||||
A live photo is a still image and a short video that Ente stores as one file.
|
A live photo is a still image and a short video that Ente stores as one file.
|
||||||
`get` writes both, each named after the title with its own extension, as Ente's
|
`get` writes both, each named after the title with its own extension, as Ente's
|
||||||
@@ -671,6 +677,9 @@ but letters and digits, or when it is longer than 16 characters.
|
|||||||
When the date or the time zone changes, the next run stores the original at its
|
When the date or the time zone changes, the next run stores the original at its
|
||||||
new path and leaves the old copy where it is.
|
new path and leaves the old copy where it is.
|
||||||
|
|
||||||
|
A file deleted in Ente keeps its original at its save path, and the JSON beside
|
||||||
|
it. The next run removes its symlinks from the collection directories.
|
||||||
|
|
||||||
The library gives the same path as `photo.savePath` and writes it with
|
The library gives the same path as `photo.savePath` and writes it with
|
||||||
`photo.download()` (see "A photo's content").
|
`photo.download()` (see "A photo's content").
|
||||||
|
|
||||||
@@ -1771,6 +1780,8 @@ standard. The others are additions to it.
|
|||||||
`package.json` declares (`main`, `types`, `bin`) were written, and make the
|
`package.json` declares (`main`, `types`, `bin`) were written, and make the
|
||||||
command line executable.
|
command line executable.
|
||||||
- `script/version`: print the version `script/build` stamps (see "Version").
|
- `script/version`: print the version `script/build` stamps (see "Version").
|
||||||
|
- `script/build-bin`: run `script/build`, then bundle the built `dist/` into one
|
||||||
|
binary, `bin/quak`, with bun (see "Running the backup from cron").
|
||||||
- `script/test`: run the test suite, by building the `test` phase of the
|
- `script/test`: run the test suite, by building the `test` phase of the
|
||||||
`Dockerfile`. Requires Docker.
|
`Dockerfile`. Requires Docker.
|
||||||
- `script/lint`: run eslint and a prettier check, by building the `lint` phase
|
- `script/lint`: run eslint and a prettier check, by building the `lint` phase
|
||||||
@@ -1799,8 +1810,7 @@ The Makefile targets are:
|
|||||||
- `make build`: runs `script/build`.
|
- `make build`: runs `script/build`.
|
||||||
- `make docker`: runs `script/docker`.
|
- `make docker`: runs `script/docker`.
|
||||||
- `make hooks`: runs `script/install-precommit`.
|
- `make hooks`: runs `script/install-precommit`.
|
||||||
- `make build-bin`: bundles the built `dist/` into one binary, `bin/quak`. It
|
- `make build-bin`: runs `script/build-bin`.
|
||||||
runs bun through `nix-shell -p bun`.
|
|
||||||
- `make install`: runs `make build-bin` and copies the binary to `~/bin/quak`.
|
- `make install`: runs `make build-bin` and copies the binary to `~/bin/quak`.
|
||||||
- `make dev`: runs the TypeScript compiler in watch mode.
|
- `make dev`: runs the TypeScript compiler in watch mode.
|
||||||
- `make clean`: removes `dist/`, `coverage/`, `.vitest-cache/` and the
|
- `make clean`: removes `dist/`, `coverage/`, `.vitest-cache/` and the
|
||||||
@@ -1908,9 +1918,11 @@ These apply to people and to coding agents alike.
|
|||||||
- container images by digest;
|
- container images by digest;
|
||||||
- the nvm archive `script/bootstrap` downloads, and the Python packages
|
- the nvm archive `script/bootstrap` downloads, and the Python packages
|
||||||
`bin/clip-keyword-vectors` installs, by SHA-256 hash;
|
`bin/clip-keyword-vectors` installs, by SHA-256 hash;
|
||||||
|
- bun's glibc and musl builds, which `script/build-bin` downloads on Linux,
|
||||||
|
by SHA-256 hash;
|
||||||
- Node and yarn, when `script/bootstrap` installs them, by version.
|
- Node and yarn, when `script/bootstrap` installs them, by version.
|
||||||
- Not pinned:
|
- Not pinned:
|
||||||
- bun, which `make build-bin` takes from `nix-shell -p bun`;
|
- bun on macOS, which `script/build-bin` takes from `nix-shell -p bun`;
|
||||||
- `make` and `git`, which `script/bootstrap` installs from the system
|
- `make` and `git`, which `script/bootstrap` installs from the system
|
||||||
package manager when they are missing, as every `Dockerfile` stage does;
|
package manager when they are missing, as every `Dockerfile` stage does;
|
||||||
- `bash` and `curl`, which `script/bootstrap` installs the same way when it
|
- `bash` and `curl`, which `script/bootstrap` installs the same way when it
|
||||||
|
|||||||
@@ -123,7 +123,6 @@ program
|
|||||||
.description("Download and decrypt a single file")
|
.description("Download and decrypt a single file")
|
||||||
.argument("<fileID>", "File ID (from `quak files`)")
|
.argument("<fileID>", "File ID (from `quak files`)")
|
||||||
.option("--out <path>", "Output file path")
|
.option("--out <path>", "Output file path")
|
||||||
.option("--collection <id>", "Accepted for compatibility; ignored")
|
|
||||||
.action((fileID: string, opts: { out?: string }) =>
|
.action((fileID: string, opts: { out?: string }) =>
|
||||||
run(getCommand(context(), fileID, opts)),
|
run(getCommand(context(), fileID, opts)),
|
||||||
);
|
);
|
||||||
@@ -133,7 +132,6 @@ program
|
|||||||
.description("Download and decrypt a thumbnail")
|
.description("Download and decrypt a thumbnail")
|
||||||
.argument("<fileID>", "File ID (from `quak files`)")
|
.argument("<fileID>", "File ID (from `quak files`)")
|
||||||
.option("--out <path>", "Output file path")
|
.option("--out <path>", "Output file path")
|
||||||
.option("--collection <id>", "Accepted for compatibility; ignored")
|
|
||||||
.action((fileID: string, opts: { out?: string }) =>
|
.action((fileID: string, opts: { out?: string }) =>
|
||||||
run(getThumbCommand(context(), fileID, opts)),
|
run(getThumbCommand(context(), fileID, opts)),
|
||||||
);
|
);
|
||||||
|
|||||||
Executable
+73
@@ -0,0 +1,73 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
# script/build-bin: run script/build, then bundle the built dist/ into one
|
||||||
|
# executable, bin/quak, which reports the version script/build stamped. Our own
|
||||||
|
# extension to scripts-to-rule-them-all.
|
||||||
|
#
|
||||||
|
# bun compiles the binary from a copy of its own executable. On Linux, nix's
|
||||||
|
# bun loads through a C library in the nix store, and so does a binary compiled
|
||||||
|
# from it. nix-collect-garbage can delete that library, and the binary then no
|
||||||
|
# longer starts. On Linux this script therefore compiles with bun's own release
|
||||||
|
# build, which loads through the system's C library. It downloads that build
|
||||||
|
# and checks it against the hash below before running it.
|
||||||
|
set -eu
|
||||||
|
|
||||||
|
ROOT="$(cd "$(dirname "$0")/.." && pwd -P)"
|
||||||
|
|
||||||
|
# bun 1.3.13, 2026-11-11, and the SHA-256 of each release archive below. The
|
||||||
|
# x86-64 archives are the baseline builds, which also run on CPUs without AVX2.
|
||||||
|
# The musl archives are for Linux systems that use the musl C library, such as
|
||||||
|
# Alpine.
|
||||||
|
BUN_VERSION="1.3.13"
|
||||||
|
BUN_LINUX_X64_BASELINE_SHA256="9d8a24292a7068090205daac0a5a223f5f69736f5287e37bf88d3b4031edc750"
|
||||||
|
BUN_LINUX_X64_MUSL_BASELINE_SHA256="88ca7c7ad235b498f549eea2f770f434e9f0f5e9ba95168a2d3a1f235184c394"
|
||||||
|
BUN_LINUX_AARCH64_SHA256="70bae41b3908b0a120e1e58c5c8af30e74afae3b8d11b0d3fdd8e787ddfb4b22"
|
||||||
|
BUN_LINUX_AARCH64_MUSL_SHA256="5385e978107ce4934298d8d6afe9bfbb898683f6cc23e6753a0da60bc60c5b81"
|
||||||
|
|
||||||
|
# compile_with_downloaded_bun <archive-name> <sha256>
|
||||||
|
compile_with_downloaded_bun() {
|
||||||
|
tmp="$(mktemp -d)"
|
||||||
|
trap 'rm -rf "$tmp"' EXIT
|
||||||
|
curl -fsSL -o "$tmp/$1.zip" \
|
||||||
|
"https://github.com/oven-sh/bun/releases/download/bun-v$BUN_VERSION/$1.zip"
|
||||||
|
echo "$2 $tmp/$1.zip" | sha256sum -c -
|
||||||
|
unzip -q "$tmp/$1.zip" -d "$tmp"
|
||||||
|
"$tmp/$1/bun" build dist/bin/quak.js --compile --outfile bin/quak
|
||||||
|
}
|
||||||
|
|
||||||
|
main() {
|
||||||
|
cd "$ROOT"
|
||||||
|
"$ROOT/script/build"
|
||||||
|
platform="$(uname -s)-$(uname -m)"
|
||||||
|
# musl's ldd begins its version output with "musl libc"; glibc's does not.
|
||||||
|
if ldd --version 2>&1 | grep -q '^musl libc'; then
|
||||||
|
platform="$platform-musl"
|
||||||
|
fi
|
||||||
|
case "$platform" in
|
||||||
|
Linux-x86_64)
|
||||||
|
compile_with_downloaded_bun bun-linux-x64-baseline \
|
||||||
|
"$BUN_LINUX_X64_BASELINE_SHA256"
|
||||||
|
;;
|
||||||
|
Linux-x86_64-musl)
|
||||||
|
compile_with_downloaded_bun bun-linux-x64-musl-baseline \
|
||||||
|
"$BUN_LINUX_X64_MUSL_BASELINE_SHA256"
|
||||||
|
;;
|
||||||
|
Linux-aarch64)
|
||||||
|
compile_with_downloaded_bun bun-linux-aarch64 \
|
||||||
|
"$BUN_LINUX_AARCH64_SHA256"
|
||||||
|
;;
|
||||||
|
Linux-aarch64-musl)
|
||||||
|
compile_with_downloaded_bun bun-linux-aarch64-musl \
|
||||||
|
"$BUN_LINUX_AARCH64_MUSL_SHA256"
|
||||||
|
;;
|
||||||
|
Linux-*)
|
||||||
|
echo "build-bin: bun has no release build for Linux on $(uname -m)" >&2
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
nix-shell -p bun --run \
|
||||||
|
"bun build dist/bin/quak.js --compile --outfile bin/quak"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
|
main "$@"
|
||||||
+14
-2
@@ -1,8 +1,9 @@
|
|||||||
/**
|
/**
|
||||||
* Tests for the retry options `bin/quak.ts` loads the saved session with
|
* Tests for the retry options `bin/quak.ts` loads the saved session with
|
||||||
* (`quak backup` gets the unattended ones, every other command the default),
|
* (`quak backup` gets the unattended ones, every other command the default),
|
||||||
* each with the callbacks that log its requests and retries, and for
|
* each with the callbacks that log its requests and retries, for `quak files`
|
||||||
* `quak files` taking its collection ID as an optional argument.
|
* taking its collection ID as an optional argument, and for `quak get` and
|
||||||
|
* `quak get-thumb` refusing `--collection`.
|
||||||
*
|
*
|
||||||
* Each test runs `bin/quak.ts`, as the smoke test does, with its session loader
|
* Each test runs `bin/quak.ts`, as the smoke test does, with its session loader
|
||||||
* replaced by one that records the options it is given and reports no session,
|
* replaced by one that records the options it is given and reports no session,
|
||||||
@@ -105,3 +106,14 @@ describe("bin/quak.ts files", () => {
|
|||||||
expect(await quak("files", "7")).toMatch(/^Not logged in/);
|
expect(await quak("files", "7")).toMatch(/^Not logged in/);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe("bin/quak.ts get and get-thumb", () => {
|
||||||
|
it.each(["get", "get-thumb"])(
|
||||||
|
"%s refuses --collection as an unknown option",
|
||||||
|
async (command) => {
|
||||||
|
expect(await quak(command, "1", "--collection", "2")).toMatch(
|
||||||
|
/^error: unknown option '--collection'/,
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
});
|
||||||
@@ -569,14 +569,14 @@ describe("files", () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
describe("get and get-thumb", () => {
|
describe("get and get-thumb", () => {
|
||||||
it("get finds a file in any album without --collection", async () => {
|
it("get finds a file in any album", async () => {
|
||||||
const out = join(root, "diagram.png");
|
const out = join(root, "diagram.png");
|
||||||
expect(await getCommand(context(), "200", { out })).toBe(0);
|
expect(await getCommand(context(), "200", { out })).toBe(0);
|
||||||
expect(readFileSync(out)).toEqual(Buffer.alloc(7, 200));
|
expect(readFileSync(out)).toEqual(Buffer.alloc(7, 200));
|
||||||
expect(stderr.text).toBe(`7 bytes -> ${out}\n`);
|
expect(stderr.text).toBe(`7 bytes -> ${out}\n`);
|
||||||
});
|
});
|
||||||
|
|
||||||
it("get-thumb finds a file in any album without --collection", async () => {
|
it("get-thumb finds a file in any album", async () => {
|
||||||
const out = join(root, "thumb.jpg");
|
const out = join(root, "thumb.jpg");
|
||||||
expect(await getThumbCommand(context(), "200", { out })).toBe(0);
|
expect(await getThumbCommand(context(), "200", { out })).toBe(0);
|
||||||
expect(readFileSync(out)).toEqual(Buffer.alloc(3, 200));
|
expect(readFileSync(out)).toEqual(Buffer.alloc(3, 200));
|
||||||
|
|||||||
Reference in new issue
Block a user