mirror of
https://github.com/librespot-org/librespot.git
synced 2024-11-08 16:45:43 +00:00
Clean up cache logic in main
This commit is contained in:
parent
9152ca8159
commit
e543ef72ed
1 changed files with 17 additions and 23 deletions
34
src/main.rs
34
src/main.rs
|
@ -561,31 +561,25 @@ fn get_setup(args: &[String]) -> Setup {
|
|||
};
|
||||
|
||||
let cache = {
|
||||
let audio_dir;
|
||||
let cred_dir;
|
||||
let volume_dir;
|
||||
if matches.opt_present(DISABLE_AUDIO_CACHE) {
|
||||
audio_dir = None;
|
||||
volume_dir = matches
|
||||
let 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) {
|
||||
cred_dir = None;
|
||||
let cred_dir = if matches.opt_present(DISABLE_CREDENTIAL_CACHE) {
|
||||
None
|
||||
} 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() {
|
||||
matches
|
||||
|
|
Loading…
Reference in a new issue