From 6ab28c10df1cf2e3b4c8c0a38b374fce34fb33d5 Mon Sep 17 00:00:00 2001
From: Dennis Schwerdel <schwerdel@informatik.uni-kl.de>
Date: Fri, 24 Mar 2017 07:09:43 +0100
Subject: [PATCH] Fix renaming bundle files

---
 src/bundledb/db.rs | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/bundledb/db.rs b/src/bundledb/db.rs
index 4b5d69b..d3e0f01 100644
--- a/src/bundledb/db.rs
+++ b/src/bundledb/db.rs
@@ -80,24 +80,29 @@ pub fn load_bundles<P: AsRef<Path>>(path: P, bundles: &mut HashMap<BundleId, Sto
             }
         }
     }
-    let mut gone = vec![];
+    let mut gone = HashSet::new();
     for (id, bundle) in bundles.iter_mut() {
         if !bundle_paths.contains(&bundle.path) {
-            gone.push(id.clone());
+            gone.insert(id.clone());
         } else {
             bundle_paths.remove(&bundle.path);
         }
     }
-    let gone = gone.iter().map(|id| bundles.remove(id).unwrap()).collect();
     let mut new = vec![];
     for path in bundle_paths {
         let bundle = StoredBundle {
             info: try!(BundleReader::load_info(&path)),
             path: path
         };
-        new.push(bundle.clone());
-        bundles.insert(bundle.info.id.clone(), bundle);
+        let id = bundle.info.id.clone();
+        if !bundles.contains_key(&id) {
+            new.push(bundle.clone());
+        } else {
+            gone.remove(&id);
+        }
+        bundles.insert(id, bundle);
     }
+    let gone = gone.iter().map(|id| bundles.remove(id).unwrap()).collect();
     Ok((new, gone))
 }