From f8e870312e2a1ee30183b8d5e736a11847ad1d32 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 4 Dec 2015 23:35:48 +0100
Subject: [PATCH] Outsource: ids iterator to files vector

---
 src/storage/backend.rs | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/storage/backend.rs b/src/storage/backend.rs
index 719932ee..de58c162 100644
--- a/src/storage/backend.rs
+++ b/src/storage/backend.rs
@@ -81,9 +81,7 @@ impl StorageBackend {
             .and_then(|ids| {
                 debug!("Iterating ids and building files from them");
                 debug!("  number of ids = {}", ids.len());
-                Ok(ids.filter_map(|id| self.get_file_by_id(m, &id, p))
-                        .collect::<Vec<File>>()
-                        .into_iter())
+                Ok(self.filter_map_ids_to_files(m, p, ids).into_iter())
             })
             .map_err(|e| {
                 debug!("StorageBackend::iter_ids() returned error = {:?}", e);
@@ -198,9 +196,8 @@ impl StorageBackend {
             let globstr = self.prefix_of_files_for_module(m) + "*" + &id_str[..] + ".imag";
             debug!("Globbing with globstr = '{}'", globstr);
             glob(&globstr[..]).map(|globlist| {
-                let mut vec = globlist_to_file_id_vec(globlist).into_iter()
-                                .filter_map(|id| self.get_file_by_id(m, &id, p))
-                                .collect::<Vec<File>>();
+                let idvec = globlist_to_file_id_vec(globlist).into_iter();
+                let mut vec = self.filter_map_ids_to_files(m, p, idvec);
                 vec.reverse();
                 vec.pop()
             }).unwrap_or({
@@ -270,6 +267,17 @@ impl StorageBackend {
         self.storepath.clone() + m.name()
     }
 
+    fn filter_map_ids_to_files<'a, HP>(&self,
+                                        m: &'a Module,
+                                        p: &Parser<HP>,
+                                        ids: IntoIter<FileID>)
+        -> Vec<File<'a>>
+        where HP: FileHeaderParser
+    {
+        ids.filter_map(|id| self.get_file_by_id(m, &id, p))
+           .collect::<Vec<File>>()
+    }
+
 }
 
 #[derive(Debug)]
@@ -335,3 +343,4 @@ fn globlist_to_file_id_vec(globlist: Paths) -> Vec<FileID> {
             .map(|pbuf| FileID::from(&pbuf))
             .collect::<Vec<FileID>>()
 }
+