github-mirrors/librespot
1
0
Fork 0
mirror of https://github.com/librespot-org/librespot.git synced 2024-12-18 17:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Address review change request

Browse source
This commit is contained in:
JasonLG1979 2021-10-27 14:47:33 -05:00
parent fefd432773
commit 9e017119bb
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
core/src/cache.rs
View file

@ -238,28 +238,28 @@ pub struct RemoveFileError(());
impl Cache { impl Cache {
pub fn new<P: AsRef<Path>>( pub fn new<P: AsRef<Path>>(
credentials: Option<P>, credentials_path: Option<P>,
volume: Option<P>, volume_path: Option<P>,
audio: Option<P>, audio_path: Option<P>,
size_limit: Option<u64>, size_limit: Option<u64>,
) -> io::Result<Self> { ) -> io::Result<Self> {
let mut size_limiter = None; let mut size_limiter = None;
if let Some(location) = &credentials { if let Some(location) = &credentials_path {
fs::create_dir_all(location)?; fs::create_dir_all(location)?;
} }
let credentials_location = credentials let credentials_location = credentials_path
.as_ref() .as_ref()
.map(|p| p.as_ref().join("credentials.json")); .map(|p| p.as_ref().join("credentials.json"));
if let Some(location) = &volume { if let Some(location) = &volume_path {
fs::create_dir_all(location)?; fs::create_dir_all(location)?;
} }
let volume_location = volume.as_ref().map(|p| p.as_ref().join("volume")); let volume_location = volume_path.as_ref().map(|p| p.as_ref().join("volume"));
if let Some(location) = &audio { if let Some(location) = &audio_path {
fs::create_dir_all(location)?; fs::create_dir_all(location)?;
if let Some(limit) = size_limit { if let Some(limit) = size_limit {
@ -269,7 +269,7 @@ impl Cache {
} }
} }
let audio_location = audio.map(|p| p.as_ref().to_owned()); let audio_location = audio_path.map(|p| p.as_ref().to_owned());
let cache = Cache { let cache = Cache {
credentials_location, credentials_location,