Make FullArtifactPath a tuple of StoreRoot and ArtifactPath

This changes the implementation of FullArtifactPath from holding a
complete PathBuf object, to holding references to StoreRoot and
ArtifcatPath objects.

This not only reduces memory but more importantly is another step into
the right direction concerning strong path types.

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>

1 files changed, 5 insertions, 6 deletions

diff --git a/src/filestore/staging.rs b/src/filestore/staging.rs
index 0aca6da..992a612 100644
--- a/src/filestore/staging.rs
+++ b/src/filestore/staging.rs
@@ -65,16 +65,15 @@ impl StagingStore {
             .context("Concatenating the output bytestream")?
             .into_iter()
             .inspect(|p| trace!("Trying to load into staging store: {}", p.display()))
-            .map(ArtifactPath::new)
             .filter_map(|path| {
-                let fullpath = self.0.root.join(&path);
-                if fullpath.is_dir() {
+                if self.0.root.join_path(&path).is_dir() {
                     None
                 } else {
                     Some({
-                        self.0.load_from_path(&fullpath)
-                            .inspect(|r| trace!("Loaded from path {} = {:?}", fullpath.display(), r))
-                            .with_context(|| anyhow!("Loading from path: {}", fullpath.display()))
+                        let path = ArtifactPath::new(path);
+                        self.0.load_from_path(&path)
+                            .inspect(|r| trace!("Loaded from path {} = {:?}", path.display(), r))
+                            .with_context(|| anyhow!("Loading from path: {}", path.display()))
                             .map_err(Error::from)
                             .map(|art| art.path().clone())
                     })