From 6ed47937ee040c8531f3141627a8c072bf47bdac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= <cyplo@cyplo.net>
Date: Sat, 7 Sep 2019 10:29:27 +0100
Subject: [PATCH] Fix test check for file contents

---
 src/index.rs           | 4 ++--
 src/repository.rs      | 4 ++--
 src/repository_item.rs | 8 ++++++--
 tests/system_tests.rs  | 7 ++++---
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/index.rs b/src/index.rs
index e1ea8ef..15f8a43 100644
--- a/src/index.rs
+++ b/src/index.rs
@@ -68,9 +68,9 @@ impl Index {
 
     fn repository_item(&self, i: &IndexItem) -> RepositoryItem {
         let index_item = i.clone();
-        let relative_path = Path::new(index_item.relative_path.as_str());
+        let relative_path = Path::new(&index_item.relative_path);
         let repository_path = Path::new(&self.repository_path);
-        let original_source_path = Path::new(index_item.original_source_path.as_str());
+        let original_source_path = Path::new(&index_item.original_source_path);
         let absolute_path = repository_path.join(relative_path);
         let absolute_path = absolute_path.as_path();
         RepositoryItem::from(original_source_path, absolute_path, relative_path, index_item.version)
diff --git a/src/repository.rs b/src/repository.rs
index 369c0f4..4e3e597 100644
--- a/src/repository.rs
+++ b/src/repository.rs
@@ -69,7 +69,7 @@ impl<'a> Repository<'a> {
         if source_path.is_file() {
             println!("storing {} as {}", source_path.display(), destination_path.display());
             fs::create_dir_all(destination_path.parent().unwrap())?;
-            let version = Repository::calculate_initial_version(source_path)?;
+            let version = Repository::calculate_version(source_path)?;
             fs::copy(source_path, destination_path)?;
 
             self.index.remember(RepositoryItem::from(
@@ -83,7 +83,7 @@ impl<'a> Repository<'a> {
         Ok(())
     }
 
-    fn calculate_initial_version(source_path: &Path) -> Result<Box<[u8]>, BakareError> {
+    fn calculate_version(source_path: &Path) -> Result<Box<[u8]>, BakareError> {
         let source_file = File::open(source_path)?;
         let mut reader = BufReader::new(source_file);
         let mut hasher = Sha512::new();
diff --git a/src/repository_item.rs b/src/repository_item.rs
index 06bd323..efccac4 100644
--- a/src/repository_item.rs
+++ b/src/repository_item.rs
@@ -20,12 +20,16 @@ impl RepositoryItem {
             version,
         }
     }
+
     pub fn save(&self, save_to: &Path) -> Result<(), BakareError> {
         if !save_to.is_absolute() {
             return Err(BakareError::PathToStoreNotAbsolute);
         }
 
-        let target_path = save_to.join(self.relative_path.clone());
+        let target_path = save_to.join(&self.relative_path);
+        if !target_path.is_absolute() {
+            return Err(BakareError::PathToStoreNotAbsolute);
+        }
         let parent = target_path.parent().unwrap();
         if !parent.exists() {
             println!("Creating {}", parent.display());
@@ -35,7 +39,7 @@ impl RepositoryItem {
             return Err(BakareError::CorruptedRepoNoFile);
         }
         println!("Saving {} to {}", self.absolute_path.display(), target_path.display());
-        fs::copy(self.absolute_path.clone(), target_path.clone())?;
+        fs::copy(&self.absolute_path, &target_path)?;
 
         Ok(())
     }
diff --git a/tests/system_tests.rs b/tests/system_tests.rs
index 4073571..7e8b770 100644
--- a/tests/system_tests.rs
+++ b/tests/system_tests.rs
@@ -30,13 +30,13 @@ fn restore_files_after_reopening_repository() -> Result<(), BakareError> {
     let restore_target = tempdir()?.into_path();
     Repository::init(repository_path.as_path())?;
 
-    let relative_path_text = "some file path";
+    let source_file_relative_path = "some file path";
     let original_contents = "some old contents";
 
     {
         let mut backup_repository = Repository::open(repository_path.as_path())?;
         let mut backup_engine = backup::Engine::new(source.path(), &mut backup_repository);
-        source.write_text_to_file(relative_path_text, original_contents)?;
+        source.write_text_to_file(source_file_relative_path, original_contents)?;
         backup_engine.backup()?;
     }
 
@@ -46,7 +46,8 @@ fn restore_files_after_reopening_repository() -> Result<(), BakareError> {
         restore_engine.restore_all()?;
     }
 
-    let restored_file_path = restore_target.join(relative_path_text);
+    let source_file_full_path = source.file_path(source_file_relative_path);
+    let restored_file_path = restore_target.join(source_file_full_path.strip_prefix("/")?);
     let contents = fs::read_to_string(restored_file_path)?;
 
     assert_eq!(contents, original_contents);