rzerres/conduit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix all clippy warnings, shorten line len in client_server

Browse Source
This commit is contained in:
Devin Ragotzy
2020-07-25 23:56:50 -04:00
committed by timokoesters
parent 3ccbd02081
commit 62df9ca580
5 changed files with 155 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/database/media.rs
View File

@@ -1,6 +1,8 @@
use crate::{utils, Error, Result};
use std::mem;
pub type FileMeta = (Option<String>, String, Vec<u8>);
pub struct Media {
pub(super) mediaid_file: sled::Tree, // MediaId = MXC + WidthHeight + Filename + ContentType
}
@@ -29,7 +31,7 @@ impl Media {
}
/// Downloads a file.
pub fn get(&self, mxc: String) -> Result<Option<(Option<String>, String, Vec<u8>)>> {
pub fn get(&self, mxc: String) -> Result<Option<FileMeta>> {
let mut prefix = mxc.as_bytes().to_vec();
prefix.push(0xff);
prefix.extend_from_slice(&0_u32.to_be_bytes()); // Width = 0 if it's not a thumbnail
@@ -66,12 +68,7 @@ impl Media {
}
/// Downloads a file's thumbnail.
pub fn get_thumbnail(
&self,
mxc: String,
width: u32,
height: u32,
) -> Result<Option<(Option<String>, String, Vec<u8>)>> {
pub fn get_thumbnail(&self, mxc: String, width: u32, height: u32) -> Result<Option<FileMeta>> {
let mut main_prefix = mxc.as_bytes().to_vec();
main_prefix.push(0xff);