Use ON CONFLICT upsert for genres

Replace the previous IF EXISTS/UPDATE/INSERT logic in the update_genre
PL/pgSQL function with a single INSERT ... ON CONFLICT DO UPDATE to
perform an atomic upsert and avoid races. Reformat the client.execute
call for readability.

.github/workflows/rust-clippy.yml

@@ -28,7 +28,7 @@ jobs:
       actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Install Rust toolchain
         uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af #@v1
@@ -49,7 +49,7 @@ jobs:
         continue-on-error: true
 
       - name: Upload analysis results to GitHub
-        uses: github/codeql-action/upload-sarif@v3
+        uses: github/codeql-action/upload-sarif@v4
         with:
           sarif_file: rust-clippy-results.sarif
           wait-for-processing: true

.gitignore

@@ -1,2 +1,3 @@
 /target
-.vscode
+/.vscode
+/bruno

Cargo.lock

@@ -180,9 +180,9 @@ dependencies = [
 
 [[package]]
 name = "ammonia"
-version = "4.1.1"
+version = "4.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6b346764dd0814805de8abf899fe03065bcee69bb1a4771c785817e39f3978f"
+checksum = "17e913097e1a2124b46746c980134e8c954bc17a6a59bb3fde96f088d126dde6"
 dependencies = [
  "cssparser",
  "html5ever",

Cargo.toml

@@ -35,7 +35,7 @@ serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.140"
 tokio-cron-scheduler = "0.14.0"
 axum = "0.8.1"
-ammonia = "4.0.0"
+ammonia = "4.1.2"
 maplit = "1.0.2"
 
 tracing = "0.1.41"

src/types.rs

@@ -828,30 +828,28 @@ impl FromVecExpression<Genre> for Genre {
 #[async_trait]
 impl Update for Genre {
     async fn before_update(client: &Client) -> Result<(), Box<tokio_postgres::Error>> {
-        match client.execute(
-            "
-            CREATE OR REPLACE FUNCTION update_book_sequence(source_ smallint, book_ integer, genre_ integer) RETURNS void AS $$
-                DECLARE
-                    book_id integer := -1;
-                    genre_id integer := -1;
+        match client
+            .execute(
+                "
+            CREATE OR REPLACE FUNCTION update_genre(
+                source_ smallint, remote_id_ int, code_ varchar, description_ varchar, meta_ varchar
+            ) RETURNS void AS $$
                 BEGIN
-                    SELECT id INTO book_id FROM books WHERE source = source_ AND remote_id = book_;
-
-                    IF book_id IS NULL THEN
-                        RETURN;
-                    END IF;
-
-                    SELECT id INTO genre_id FROM genres WHERE source = source_ AND remote_id = genre_;
-                    IF EXISTS (SELECT * FROM book_genres WHERE book = book_id AND genre = genre_id) THEN
-                        RETURN;
-                    END IF;
-                    INSERT INTO book_genres (book, genre) VALUES (book_id, genre_id);
+                    INSERT INTO genres (source, remote_id, code, description, meta)
+                        VALUES (source_, remote_id_, code_, description_, meta_)
+                    ON CONFLICT (source, remote_id) DO UPDATE SET
+                        code = EXCLUDED.code,
+                        description = EXCLUDED.description,
+                        meta = EXCLUDED.meta;
                 END;
             $$ LANGUAGE plpgsql;
-            "
-            , &[]).await {
-                Ok(_) => Ok(()),
-                Err(err) => Err(Box::new(err)),
+            ",
+                &[],
+            )
+            .await
+        {
+            Ok(_) => Ok(()),
+            Err(err) => Err(Box::new(err)),
         }
     }
 

src/updater.rs

@@ -55,7 +55,7 @@ async fn download_file(filename_str: &str) -> Result<(), Box<dyn std::error::Err
 
     let data = response
         .bytes_stream()
-        .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))
+        .map_err(std::io::Error::other)
         .into_async_read();
 
     let decoder = GzipDecoder::new(data);