cjw/Oxicloud
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

style: fix clippy collapsible_if + cargo fmt

Browse Source
This commit is contained in:
Dionisio
2026-02-15 18:04:32 +01:00
parent 1ed20f425f
commit 0be7ef8c0b
11 changed files with 138 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/infrastructure/repositories/pg/file_blob_read_repository.rs
+16 -2
View File
@@ -106,7 +106,19 @@ impl FileBlobReadRepository {
#[async_trait]
impl FileReadPort for FileBlobReadRepository {
async fn get_file(&self, id: &str) -> Result<File, DomainError> {
let row = sqlx::query_as::<_, (String, String, Option<String>, i64, String, i64, i64, String)>(
let row = sqlx::query_as::<
_,
(
String,
String,
Option<String>,
i64,
String,
i64,
i64,
String,
),
>(
r#"
SELECT id::text, name, folder_id::text, size, mime_type,
EXTRACT(EPOCH FROM created_at)::bigint,
@@ -374,7 +386,9 @@ impl FileReadPort for FileBlobReadRepository {
.map_err(|e| DomainError::internal_error("FileBlobRead", format!("find file: {e}")))?;
match row {
Some(r) => Ok(Some(self.row_to_file(r.0, r.1, r.2, r.3, r.4, r.5, r.6).await?)),
Some(r) => Ok(Some(
self.row_to_file(r.0, r.1, r.2, r.3, r.4, r.5, r.6).await?,
)),
None => Ok(None),
}
}
src/infrastructure/repositories/pg/file_blob_write_repository.rs
+43 -33
View File
@@ -138,12 +138,13 @@ impl FileWritePort for FileBlobWriteRepository {
);
}
if let sqlx::Error::Database(ref db_err) = e
&& db_err.code().as_deref() == Some("23505") {
return Err(DomainError::already_exists(
"File",
format!("{name} already exists in folder"),
));
}
&& db_err.code().as_deref() == Some("23505")
{
return Err(DomainError::already_exists(
"File",
format!("{name} already exists in folder"),
));
}
return Err(DomainError::internal_error(
"FileBlobWrite",
format!("insert: {e}"),
@@ -210,12 +211,13 @@ impl FileWritePort for FileBlobWriteRepository {
);
}
if let sqlx::Error::Database(ref db_err) = e
&& db_err.code().as_deref() == Some("23505") {
return Err(DomainError::already_exists(
"File",
format!("{name} already exists in folder"),
));
}
&& db_err.code().as_deref() == Some("23505")
{
return Err(DomainError::already_exists(
"File",
format!("{name} already exists in folder"),
));
}
return Err(DomainError::internal_error(
"FileBlobWrite",
format!("insert: {e}"),
@@ -230,8 +232,16 @@ impl FileWritePort for FileBlobWriteRepository {
&blob_hash[..12]
);
self.row_to_file(row.0, name, folder_id, size as i64, content_type, row.1, row.2)
.await
self.row_to_file(
row.0,
name,
folder_id,
size as i64,
content_type,
row.1,
row.2,
)
.await
}
async fn move_file(
@@ -312,12 +322,13 @@ impl FileWritePort for FileBlobWriteRepository {
.await
.map_err(|e| {
if let sqlx::Error::Database(ref db_err) = e
&& db_err.code().as_deref() == Some("23505") {
return DomainError::already_exists(
"File",
"File with that name already exists in target folder".to_string(),
);
}
&& db_err.code().as_deref() == Some("23505")
{
return DomainError::already_exists(
"File",
"File with that name already exists in target folder".to_string(),
);
}
DomainError::internal_error("FileBlobWrite", format!("copy: {e}"))
})?
.ok_or_else(|| DomainError::not_found("File", file_id))?;
@@ -360,12 +371,10 @@ impl FileWritePort for FileBlobWriteRepository {
.await
.map_err(|e| {
if let sqlx::Error::Database(ref db_err) = e
&& db_err.code().as_deref() == Some("23505") {
return DomainError::already_exists(
"File",
format!("{new_name} already exists"),
);
}
&& db_err.code().as_deref() == Some("23505")
{
return DomainError::already_exists("File", format!("{new_name} already exists"));
}
DomainError::internal_error("FileBlobWrite", format!("rename: {e}"))
})?
.ok_or_else(|| DomainError::not_found("File", file_id))?;
@@ -449,13 +458,14 @@ impl FileWritePort for FileBlobWriteRepository {
// Decrement old blob ref (only if hash changed, best-effort)
if old_hash != new_hash
&& let Err(e) = self.dedup.remove_reference(&old_hash).await {
tracing::warn!(
"Failed to decrement old blob ref {}: {}",
&old_hash[..12],
e
);
}
&& let Err(e) = self.dedup.remove_reference(&old_hash).await
{
tracing::warn!(
"Failed to decrement old blob ref {}: {}",
&old_hash[..12],
e
);
}
Ok(())
}
src/infrastructure/repositories/pg/folder_db_repository.rs
+11 -12
View File
@@ -131,12 +131,13 @@ impl FolderRepository for FolderDbRepository {
.await
.map_err(|e| {
if let sqlx::Error::Database(ref db_err) = e
&& db_err.code().as_deref() == Some("23505") {
return DomainError::already_exists(
"Folder",
format!("{name} already exists in parent"),
);
}
&& db_err.code().as_deref() == Some("23505")
{
return DomainError::already_exists(
"Folder",
format!("{name} already exists in parent"),
);
}
DomainError::internal_error("FolderDb", format!("insert: {e}"))
})?;
@@ -333,12 +334,10 @@ impl FolderRepository for FolderDbRepository {
.await
.map_err(|e| {
if let sqlx::Error::Database(ref db_err) = e
&& db_err.code().as_deref() == Some("23505") {
return DomainError::already_exists(
"Folder",
format!("{new_name} already exists"),
);
}
&& db_err.code().as_deref() == Some("23505")
{
return DomainError::already_exists("Folder", format!("{new_name} already exists"));
}
DomainError::internal_error("FolderDb", format!("rename: {e}"))
})?;