diff --git a/.github/workflows/update-ytdlp.yml b/.github/workflows/update-ytdlp.yml deleted file mode 100644 index 3b9a921..0000000 --- a/.github/workflows/update-ytdlp.yml +++ /dev/null @@ -1,51 +0,0 @@ -name: Update yt-dlp - -on: - schedule: - - cron: '0 6 * * 1' # Every Monday at 06:00 UTC - workflow_dispatch: - -jobs: - update: - runs-on: ubuntu-latest - permissions: - contents: write - pull-requests: write - - steps: - - uses: actions/checkout@v4 - - - uses: DeterminateSystems/nix-installer-action@main - - - uses: DeterminateSystems/magic-nix-cache-action@main - - - name: Get current yt-dlp version - id: before - run: | - rev=$(jq -r '.nodes.nixpkgs.locked.rev' flake.lock) - version=$(nix eval --raw "github:nixos/nixpkgs/${rev}#yt-dlp.version") - echo "version=${version}" >> "$GITHUB_OUTPUT" - - - name: Update nixpkgs - run: nix flake update nixpkgs - - - name: Get new yt-dlp version - id: after - run: | - rev=$(jq -r '.nodes.nixpkgs.locked.rev' flake.lock) - version=$(nix eval --raw "github:nixos/nixpkgs/${rev}#yt-dlp.version") - echo "version=${version}" >> "$GITHUB_OUTPUT" - - - name: Open PR if yt-dlp was updated - if: steps.before.outputs.version != steps.after.outputs.version - uses: peter-evans/create-pull-request@v6 - with: - branch: auto/yt-dlp-update - delete-branch: true - commit-message: "chore: yt-dlp ${{ steps.before.outputs.version }} → ${{ steps.after.outputs.version }}" - title: "chore: yt-dlp ${{ steps.before.outputs.version }} → ${{ steps.after.outputs.version }}" - body: | - Automated `flake.lock` update. yt-dlp bumped from `${{ steps.before.outputs.version }}` to `${{ steps.after.outputs.version }}`. - - Triggered by the weekly nixpkgs check. - labels: dependencies diff --git a/.gitignore b/.gitignore index 478a663..2f797ce 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,6 @@ * !.gitignore -!.github/ -!.github/** !docs/ !docs/LICENSE @@ -20,7 +18,6 @@ !Cargo.lock !ARCHIVR-MENTAL-MODEL.md !NEXT.md -!AGENTS.md !Dockerfile !.dockerignore diff --git a/AGENTS.md b/AGENTS.md deleted file mode 100644 index 838e4ca..0000000 --- a/AGENTS.md +++ /dev/null @@ -1,97 +0,0 @@ -# Repository Guidelines - -## Project Overview - -Archivr is a self-hosted archival tool that captures and preserves digital content — YouTube/Twitter/Instagram/TikTok/Reddit posts, arbitrary URLs, full web pages (via SingleFile + Chromium), and local files — into self-contained, SQLite-backed archive directories with blob deduplication, hierarchical tags, collections, and role-based auth. Rust workspace + React frontend. - -Read `ARCHIVR-MENTAL-MODEL.md` before making structural changes; `NEXT.md` tracks the roadmap (Tracks 1–7 done, Track 8 = Collections UI is next). - -## Architecture & Data Flow - -Three crates with a strict ownership split — **core owns truth; CLI and server are adapters**: - -- `crates/archivr-core` — domain library: capture orchestration, SQLite schema/CRUD, downloaders, hashing. New archive features start here. -- `crates/archivr-server` — Axum HTTP API + auth + static frontend serving. -- `crates/archivr-cli` — clap-based CLI (`archivr` binary): `init`, `archive` subcommands. - -Capture flow: locator → `determine_source()` (`crates/archivr-core/src/capture.rs`) routes by platform/shorthand (`yt:`, `x:`, `tweet:` …) → platform downloader (`downloader/ytdlp.rs`, `tweets.rs`, `singlefile.rs`, `http.rs`, `local.rs`) stages into `temp/` → SHA3-256 dedup (`hash.rs`, `downloader/store.rs`) moves blobs to `raw/A/B/HASH.EXT` → rows written to `archivr.sqlite` (runs, entries, artifacts, blobs) → served via `/api/archives/:id/...`. - -Per-archive layout (created by `archivr init`): `.archivr/` (name, store_path, `archivr.sqlite`) + sibling `store/` (`raw/`, `raw_tweets/`, `structured/`, `temp/`). Server-level auth lives in a **separate** `archivr-auth.sqlite` (users, sessions, API tokens, role bits GUEST=1/USER=2/ADMIN=4/OWNER=8). - -The server mounts multiple archives from a TOML registry (`crates/archivr-server/src/registry.rs`); routes are parameterized by `:archive_id`. - -## Key Directories - -| Path | Purpose | -|---|---| -| `crates/archivr-core/src/` | Domain logic: `capture.rs`, `archive.rs`, `database.rs` (~2700 lines, all schema/CRUD), `downloader/` | -| `crates/archivr-server/src/` | `main.rs` (bootstrap), `routes.rs` (~3000 lines: AppState, handlers, middleware), `auth.rs`, `registry.rs` | -| `crates/archivr-cli/src/` | CLI entry point | -| `frontend/src/` | React app: `App.jsx` (root state + custom routing), `api.js` (fetch client), `components/`, `styles.css` | -| `docs/` | User docs (`README.md`), `superpowers/plans/` and `superpowers/specs/` (dated design docs — write plans there before large features) | -| `modules/nixos/` | NixOS module (`services.archivr-server`) | -| `vendor/twitter/` | Vendored Twitter scraper (active; the Python the server shells out to). Don't refactor casually. | -| `testing/` | Legacy scraping scripts + sample data. `testing/creds.txt` holds real tokens — never read, commit, or print it. | - -## Development Commands - -```bash -# Rust -cargo build # whole workspace -cargo test # all unit tests -cargo test -p archivr-core # single crate -cargo build --release -p archivr-server - -# Frontend (Bun, from frontend/) -bun install -bun run dev # Vite dev server -bun run build # → ../crates/archivr-server/static (served by the server) -bun run storybook # Storybook on :6006 - -# Nix -nix develop # devshell: yt-dlp, nushell, uv, twitter-api-client -nix build .#archivr-server # also .#archivr-cli, .#archivr-all - -# Docker -docker compose up -d # port 8080; config in ./config/archivr-server.toml (see docker/config.example.toml) - -# Run server locally -cargo run -p archivr-server -- path/to/archivr-server.toml -``` - -No CI is configured; no rustfmt.toml/clippy.toml — default `cargo fmt`/`clippy` settings apply. - -## Code Conventions & Common Patterns - -- **Errors**: `anyhow::Result` everywhere in core; no custom error enums. The server converts to `ApiError { status, message }` (`routes.rs`) with helpers `not_found`/`bad_request`/`unauthorized`/`forbidden`; any `anyhow` error maps to 500. -- **Async**: Tokio only at the server boundary (`#[tokio::main]`, async handlers, `tokio::spawn` for the 24h session-cleanup task). **Core is synchronous** — blocking `reqwest`, subprocess downloaders, sync `rusqlite`. Keep it that way; don't introduce async into archivr-core. -- **State**: Axum `AppState { registry, auth_db_path, login_attempts }` via `State` extractor; middleware stack = `setup_guard` (503 until owner exists) → `login_rate_limit` (5/15min per IP) → `security_headers`. -- **Auth extraction**: `AuthUser` implements `FromRequestParts` — session cookie (`session`) or `Authorization: Bearer` token (stored SHA3-256-hashed). Passwords are Argon2. -- **Logging**: `eprintln!` with `info:`/`warn:` prefixes. No `tracing`/`log` — don't add structured logging piecemeal. -- **External tools by env var**: `ARCHIVR_YT_DLP`, `ARCHIVR_CHROME`, `ARCHIVR_SINGLE_FILE`, `ARCHIVR_TWEET_PYTHON`, `ARCHIVR_TWEET_SCRAPER`, `ARCHIVR_STATIC_DIR`, `ARCHIVR_BIND`. Downloaders shell out to subprocesses; resolve binaries through these vars. -- **Frontend**: JSX (no TypeScript), PascalCase components in `frontend/src/components/`, kebab-case CSS classes, plain CSS with custom properties in `styles.css` (no Tailwind/CSS-in-JS). No router — `App.jsx` parses `window.location.pathname` + `history.pushState`. State = `useState` + one `AuthContext`; `sessionStorage` for refresh-resilient dialog state (see `CaptureDialog.jsx` job polling, 500ms). All API calls through `frontend/src/api.js` with relative `/api/*` URLs — add new endpoints there, not inline `fetch`. -- **Naming (Rust)**: standard snake_case/PascalCase; visibility and roles are bitflag `u32`s, not enums. - -## Important Files - -- `crates/archivr-server/src/main.rs` — server bootstrap: config load, archive mounting, auth DB init, stalled-job recovery (running → failed on startup). -- `crates/archivr-server/src/routes.rs` — all HTTP handlers and the router; grep here first for API work. -- `crates/archivr-core/src/capture.rs` — `perform_capture()`, `Source` enum, shorthand parsing. -- `crates/archivr-core/src/database.rs` — single source of truth for all SQLite schema and queries (both archive and auth DBs). -- `frontend/src/App.jsx` / `frontend/src/api.js` — frontend root state and API surface. -- `docker/config.example.toml` — server config schema: `bind`, `auth_db_path`, repeated `[[archives]]` (`id`, `label`, `archive_path`). -- `flake.nix`, `modules/nixos/archivr-server.nix`, `Dockerfile`, `docker-compose.yml` — deployment surfaces; config schema changes must be reflected in all of them plus `docs/README.md`. - -## Runtime/Tooling Preferences - -- **Rust edition 2024** (root `Cargo.toml`); shared deps live in `[workspace.dependencies]` — add new deps there and reference with `workspace = true`. -- **Bun** is the frontend package manager (`frontend/bun.lock`); use `bun`, not npm/yarn. -- Runtime binaries the app expects on PATH or via env vars: `yt-dlp`, Chromium, `single-file` (Node), Python 3 with `twitter-api-client`, `ffmpeg`. `nix develop` provides the dev subset. -- `.gitignore` is **default-deny with an allowlist** — new top-level files/dirs are invisible to git until explicitly allowed there. -- Frontend build output (`crates/archivr-server/static/`) is generated; never hand-edit it. - -## Testing & QA - -- **Rust**: unit tests only, in `#[cfg(test)]` modules inside source files (e.g. `capture.rs`, `database.rs`, `registry.rs`, `routes.rs`, `hash.rs`). No `tests/` integration dir. Patterns: `tempfile` for scratch archives, config round-trip assertions, regex/parser validation. Run `cargo test` or `cargo test -p `. -- **Frontend**: no test framework. Storybook (`bun run storybook`) is the component QA surface — stories are colocated `*.stories.jsx` files; add one when adding a nontrivial component. -- Manual smoke test for server changes: build frontend, `cargo run -p archivr-server -- `, exercise `/api/*`. diff --git a/crates/archivr-core/src/capture.rs b/crates/archivr-core/src/capture.rs index 0e8f932..ff6e0a6 100644 --- a/crates/archivr-core/src/capture.rs +++ b/crates/archivr-core/src/capture.rs @@ -977,29 +977,6 @@ pub fn perform_capture( // Sources, for which yt-dlp is needed let requested_locator = locator.to_string(); let path = expand_shorthand_to_url(locator, &source); - // Fetch yt-dlp metadata before downloading — separate invocation - // because --dump-json is a simulate flag that suppresses the download. - let ytdlp_metadata_json: Option = match source { - Source::YouTubeVideo - | Source::X - | Source::Instagram - | Source::Facebook - | Source::TikTok - | Source::Reddit - | Source::Snapchat => downloader::ytdlp::fetch_metadata(&path), - _ => None, - }; - - let local_filename_title: Option = match source { - Source::Local => { - // path is a file:// URI; strip the scheme and take the last component. - let file_path = path.trim_start_matches("file://"); - std::path::Path::new(file_path) - .file_name() - .map(|n| n.to_string_lossy().into_owned()) - } - _ => None, - }; let hash = match source { Source::YouTubeVideo @@ -1070,19 +1047,6 @@ pub fn perform_capture( let _ = fs::remove_dir_all(store_path.join("temp").join(×tamp)); } - let entry_title: Option = if let Some(json) = &ytdlp_metadata_json { - let metadata = downloader::metadata::extract_from_ytdlp_json(json); - Some(generate_entry_title(source, &metadata)) - } else if let Some(filename) = local_filename_title { - let metadata = PlatformMetadata { - title: Some(filename), - ..Default::default() - }; - Some(generate_entry_title(source, &metadata)) - } else { - None - }; - let media_entry = record_media_entry( &conn, store_path, @@ -1095,7 +1059,7 @@ pub fn perform_capture( &hash, &file_extension, byte_size, - entry_title, + None, // title — populated in a later task )?; database::refresh_entry_cached_bytes(&conn, media_entry.id)?; database::finish_archive_run(&conn, run.id)?; diff --git a/crates/archivr-core/src/downloader/ytdlp.rs b/crates/archivr-core/src/downloader/ytdlp.rs index 3cacb98..ba053ee 100644 --- a/crates/archivr-core/src/downloader/ytdlp.rs +++ b/crates/archivr-core/src/downloader/ytdlp.rs @@ -35,8 +35,8 @@ pub fn download(path: String, store_path: &Path, timestamp: &String) -> Result Option { let ytdlp = std::env::var("ARCHIVR_YT_DLP").unwrap_or_else(|_| "yt-dlp".to_string()); @@ -47,8 +47,6 @@ pub fn fetch_metadata(path: &str) -> Option { .ok()?; if !out.status.success() { - let stderr = String::from_utf8_lossy(&out.stderr); - eprintln!("yt-dlp --dump-json failed for {path} (status {:?}): {stderr}", out.status); return None; } diff --git a/flake.lock b/flake.lock index 6492c26..d406848 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1782723713, - "narHash": "sha256-oPXCU/SSUokcGaJREHibG1CBX3+s/W7orDWQOZDsEeQ=", + "lastModified": 1761672384, + "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b5aa0fbd538984f6e3d201be0005b4463d8b09f8", + "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c", "type": "github" }, "original": {