Browse Source

use .keys() and remove unneccery .to_vec()

merge-requests/95/head
hamidreza kalbasi 5 years ago
parent
commit
f038422d69
  1. 18
      src/database/media.rs

18
src/database/media.rs

@ -106,9 +106,9 @@ impl Media {
prefix.extend_from_slice(&0_u32.to_be_bytes()); // Height = 0 if it's not a thumbnail prefix.extend_from_slice(&0_u32.to_be_bytes()); // Height = 0 if it's not a thumbnail
prefix.push(0xff); prefix.push(0xff);
if let Some(r) = self.mediaid_file.scan_prefix(&prefix).next() { if let Some(r) = self.mediaid_file.scan_prefix(&prefix).keys().next() {
let (key, _file) = r?; let key = r?;
let path = globals.get_media_file(&key.to_vec()); let path = globals.get_media_file(&key);
let mut file = vec![]; let mut file = vec![];
File::open(path).await?.read_to_end(&mut file).await?; File::open(path).await?.read_to_end(&mut file).await?;
let mut parts = key.rsplit(|&b| b == 0xff); let mut parts = key.rsplit(|&b| b == 0xff);
@ -195,10 +195,10 @@ impl Media {
original_prefix.extend_from_slice(&0_u32.to_be_bytes()); // Height = 0 if it's not a thumbnail original_prefix.extend_from_slice(&0_u32.to_be_bytes()); // Height = 0 if it's not a thumbnail
original_prefix.push(0xff); original_prefix.push(0xff);
if let Some(r) = self.mediaid_file.scan_prefix(&thumbnail_prefix).next() { if let Some(r) = self.mediaid_file.scan_prefix(&thumbnail_prefix).keys().next() {
// Using saved thumbnail // Using saved thumbnail
let (key, _file) = r?; let key = r?;
let path = globals.get_media_file(&key.to_vec()); let path = globals.get_media_file(&key);
let mut file = vec![]; let mut file = vec![];
File::open(path).await?.read_to_end(&mut file).await?; File::open(path).await?.read_to_end(&mut file).await?;
let mut parts = key.rsplit(|&b| b == 0xff); let mut parts = key.rsplit(|&b| b == 0xff);
@ -231,11 +231,11 @@ impl Media {
content_type, content_type,
file: file.to_vec(), file: file.to_vec(),
})) }))
} else if let Some(r) = self.mediaid_file.scan_prefix(&original_prefix).next() { } else if let Some(r) = self.mediaid_file.scan_prefix(&original_prefix).keys().next() {
// Generate a thumbnail // Generate a thumbnail
let (key, _file) = r?; let key = r?;
let path = globals.get_media_file(&key.to_vec()); let path = globals.get_media_file(&key);
let mut file = vec![]; let mut file = vec![];
File::open(path).await?.read_to_end(&mut file).await?; File::open(path).await?.read_to_end(&mut file).await?;

Loading…
Cancel
Save