mirror of
https://github.com/storytold/artcraft.git
synced 2026-11-18 07:35:19 +00:00
fix?
This commit is contained in:
1 parent
8af2368f32
commit
1dcf06b571
2 files changed
+7
-7
No files matched your search
@@ -18,11 +18,11 @@ impl SaveDirectory {
|
||||
/// This is just the first directory structure, which is sequential audio files.
|
||||
/// We'll be using a database and well-formed filesystem layout later.
|
||||
pub fn get_audio_files_dir_v1(&self) -> PathBuf {
|
||||
let result = self.directory.join("./audio_files");
|
||||
let result = self.directory.join("audio_files");
|
||||
info!("SD(1): {:?}", result);
|
||||
info!("SD(2): {:?}", result.canonicalize());
|
||||
let result = result.canonicalize().unwrap_or(result);
|
||||
info!("SD(3): {:?}", result);
|
||||
//let result = result.canonicalize().unwrap_or(result);
|
||||
//info!("SD(3): {:?}", result);
|
||||
let result = result.absolutize()
|
||||
.map(|file| file.to_path_buf())
|
||||
.unwrap_or(result);
|
||||
|
||||
@@ -4,7 +4,7 @@ use log::info;
|
||||
use path_absolutize::Absolutize;
|
||||
use errors::{anyhow, AnyhowResult};
|
||||
|
||||
const DEFAULT_SAVE_DIRECTORY : &'static str = "./data";
|
||||
const DEFAULT_SAVE_DIRECTORY : &'static str = "data";
|
||||
|
||||
#[derive(Clone, Default)]
|
||||
pub struct StartupArgs {
|
||||
@@ -60,10 +60,10 @@ fn get_save_directory(matches: &ArgMatches) -> AnyhowResult<String> {
|
||||
|
||||
info!("SA dir(3): {:?}", save_directory);
|
||||
|
||||
let save_directory= std::fs::canonicalize(save_directory)
|
||||
let save_directory = save_directory
|
||||
.absolutize()
|
||||
.ok()
|
||||
.map(|pathbuf| pathbuf.absolutize().ok().map(|inner| inner.to_path_buf()))
|
||||
.flatten()
|
||||
.map(|inner| inner.to_path_buf())
|
||||
.map(|pathbuf| pathbuf.to_str().map(|s| s.to_string()))
|
||||
.flatten()
|
||||
.ok_or(anyhow!("could not construct path"))?;
|
||||
|
||||
Reference in new issue
Block a user