Replaced some map/fold with for_each now that it hit stable!

hammond-data/src/index_feed.rs

@@ -262,11 +262,9 @@ mod tests {
             "http://feeds.feedburner.com/linuxunplugged",
         ];
 
-        inpt.iter()
+        inpt.iter().for_each(|feed| {
-            .map(|feed| {
+            index_source(&db, &NewSource::new_with_uri(feed)).unwrap()
-                index_source(&db, &NewSource::new_with_uri(feed)).unwrap()
+        });
-            })
-            .fold((), |(), _| ());
 
         index_loop(db, true).unwrap();
 
@@ -303,22 +301,20 @@ mod tests {
             ),
         ];
 
-        urls.iter()
+        urls.iter().for_each(|&(path, url)| {
-            .map(|&(path, url)| {
+            let tempdb = m.lock().unwrap();
-                let tempdb = m.lock().unwrap();
+            // Create and insert a Source into db
-                // Create and insert a Source into db
+            let s = insert_return_source(&tempdb, url).unwrap();
-                let s = insert_return_source(&tempdb, url).unwrap();
+            drop(tempdb);
-                drop(tempdb);
 
-                // open the xml file
+            // open the xml file
-                let feed = fs::File::open(path).unwrap();
+            let feed = fs::File::open(path).unwrap();
-                // parse it into a channel
+            // parse it into a channel
-                let chan = rss::Channel::read_from(BufReader::new(feed)).unwrap();
+            let chan = rss::Channel::read_from(BufReader::new(feed)).unwrap();
 
-                // Index the channel
+            // Index the channel
-                complete_index(m.clone(), &chan, &s).unwrap();
+            complete_index(m.clone(), &chan, &s).unwrap();
-            })
+        });
-            .fold((), |(), _| ());
 
         // Assert the index rows equal the controlled results
         let tempdb = m.lock().unwrap();

hammond-downloader/src/downloader.rs

@@ -55,12 +55,12 @@ pub fn download_to(target: &str, url: &str) -> Result<()> {
 }
 
 // Initial messy prototype, queries load alot of not needed stuff.
+// TODO: Refactor
 pub fn latest_dl(connection: &SqliteConnection, limit: u32) -> Result<()> {
     let pds = dbqueries::get_podcasts(connection)?;
 
-    pds.iter()
+    let _: Vec<_> = pds.iter()
-        // TODO when for_each reaches stable:
+        // This could be for_each instead of map.
-        // Remove all the ugly folds(_) and replace map() with for_each().
         .map(|x| -> Result<()> {
             let mut eps = if limit == 0 {
                 dbqueries::get_pd_episodes(connection, x)?
@@ -75,17 +75,15 @@ pub fn latest_dl(connection: &SqliteConnection, limit: u32) -> Result<()> {
             DirBuilder::new().recursive(true).create(&dl_fold).unwrap();
 
             // Download the episodes
-            eps.iter_mut()
+            let _ :Vec<_>= eps.iter_mut()
                 .map(|y| -> Result<()> {
                     // Check if its alrdy downloaded
                     if y.local_uri().is_some() {
-                        // Not idiomatic but I am still fighting the borrow-checker.
+                        if Path::new(y.local_uri().unwrap()).exists() {
-                        if Path::new(y.local_uri().unwrap().to_owned().as_str()).exists() {
                             return Ok(());
                         }
                         y.set_local_uri(None);
                         y.save_changes::<Episode>(connection)?;
-                        ()
                     };
 
                     // Unreliable and hacky way to extract the file extension from the url.
@@ -101,11 +99,11 @@ pub fn latest_dl(connection: &SqliteConnection, limit: u32) -> Result<()> {
                     y.save_changes::<Episode>(connection)?;
                     Ok(())
                 })
-                .fold((), |(), _| ());
+                .collect();
 
             Ok(())
         })
-        .fold((), |(), _| ());
+        .collect();
 
     Ok(())
 }