Optimize cache

Author: Moliholy

src/fetcher.rs

@@ -13,15 +13,17 @@ pub struct Fetcher {
 }
 
 impl Fetcher {
-    pub fn new(source: &str, cache_directory: &str) -> CvmfsResult<Self> {
+    pub fn new(source: &str, cache_directory: &str, initialize: bool) -> CvmfsResult<Self> {
         let path = Path::new(source);
         let source = if path.exists() && path.is_dir() {
             format!("{}{}", "file://", source)
         } else {
             source.into()
         };
         let cache = Cache::new(cache_directory.into())?;
-        cache.initialize()?;
+        if initialize {
+            cache.initialize()?;
+        }
         Ok(Self { cache, source })
     }
 

src/file_system.rs

@@ -1,7 +1,6 @@
 use std::collections::HashMap;
 use std::ffi::{OsStr, OsString};
 use std::io::{Read, Seek, SeekFrom};
-use std::mem;
 use std::path::Path;
 use std::sync::RwLock;
 use std::time::{Duration, SystemTime};

src/main.rs

@@ -25,7 +25,7 @@ fn main() {
     } else {
         "/tmp/cvmfs".into()
     };
-    let fetcher = Fetcher::new(repo_url, &repo_cache).expect("Failure creating the fetcher");
+    let fetcher = Fetcher::new(repo_url, &repo_cache, true).expect("Failure creating the fetcher");
     let repository = Repository::new(fetcher).expect("Failure creating the repository");
     let file_system = CernvmFileSystem::new(repository).expect("Failure creating the file system");
 

src/repository.rs

@@ -72,6 +72,7 @@ impl Repository {
                 Fetcher::new(
                     self.fetcher.source.as_str(),
                     self.fetcher.cache.cache_directory.as_str(),
+                    false,
                 )?,
             )))
         } else {

tests/repository_test.rs

@@ -13,7 +13,7 @@ fn setup() {
 #[test]
 fn test_initialization() -> CvmfsResult<()> {
     setup();
-    let fetcher = Fetcher::new("http://cvmfs-stratum-one.cern.ch/opt/boss", TEST_CACHE_PATH)?;
+    let fetcher = Fetcher::new("http://cvmfs-stratum-one.cern.ch/opt/boss", TEST_CACHE_PATH, true)?;
     let mut repo = Repository::new(fetcher)?;
     assert_eq!(0, repo.opened_catalogs.len());
     assert_eq!("boss.cern.ch", repo.fqrn);