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

Clean up cache logic in main

Browse source
This commit is contained in:
JasonLG1979 2021-10-27 10:14:40 -05:00
parent 9152ca8159
commit e543ef72ed
1 changed files with 17 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/main.rs
View file

@ -561,31 +561,25 @@ fn get_setup(args: &[String]) -> Setup {
}; };
let cache = { let cache = {
let audio_dir; let volume_dir = matches
let cred_dir; .opt_str(SYSTEM_CACHE)
let volume_dir; .or_else(|| matches.opt_str(CACHE))
if matches.opt_present(DISABLE_AUDIO_CACHE) { .map(|p| p.into());
audio_dir = None;
volume_dir = matches
.opt_str(SYSTEM_CACHE)
.or_else(|| matches.opt_str(CACHE))
.map(|p| p.into());
} else {
let cache_dir = matches.opt_str(CACHE);
audio_dir = cache_dir
.as_ref()
.map(|p| AsRef::<Path>::as_ref(p).join("files"));
volume_dir = matches
.opt_str(SYSTEM_CACHE)
.or(cache_dir)
.map(|p| p.into());
}
if matches.opt_present(DISABLE_CREDENTIAL_CACHE) { let cred_dir = if matches.opt_present(DISABLE_CREDENTIAL_CACHE) {
cred_dir = None; None
} else { } else {
cred_dir = volume_dir.clone(); volume_dir.clone()
} };
let audio_dir = if matches.opt_present(DISABLE_AUDIO_CACHE) {
None
} else {
matches
.opt_str(CACHE)
.as_ref()
.map(|p| AsRef::<Path>::as_ref(p).join("files"))
};
let limit = if audio_dir.is_some() { let limit = if audio_dir.is_some() {
matches matches