matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Add Ref::get_path_with_basepath_setting()

Browse source 
This function can be used to override the basepath setting from the
header of the entry so that another basepath is used for looking
up/constructing the actual filepath.

This might come in handy at some point.

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
This commit is contained in:
Matthias Beyer 2019-04-22 12:53:47 +02:00
parent d561bef939
commit 427eac76fe
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lib/entry/libimagentryref/src/reference.rs
View file

@ -28,6 +28,7 @@ use libimagerror::errors::ErrorMsg as EM;
use toml::Value; use toml::Value;
use toml_query::read::TomlValueReadExt; use toml_query::read::TomlValueReadExt;
use toml_query::read::TomlValueReadTypeExt;
use toml_query::read::Partial; use toml_query::read::Partial;
use toml_query::delete::TomlValueDeleteExt; use toml_query::delete::TomlValueDeleteExt;
use toml_query::insert::TomlValueInsertExt; use toml_query::insert::TomlValueInsertExt;
@ -146,6 +147,9 @@ pub trait Ref {
fn get_path(&self, config: &Config) -> Result<PathBuf>; fn get_path(&self, config: &Config) -> Result<PathBuf>;
fn get_path_with_basepath_setting<B>(&self, config: &Config, base: B) -> Result<PathBuf>
where B: AsRef<str>;
fn get_relative_path(&self) -> Result<PathBuf>; fn get_relative_path(&self) -> Result<PathBuf>;
/// Get the stored hash. /// Get the stored hash.
@ -180,20 +184,25 @@ impl<'a, H: Hasher> Ref for RefWithHasher<'a, H> {
/// Get the path of the actual file /// Get the path of the actual file
fn get_path(&self, config: &Config) -> Result<PathBuf> { fn get_path(&self, config: &Config) -> Result<PathBuf> {
use toml_query::read::TomlValueReadTypeExt; let basepath_name = self.0
.get_header()
.read_string("ref.basepath")?
.ok_or_else(|| Error::from(EM::EntryHeaderFieldMissing("ref.basepath")))?;
self.get_path_with_basepath_setting(config, basepath_name)
}
fn get_path_with_basepath_setting<B>(&self, config: &Config, base: B)
-> Result<PathBuf>
where B: AsRef<str>
{
let relpath = self.0 let relpath = self.0
.get_header() .get_header()
.read_string("ref.relpath")? .read_string("ref.relpath")?
.map(PathBuf::from) .map(PathBuf::from)
.ok_or_else(|| Error::from(EM::EntryHeaderFieldMissing("ref.relpath")))?; .ok_or_else(|| Error::from(EM::EntryHeaderFieldMissing("ref.relpath")))?;
let basepath_name = self.0 get_file_path(config, base.as_ref(), relpath)
.get_header()
.read_string("ref.basepath")?
.ok_or_else(|| Error::from(EM::EntryHeaderFieldMissing("ref.basepath")))?;
get_file_path(config, &basepath_name, relpath)
} }
/// Get the relative path, relative to the configured basepath /// Get the relative path, relative to the configured basepath