Update

lang/Makefile

@@ -3,7 +3,7 @@ MO_FILES = de.mo
 default: default.pot ${MO_FILES}
 
 default.pot: excluded.po ../src
-	(cd ../src; find . -name '*.rs') | xargs xgettext -D ../src --debug -L python -n -F -a -E --from-code UTF-8 -x ../lang/excluded.po -o default.pot
+	find ../src -name '*.rs' | xargs xgettext --debug -L python -n -F -a -E --from-code UTF-8 -x ../lang/excluded.po -o default.pot
 
 %.mo : %.po
 	msgfmt $< -o $@

src/bundledb/db.rs

@@ -140,6 +140,7 @@ impl BundleDb {
 
     fn load_bundle_list(
         &mut self,
+        online: bool
     ) -> Result<(Vec<StoredBundle>, Vec<StoredBundle>), BundleDbError> {
         if let Ok(list) = StoredBundle::read_list_from(&self.layout.local_bundle_cache_path()) {
             for bundle in list {
@@ -169,6 +170,9 @@ impl BundleDb {
                 &self.layout.local_bundle_cache_path()
             ));
         }
+        if !online {
+            return Ok((vec![], vec![]))
+        }
         let (new, gone) = try!(load_bundles(
             &self.layout.remote_bundles_path(),
             base_path,
@@ -237,9 +241,10 @@ impl BundleDb {
     pub fn open(
         layout: RepositoryLayout,
         crypto: Arc<Mutex<Crypto>>,
+        online: bool
     ) -> Result<(Self, Vec<BundleInfo>, Vec<BundleInfo>), BundleDbError> {
         let mut self_ = Self::new(layout, crypto);
-        let (new, gone) = try!(self_.load_bundle_list());
+        let (new, gone) = try!(self_.load_bundle_list(online));
         try!(self_.update_cache());
         let new = new.into_iter().map(|s| s.info).collect();
         let gone = gone.into_iter().map(|s| s.info).collect();

src/cli/mod.rs

@@ -112,9 +112,9 @@ macro_rules! checked {
     };
 }
 
-fn open_repository(path: &Path) -> Result<Repository, ErrorCode> {
+fn open_repository(path: &Path, online: bool) -> Result<Repository, ErrorCode> {
     Ok(checked!(
-        Repository::open(path),
+        Repository::open(path, online),
         "load repository",
         ErrorCode::LoadRepository
     ))
@@ -478,7 +478,7 @@ pub fn run() -> Result<(), ErrorCode> {
             no_default_excludes,
             tar
         } => {
-            let mut repo = try!(open_repository(&repo_path));
+            let mut repo = try!(open_repository(&repo_path, true));
             if repo.has_backup(&backup_name) {
                 tr_error!("A backup with that name already exists");
                 return Err(ErrorCode::BackupAlreadyExists);
@@ -595,7 +595,7 @@ pub fn run() -> Result<(), ErrorCode> {
             dst_path,
             tar
         } => {
-            let mut repo = try!(open_repository(&repo_path));
+            let mut repo = try!(open_repository(&repo_path, true));
             let backup = try!(get_backup(&repo, &backup_name));
             let inode = if let Some(inode) = inode {
                 checked!(
@@ -635,7 +635,7 @@ pub fn run() -> Result<(), ErrorCode> {
                 tr_error!("Can only run copy on same repository");
                 return Err(ErrorCode::InvalidArgs);
             }
-            let mut repo = try!(open_repository(&repo_path_src));
+            let mut repo = try!(open_repository(&repo_path_src, false));
             if repo.has_backup(&backup_name_dst) {
                 tr_error!("A backup with that name already exists");
                 return Err(ErrorCode::BackupAlreadyExists);
@@ -653,7 +653,7 @@ pub fn run() -> Result<(), ErrorCode> {
             inode,
             force
         } => {
-            let mut repo = try!(open_repository(&repo_path));
+            let mut repo = try!(open_repository(&repo_path, true));
             if let Some(inode) = inode {
                 let mut backup = try!(get_backup(&repo, &backup_name));
                 checked!(
@@ -705,7 +705,7 @@ pub fn run() -> Result<(), ErrorCode> {
             yearly,
             force
         } => {
-            let mut repo = try!(open_repository(&repo_path));
+            let mut repo = try!(open_repository(&repo_path, true));
             if daily + weekly + monthly + yearly == 0 {
                 tr_error!("This would remove all those backups");
                 return Err(ErrorCode::UnsafeArgs);
@@ -725,7 +725,7 @@ pub fn run() -> Result<(), ErrorCode> {
             force,
             combine
         } => {
-            let mut repo = try!(open_repository(&repo_path));
+            let mut repo = try!(open_repository(&repo_path, true));
             let info_before = repo.info();
             checked!(
                 repo.vacuum(ratio, combine, force),
@@ -751,7 +751,7 @@ pub fn run() -> Result<(), ErrorCode> {
             bundle_data,
             repair
         } => {
-            let mut repo = try!(open_repository(&repo_path));
+            let mut repo = try!(open_repository(&repo_path, true));
             checked!(
                 repo.check_repository(repair),
                 "check repository",
@@ -797,7 +797,7 @@ pub fn run() -> Result<(), ErrorCode> {
             backup_name,
             inode
         } => {
-            let mut repo = try!(open_repository(&repo_path));
+            let mut repo = try!(open_repository(&repo_path, false));
             let backup_map = if let Some(backup_name) = backup_name {
                 if repo.layout.backups_path().join(&backup_name).is_dir() {
                     repo.get_backups(&backup_name)
@@ -845,7 +845,7 @@ pub fn run() -> Result<(), ErrorCode> {
             backup_name,
             inode
         } => {
-            let mut repo = try!(open_repository(&repo_path));
+            let mut repo = try!(open_repository(&repo_path, false));
             if let Some(backup_name) = backup_name {
                 let backup = try!(get_backup(&repo, &backup_name));
                 if let Some(inode) = inode {
@@ -868,7 +868,7 @@ pub fn run() -> Result<(), ErrorCode> {
             inode,
             mount_point
         } => {
-            let mut repo = try!(open_repository(&repo_path));
+            let mut repo = try!(open_repository(&repo_path, true));
             let fs = if let Some(backup_name) = backup_name {
                 if repo.layout.backups_path().join(&backup_name).is_dir() {
                     checked!(
@@ -916,7 +916,7 @@ pub fn run() -> Result<(), ErrorCode> {
             );
         }
         Arguments::Analyze { repo_path } => {
-            let mut repo = try!(open_repository(&repo_path));
+            let mut repo = try!(open_repository(&repo_path, true));
             print_analysis(&checked!(
                 repo.analyze_usage(),
                 "analyze repository",
@@ -924,7 +924,7 @@ pub fn run() -> Result<(), ErrorCode> {
             ));
         }
         Arguments::BundleList { repo_path } => {
-            let repo = try!(open_repository(&repo_path));
+            let repo = try!(open_repository(&repo_path, true));
             for bundle in repo.list_bundles() {
                 print_bundle_one_line(bundle);
             }
@@ -933,7 +933,7 @@ pub fn run() -> Result<(), ErrorCode> {
             repo_path,
             bundle_id
         } => {
-            let repo = try!(open_repository(&repo_path));
+            let repo = try!(open_repository(&repo_path, true));
             if let Some(bundle) = repo.get_bundle(&bundle_id) {
                 print_bundle(bundle);
             } else {
@@ -954,7 +954,7 @@ pub fn run() -> Result<(), ErrorCode> {
             tr_info!("Import finished");
         }
         Arguments::Versions { repo_path, path } => {
-            let mut repo = try!(open_repository(&repo_path));
+            let mut repo = try!(open_repository(&repo_path, true));
             let mut found = false;
             for (name, mut inode) in
                 checked!(
@@ -983,7 +983,7 @@ pub fn run() -> Result<(), ErrorCode> {
                 tr_error!("Can only run diff on same repository");
                 return Err(ErrorCode::InvalidArgs);
             }
-            let mut repo = try!(open_repository(&repo_path_old));
+            let mut repo = try!(open_repository(&repo_path_old, true));
             let backup_old = try!(get_backup(&repo, &backup_name_old));
             let backup_new = try!(get_backup(&repo, &backup_name_new));
             let inode1 =
@@ -1026,7 +1026,7 @@ pub fn run() -> Result<(), ErrorCode> {
             encryption,
             hash
         } => {
-            let mut repo = try!(open_repository(&repo_path));
+            let mut repo = try!(open_repository(&repo_path, false));
             let mut changed = false;
             if let Some(bundle_size) = bundle_size {
                 repo.config.bundle_size = bundle_size;
@@ -1083,7 +1083,7 @@ pub fn run() -> Result<(), ErrorCode> {
             password,
             file
         } => {
-            let mut repo = try!(open_repository(&repo_path));
+            let mut repo = try!(open_repository(&repo_path, false));
             let (public, secret) = if let Some(file) = file {
                 checked!(
                     Crypto::load_keypair_from_file(file),

src/index.rs

@@ -72,8 +72,8 @@ pub trait Value: Clone + Copy + Default {}
 #[repr(packed)]
 #[derive(Default)]
 pub struct Entry<K, V> {
-    pub key: K,
+    key: K,
-    pub data: V
+    data: V
 }
 
 impl<K: Key, V> Entry<K, V> {
@@ -86,15 +86,43 @@ impl<K: Key, V> Entry<K, V> {
     fn clear(&mut self) {
         unsafe { self.key.clear() }
     }
+
+    #[inline]
+    fn get(&self) -> (&K, &V) {
+        unsafe { (&self.key, &self.data) }
+    }
+
+    #[inline]
+    fn get_mut(&mut self) -> (&K, &mut V) {
+        unsafe { (&self.key, &mut self.data) }
+    }
+
+    #[inline]
+    fn get_key(&self) -> &K {
+        unsafe { &self.key }
+    }
+
+    #[inline]
+    fn get_mut_key(&mut self) -> &mut K {
+        unsafe { &mut self.key }
+    }
+
+    #[inline]
+    fn get_data(&self) -> &V {
+        unsafe { &self.data }
+    }
+
+    #[inline]
+    fn get_mut_data(&mut self) -> &mut V {
+        unsafe { &mut self.data }
+    }
 }
 
-impl<K: Clone, V: Clone> Clone for Entry<K, V> {
+impl<K: Clone + Key, V: Clone> Clone for Entry<K, V> {
     fn clone(&self) -> Self {
-        unsafe {
+        Entry {
-            Entry {
+            key: *self.get_key(),
-                key: self.key.clone(),
+            data: self.get_data().clone()
-                data: self.data.clone()
-            }
         }
     }
 }
@@ -115,7 +143,7 @@ impl<'a, K: Key, V> Iterator for Iter<'a, K, V> {
         while let Some((first, rest)) = self.0.split_first() {
             self.0 = rest;
             if first.is_used() {
-                unsafe { return Some((&first.key, &first.data)) }
+                return Some(first.get())
             }
         }
         None
@@ -135,7 +163,7 @@ impl<'a, K: Key, V> Iterator for IterMut<'a, K, V> {
                 Some((first, rest)) => {
                     self.0 = rest;
                     if first.is_used() {
-                        unsafe { return Some((&first.key, &mut first.data)) }
+                        return Some(first.get_mut())
                     }
                 }
             }
@@ -312,7 +340,7 @@ impl<K: Key, V: Value> Index<K, V> {
                 continue;
             }
             entries += 1;
-            match unsafe { self.locate(&entry.key) } {
+            match self.locate(entry.get_key()) {
                 LocateResult::Found(p) if p == pos => true,
                 found => return Err(IndexError::WrongPosition(pos, found))
             };
@@ -356,10 +384,10 @@ impl<K: Key, V: Value> Index<K, V> {
             if !entry.is_used() {
                 return LocateResult::Hole(pos);
             }
-            if entry.key == *key {
+            if entry.get_key() == key {
                 return LocateResult::Found(pos);
             }
-            let odist = (pos + self.capacity - (entry.key.hash() as usize & self.mask)) & self.mask;
+            let odist = (pos + self.capacity - (entry.get_key().hash() as usize & self.mask)) & self.mask;
             if dist > odist {
                 return LocateResult::Steal(pos);
             }
@@ -382,7 +410,7 @@ impl<K: Key, V: Value> Index<K, V> {
                     // we found a hole, stop shifting here
                     break;
                 }
-                if entry.key.hash() as usize & self.mask == pos {
+                if entry.get_key().hash() as usize & self.mask == pos {
                     // we found an entry at the right position, stop shifting here
                     break;
                 }
@@ -398,7 +426,7 @@ impl<K: Key, V: Value> Index<K, V> {
         match self.locate(key) {
             LocateResult::Found(pos) => {
                 let mut old = *data;
-                mem::swap(&mut old, &mut self.data[pos].data);
+                mem::swap(&mut old, self.data[pos].get_mut_data());
                 Ok(Some(old))
             },
             LocateResult::Hole(pos) => {
@@ -425,8 +453,8 @@ impl<K: Key, V: Value> Index<K, V> {
                     cur_pos = (cur_pos + 1) & self.mask;
                     let entry = &mut self.data[cur_pos];
                     if entry.is_used() {
-                        mem::swap(&mut stolen_key, &mut entry.key);
+                        mem::swap(&mut stolen_key, entry.get_mut_key());
-                        mem::swap(&mut stolen_data, &mut entry.data);
+                        mem::swap(&mut stolen_data, entry.get_mut_data());
                     } else {
                         entry.key = stolen_key;
                         entry.data = stolen_data;
@@ -472,7 +500,7 @@ impl<K: Key, V: Value> Index<K, V> {
         debug_assert!(self.check().is_ok(), tr!("Inconsistent before get"));
         match self.locate(key) {
             LocateResult::Found(pos) => {
-                unsafe { f(&mut self.data[pos].data) };
+                f(self.data[pos].get_mut_data());
                 true
             },
             _ => false
@@ -498,7 +526,7 @@ impl<K: Key, V: Value> Index<K, V> {
         while pos < self.capacity {
             {
                 let entry = &mut self.data[pos];
-                if !entry.is_used() || f(&entry.key, &entry.data) {
+                if !entry.is_used() || f(entry.get_key(), entry.get_data()) {
                     pos += 1;
                     continue;
                 }
@@ -518,6 +546,7 @@ impl<K: Key, V: Value> Index<K, V> {
     }
 
     #[inline]
+    #[allow(dead_code)]
     pub fn iter_mut(&mut self) -> IterMut<K, V> {
         IterMut(self.data)
     }
@@ -533,6 +562,7 @@ impl<K: Key, V: Value> Index<K, V> {
     }
 
     #[inline]
+    #[allow(dead_code)]
     pub fn is_empty(&self) -> bool {
         self.entries == 0
     }

src/repository/mod.rs

@@ -118,11 +118,11 @@ impl Repository {
         ));
         try!(BundleMap::create().save(layout.bundle_map_path()));
         try!(fs::create_dir_all(layout.backups_path()));
-        Self::open(path)
+        Self::open(path, true)
     }
 
     #[allow(unknown_lints, useless_let_if_seq)]
-    pub fn open<P: AsRef<Path>>(path: P) -> Result<Self, RepositoryError> {
+    pub fn open<P: AsRef<Path>>(path: P, online: bool) -> Result<Self, RepositoryError> {
         let layout = RepositoryLayout::new(path.as_ref().to_path_buf());
         if !layout.remote_exists() {
             return Err(RepositoryError::NoRemote);
@@ -133,7 +133,7 @@ impl Repository {
         let local_locks = LockFolder::new(layout.local_locks_path());
         let lock = try!(local_locks.lock(false));
         let crypto = Arc::new(Mutex::new(try!(Crypto::open(layout.keys_path()))));
-        let (bundles, new, gone) = try!(BundleDb::open(layout.clone(), crypto.clone()));
+        let (bundles, new, gone) = try!(BundleDb::open(layout.clone(), crypto.clone(), online));
         let (index, mut rebuild_index) =
             match unsafe { Index::open(layout.index_path(), &INDEX_MAGIC, INDEX_VERSION) } {
                 Ok(index) => (index, false),
@@ -227,7 +227,7 @@ impl Repository {
         for file in key_files {
             try!(repo.crypto.lock().unwrap().register_keyfile(file));
         }
-        repo = try!(Repository::open(path));
+        repo = try!(Repository::open(path, true));
         let mut backups: Vec<(String, Backup)> = try!(repo.get_all_backups()).into_iter().collect();
         backups.sort_by_key(|&(_, ref b)| b.timestamp);
         if let Some((name, backup)) = backups.pop() {