Move to SQLx

.cargo/config.toml

@@ -0,0 +1,2 @@
+[build]
+rustflags = ["--cfg", "tokio_unstable"]

.github/workflows/ci.yml

@@ -21,6 +21,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Install `nasm`
+        run: sudo apt-get install yasm -y
+
       - name: Set up Rust toolchain
         uses: actions-rs/toolchain@v1
         with:
@@ -72,14 +75,4 @@ jobs:
         run: cargo nextest run
 
       - name: Run doctests
-        run: cargo test --doc
-
-
-
-  test_semver:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Check semver
-        uses: obi1kenobi/cargo-semver-checks-action@v2
+        run: cargo test --doc

.gitignore

@@ -1,6 +1,6 @@
 /target
-raves_media_info.db/
-raves_thumbnails.db/
+**.db
+**.sqlite
 Cargo.lock
 _BACKUP_BEFORE_MERGING_MEDIA_AND_RECORD/
 build/

Cargo.toml

@@ -37,6 +37,13 @@ image = "0.25.2"
 infer = "0.16.0"
 mp4parse = "0.17.0"
 matroska = "0.27.0"
+camino = { version = "1.1.9", features = ["serde", "serde1"] }
+sqlx = { version = "0.8.3", features = ["sqlite", "chrono", "json", "macros", "uuid", "runtime-tokio"] }
+chrono = { version = "0.4.39", features = ["serde"] }
+constcat = "0.5.1"
+uuid = { version = "1.12.0", features = ["v4", "serde"] }
+avif-parse = "1.3.2"
+blake3 = { version = "1.5.5", features = ["mmap", "rayon"] }
 # crc32fast = "1.4.2"
 
 # sys dependencies
@@ -51,15 +58,10 @@ branch = "master"
 # features = ["build", "static"]
 features = ["build"]
 
-
-[dependencies.surrealdb]
-package = "surrealdb-nightly"
-version = "2.0.20240903"
-default-features = true
-features = ["kv-surrealkv"]
-
 [dev-dependencies]
 async-ctrlc = "1.2.0"
 clap = { version = "4.5.17", features = ["derive"] }
 tracing-subscriber = "0.3.18"
 dirs = "5.0.1"
+anyhow = "1.0.95"
+console-subscriber = "0.4.1"

README.md

@@ -40,6 +40,9 @@ Under active development.
             - If we go the route of having People (i.e. machine learning), we should be able to associate folks with their tags.
             - If a person is named "Barrett", allow users to associate them with the "barrett" tag (or any other).
                 - for UI: warn on low overlap.
+        - [ ] Recommended people tags
+            - When they know someone is often involved with other tags, a user can add tags to show up by default.
+            - ex: Dad has "family", "home", "overweight", etc.
     - [ ] Search
         - You should be able to search the database for virtually anything.
     - [ ] Cleanup
@@ -50,4 +53,15 @@ Under active development.
             - Locked media should only have some attributes locked, if even necessary at all. (i.e. the queue isn't running multiple things at once)
             - How does this affect search/navigation?
 
+## Usage
+
+You'll want to do three things when using this library in the app:
+
+1. Setup logging to see the library's messages. (`tracing_subscriber`)
+1. Make or load a configuration for the library. (`config::CONFIG`)
+2. Use `database::DB_FOLDER_PATH.set(<path>)` to say where the database is (or will be) located.
+3. Start the file watcher with `Watch::watch()`.
+
+It's important that these tasks are performed **before** using the library. Otherwise, the backend will not be correctly initialized, and bugs may result.
+
 <!-- cargo-rdme end -->

build.rs

@@ -0,0 +1,5 @@
+// generated by `sqlx migrate build-script`
+fn main() {
+    // trigger recompilation when a new migration is added
+    println!("cargo:rerun-if-changed=migrations");
+}

examples/kamadak_dump_exif.rs

@@ -0,0 +1,29 @@
+use std::env;
+use std::fs::File;
+use std::io::BufReader;
+use std::path::{Path, PathBuf};
+
+fn main() {
+    for path in env::args_os().skip(1).map(PathBuf::from) {
+        dump_file(&path);
+    }
+}
+
+fn dump_file(path: &Path) {
+    let file = File::open(path).unwrap();
+
+    // To parse with continue-on-error mode:
+    let exif = kamadak_exif::Reader::new()
+        .read_from_container(&mut BufReader::new(&file))
+        .unwrap();
+    println!("{}", path.display());
+    for f in exif.fields() {
+        println!(
+            "  {}/{}: {}",
+            f.ifd_num.index(),
+            f.tag,
+            f.display_value().with_unit(&exif)
+        );
+        println!("      {:?}", f.value);
+    }
+}

examples/query.rs

@@ -1,16 +1,21 @@
 //! Let's see if we can chain query method calls...
 
-use std::ffi::OsString;
-
 use backdrop::{
-    database::RavesDb,
-    models::{media::Media, metadata::types::Orientation},
+    database::DATABASE,
+    models::media::{
+        metadata::{Orientation, Resolution},
+        Media,
+    },
 };
+use camino::Utf8PathBuf;
 
 #[tokio::main]
 async fn main() {
-    let db = RavesDb::connect().await.unwrap();
-    let all: Vec<Media> = db.media_info.select("info").await.unwrap();
+    let mut conn = DATABASE.acquire().await.expect("db conn");
+    let all = sqlx::query_as::<_, Media>("SELECT * FROM info")
+        .fetch_all(&mut *conn)
+        .await
+        .unwrap();
 
     // SEARCH: all media where:
     // - orientation is portrait,
@@ -20,20 +25,18 @@ async fn main() {
         .iter()
         .filter(|m| {
             matches!(
-                Orientation::from(m.metadata.resolution.clone()),
+                Orientation::from(Resolution::new(m.width_px, m.height_px)),
                 Orientation::Portrait
             )
         })
         .filter(|m| {
-            m.metadata
-                .path
+            Utf8PathBuf::from(&m.path)
                 .file_name()
-                .unwrap_or(OsString::new().as_os_str())
-                .to_string_lossy()
+                .unwrap_or_default()
                 .to_string()
                 .contains(('0'..='9').collect::<Vec<_>>().as_slice())
         })
-        .filter(|m| m.metadata.resolution.width > 1920 && m.metadata.resolution.height > 1080)
+        .filter(|m| m.width_px > 1920 && m.height_px > 1080)
         .collect::<Vec<_>>();
 
     println!("found results: {:#?}", executed_search);