studio/tuwunel
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

run cargo fix for rust 2024 changes and rustfmt

Browse Source 
Signed-off-by: June Clementine Strawberry <strawberry@puppygock.gay>
This commit is contained in:
June Clementine Strawberry
2025-02-23 01:17:45 -05:00
parent e97952b7f6
commit a1e1f40ded
320 changed files with 2212 additions and 2039 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/service/media/thumbnail.rs
View File

@@ -7,14 +7,14 @@
use std::{cmp, num::Saturating as Sat};
use conduwuit::{checked, err, implement, Result};
use ruma::{http_headers::ContentDisposition, media::Method, Mxc, UInt, UserId};
use conduwuit::{Result, checked, err, implement};
use ruma::{Mxc, UInt, UserId, http_headers::ContentDisposition, media::Method};
use tokio::{
fs,
io::{AsyncReadExt, AsyncWriteExt},
};
use super::{data::Metadata, FileMeta};
use super::{FileMeta, data::Metadata};
/// Dimension specification for a thumbnail.
#[derive(Debug)]
@@ -65,12 +65,12 @@ impl super::Service {
// 0, 0 because that's the original file
let dim = dim.normalized();
if let Ok(metadata) = self.db.search_file_metadata(mxc, &dim).await {
self.get_thumbnail_saved(metadata).await
} else if let Ok(metadata) = self.db.search_file_metadata(mxc, &Dim::default()).await {
self.get_thumbnail_generate(mxc, &dim, metadata).await
} else {
Ok(None)
match self.db.search_file_metadata(mxc, &dim).await {
| Ok(metadata) => self.get_thumbnail_saved(metadata).await,
| _ => match self.db.search_file_metadata(mxc, &Dim::default()).await {
| Ok(metadata) => self.get_thumbnail_generate(mxc, &dim, metadata).await,
| _ => Ok(None),
},
}
}
}