Update diesel-async to 0.5.0, msrv bump

Cargo.lock

@@ -753,6 +753,41 @@ dependencies = [
  "typenum",
 ]
 
+[[package]]
+name = "darling"
+version = "0.20.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.20.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim",
+ "syn 2.0.71",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.20.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn 2.0.71",
+]
+
 [[package]]
 name = "dashmap"
 version = "6.0.1"
@@ -816,9 +851,9 @@ dependencies = [
 
 [[package]]
 name = "diesel"
-version = "2.1.6"
+version = "2.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff236accb9a5069572099f0b350a92e9560e8e63a9b8d546162f4a5e03026bb2"
+checksum = "bf97ee7261bb708fa3402fa9c17a54b70e90e3cb98afb3dc8999d5512cb03f94"
 dependencies = [
  "bitflags 2.6.0",
  "byteorder",
@@ -831,9 +866,9 @@ dependencies = [
 
 [[package]]
 name = "diesel-async"
-version = "0.4.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acada1517534c92d3f382217b485db8a8638f111b0e3f2a2a8e26165050f77be"
+checksum = "fcb799bb6f8ca6a794462125d7b8983b0c86e6c93a33a9c55934a4a5de4409d3"
 dependencies = [
  "async-trait",
  "bb8",
@@ -858,11 +893,12 @@ dependencies = [
 
 [[package]]
 name = "diesel_derives"
-version = "2.1.4"
+version = "2.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14701062d6bed917b5c7103bdffaee1e4609279e240488ad24e7bd979ca6866c"
+checksum = "d6ff2be1e7312c858b2ef974f5c7089833ae57b5311b334b30923af58e5718d8"
 dependencies = [
  "diesel_table_macro_syntax",
+ "dsl_auto_type",
  "proc-macro2",
  "quote",
  "syn 2.0.71",
@@ -870,9 +906,9 @@ dependencies = [
 
 [[package]]
 name = "diesel_table_macro_syntax"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc5557efc453706fed5e4fa85006fe9817c224c3f480a34c7e5959fd700921c5"
+checksum = "209c735641a413bc68c4923a9d6ad4bcb3ca306b794edaa7eb0b3228a99ffb25"
 dependencies = [
  "syn 2.0.71",
 ]
@@ -894,6 +930,20 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
 
+[[package]]
+name = "dsl_auto_type"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5d9abe6314103864cc2d8901b7ae224e0ab1a103a0a416661b4097b0779b607"
+dependencies = [
+ "darling",
+ "either",
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.71",
+]
+
 [[package]]
 name = "either"
 version = "1.13.0"
@@ -1396,6 +1446,12 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
 [[package]]
 name = "idna"
 version = "0.5.0"
@@ -1955,7 +2011,7 @@ dependencies = [
 
 [[package]]
 name = "pict-rs"
-version = "0.5.17-pre.5"
+version = "0.5.17-pre.3"
 dependencies = [
  "actix-form-data",
  "actix-web",

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "pict-rs"
 description = "A simple image hosting service"
-version = "0.5.17-pre.5"
+version = "0.5.17-pre.3"
 authors = ["asonix <asonix@asonix.dog>"]
 license = "AGPL-3.0"
 readme = "README.md"
@@ -31,8 +31,8 @@ color-eyre = "0.6.3"
 config = { version = "0.14.0", default-features = false, features = ["json", "ron", "toml", "yaml"] }
 console-subscriber = "0.3.0"
 dashmap = "6.0.1"
-diesel = { version = "2.1.6", features = ["postgres_backend", "serde_json", "time", "uuid"] }
-diesel-async = { version = "0.4.1", features = ["bb8", "postgres"] }
+diesel = { version = "2.2.1", features = ["postgres_backend", "serde_json", "time", "uuid"] }
+diesel-async = { version = "0.5.0", features = ["bb8", "postgres"] }
 diesel-derive-enum = { version = "2.1.0", features = ["postgres"] }
 futures-core = "0.3.30"
 hex = "0.4.3"

pict-rs.nix

@@ -11,7 +11,7 @@
 
 rustPlatform.buildRustPackage {
   pname = "pict-rs";
-  version = "0.5.17-pre.5";
+  version = "0.5.17-pre.3";
   src = ./.;
 
   cargoLock = {

releases/0.5.17-pre.4.md

@@ -1,14 +0,0 @@
-# pict-rs 0.5.17-pre.4
-
-pict-rs is a simple image hosting microservice, designed to handle storing and retrieving images,
-animations, and videos, as well as providing basic image processing functionality.
-
-## Overview
-
-pict-rs 0.5.17-pre.4 adds handling for rare cases where variant records exist and refer to missing
-files. These records should now be properly cleaned upon request.
-
-## Upgrade Notes
-
-There are no significant changes from 0.5.17-pre.3. Upgrading should be as simple as pulling a new
-version of pict-rs.

releases/0.5.17-pre.5.md

@@ -1,14 +0,0 @@
-# pict-rs 0.5.17-pre.5
-
-pict-rs is a simple image hosting microservice, designed to handle storing and retrieving images,
-animations, and videos, as well as providing basic image processing functionality.
-
-## Overview
-
-pict-rs 0.5.17-pre.5 fixes a bug in missing variant detection introduced in -pre.4 that made the
-feature essentially do nothing.
-
-## Upgrade Notes
-
-There are no significant changes from 0.5.17-pre.4. Upgrading should be as simple as pulling a new
-version of pict-rs.

src/lib.rs

@@ -842,56 +842,6 @@ async fn not_found_hash(repo: &ArcRepo) -> Result<Option<(Alias, Hash)>, Error>
     Ok(Some((alias, hash)))
 }
 
-async fn exists<S: Store>(store: &S, identifier: &Arc<str>) -> Result<bool, Error> {
-    if let Err(e) = store.len(identifier).await {
-        if e.is_not_found() {
-            return Ok(false);
-        }
-
-        return Err(e.into());
-    }
-
-    Ok(true)
-}
-
-async fn existing_variant_identifier<S: Store>(
-    state: &State<S>,
-    hash: Hash,
-    variant: String,
-) -> Result<Option<Arc<str>>, Error> {
-    let identifier_opt = state
-        .repo
-        .variant_identifier(hash.clone(), variant.clone())
-        .await?;
-
-    if let Some(identifier) = identifier_opt {
-        if !exists(&state.store, &identifier).await? {
-            let clean =
-                if let Some(original_identifier) = state.repo.identifier(hash.clone()).await? {
-                    exists(&state.store, &original_identifier).await?
-                } else {
-                    true
-                };
-
-            if clean {
-                if state.config.server.read_only {
-                    tracing::warn!("Stored variant {variant} for hash {hash:?} doesn't exist");
-                    return Err(UploadError::ReadOnly.into());
-                }
-
-                tracing::warn!("Stored variant {variant} for hash {hash:?} doesn't exist, spawning cleanup job");
-                queue::cleanup_variants(&state.repo, hash, Some(variant)).await?;
-            }
-
-            Ok(None)
-        } else {
-            Ok(Some(identifier))
-        }
-    } else {
-        Ok(None)
-    }
-}
-
 /// Process files
 #[tracing::instrument(name = "Serving processed image", skip(state))]
 async fn process<S: Store + 'static>(
@@ -921,7 +871,10 @@ async fn process<S: Store + 'static>(
             .await?;
     }
 
-    let identifier_opt = existing_variant_identifier(&state, hash.clone(), variant.clone()).await?;
+    let identifier_opt = state
+        .repo
+        .variant_identifier(hash.clone(), variant.clone())
+        .await?;
 
     let (details, identifier) = if let Some(identifier) = identifier_opt {
         let details = ensure_details_identifier(&state, &identifier).await?;

src/queue.rs

@@ -97,7 +97,7 @@ pub(crate) async fn cleanup_identifier(repo: &ArcRepo, identifier: &Arc<str>) ->
     Ok(())
 }
 
-pub(super) async fn cleanup_variants(
+async fn cleanup_variants(
     repo: &ArcRepo,
     hash: Hash,
     variant: Option<String>,