This commit is contained in:
Laurent Louf 2020-07-26 16:11:32 +02:00
parent 09bebe5dd7
commit c14c254c6b
2 changed files with 10 additions and 3 deletions

View file

@ -76,7 +76,10 @@ impl Cache {
impl Cache { impl Cache {
fn file_path(&self, file: FileId) -> PathBuf { fn file_path(&self, file: FileId) -> PathBuf {
let name = file.to_base16(); let name = file.to_base16();
self.audio_root.join("files").join(&name[0..2]).join(&name[2..]) self.audio_root
.join("files")
.join(&name[0..2])
.join(&name[2..])
} }
pub fn file(&self, file: FileId) -> Option<File> { pub fn file(&self, file: FileId) -> Option<File> {

View file

@ -250,11 +250,15 @@ fn setup(args: &[String]) -> Setup {
let use_audio_cache = !matches.opt_present("disable-audio-cache"); let use_audio_cache = !matches.opt_present("disable-audio-cache");
let cache_directory = matches.opt_str("c").unwrap_or(String::from("")); let cache_directory = matches.opt_str("c").unwrap_or(String::from(""));
let system_cache_directory = matches.opt_str("system-cache").unwrap_or(String::from(cache_directory.clone())); let system_cache_directory = matches
.opt_str("system-cache")
.unwrap_or(String::from(cache_directory.clone()));
let cache = Some(Cache::new( let cache = Some(Cache::new(
PathBuf::from(cache_directory), PathBuf::from(cache_directory),
PathBuf::from(system_cache_directory), PathBuf::from(system_cache_directory),
use_audio_cache)); use_audio_cache,
));
let initial_volume = matches let initial_volume = matches
.opt_str("initial-volume") .opt_str("initial-volume")