t/buckets
1
0
Fork 0
generated from t/malachite
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: use regular if bucket is empty

Browse source
This commit is contained in:
trisua 2025-08-23 14:52:14 -04:00
parent 71a89e6c44
commit 4e4f26ea14
3 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.lock generated
View file

@ -250,7 +250,7 @@ dependencies = [
[[package]] [[package]]
name = "buckets-core" name = "buckets-core"
version = "1.0.2" version = "1.0.3"
dependencies = [ dependencies = [
"oiseau", "oiseau",
"pathbufd", "pathbufd",

2
crates/buckets-core/Cargo.toml
View file

@ -1,7 +1,7 @@
[package] [package]
name = "buckets-core" name = "buckets-core"
description = "Buckets media upload types" description = "Buckets media upload types"
version = "1.0.2" version = "1.0.3"
edition = "2024" edition = "2024"
readme = "../../README.md" readme = "../../README.md"
authors.workspace = true authors.workspace = true

11
crates/buckets-core/src/database/uploads.rs
View file

@ -21,7 +21,11 @@ impl DataManager {
auto_method!(get_upload_by_id(usize as i64)@get_upload_from_row -> "SELECT * FROM uploads WHERE id = $1" --name="upload" --returns=MediaUpload --cache-key-tmpl="atto.upload:{}"); auto_method!(get_upload_by_id(usize as i64)@get_upload_from_row -> "SELECT * FROM uploads WHERE id = $1" --name="upload" --returns=MediaUpload --cache-key-tmpl="atto.upload:{}");
/// Get an upload by its ID and bucket. /// Get an upload by its ID and bucket.
pub async fn get_upload_by_id_bucket(&self, id: usize, bucket: String) -> Result<MediaUpload> { pub async fn get_upload_by_id_bucket(&self, id: usize, bucket: &str) -> Result<MediaUpload> {
if bucket.is_empty() {
return self.get_upload_by_id(id).await;
}
let conn = match self.0.connect().await { let conn = match self.0.connect().await {
Ok(c) => c, Ok(c) => c,
Err(e) => return Err(Error::DatabaseConnection(e.to_string())), Err(e) => return Err(Error::DatabaseConnection(e.to_string())),
@ -193,10 +197,13 @@ impl DataManager {
} }
/// Delete an upload given its `id` and `bucket`. /// Delete an upload given its `id` and `bucket`.
pub async fn delete_upload_with_bucket(&self, id: usize, bucket: String) -> Result<()> { pub async fn delete_upload_with_bucket(&self, id: usize, bucket: &str) -> Result<()> {
// if !user.permissions.check(FinePermission::MANAGE_UPLOADS) { // if !user.permissions.check(FinePermission::MANAGE_UPLOADS) {
// return Err(Error::NotAllowed); // return Err(Error::NotAllowed);
// } // }
if bucket.is_empty() {
return self.delete_upload(id).await;
}
// delete file // delete file
// it's most important that the file gets off the file system first, even // it's most important that the file gets off the file system first, even