Initial split of fetch_feeds.

src/index_feed.rs

@@ -132,21 +132,30 @@ pub fn index_loop(db: SqliteConnection) -> Result<()> {
     Ok(())
 }
 
-// TODO: refactor into an Iterator
+// TODO: maybe refactor into an Iterator for lazy evaluation.
 // TODO: After fixing etag/lmod, add sent_etag:bool arg and logic to bypass it.
 pub fn fetch_feeds(connection: &SqliteConnection) -> Result<Vec<(reqwest::Response, Source)>> {
-    use reqwest::header::{ETag, EntityTag, Headers, HttpDate, LastModified};
-
-    let mut results = Vec::new();
-
     let mut feeds = dbqueries::get_sources(connection)?;
 
-    for feed in feeds.iter_mut() {
+    let results: Vec<(reqwest::Response, Source)> = feeds
+        .iter_mut()
+        .map(|x| refresh_source(connection, x).unwrap())
+        .collect();
+
+    Ok(results)
+}
+
+fn refresh_source(
+    connection: &SqliteConnection,
+    feed: &mut Source,
+) -> Result<(reqwest::Response, Source)> {
+    use reqwest::header::{ETag, EntityTag, Headers, HttpDate, LastModified};
+
     let client = reqwest::Client::new()?;
     let mut headers = Headers::new();
 
     if let Some(foo) = feed.http_etag() {
-            headers.set(ETag(EntityTag::new(true, foo.to_owned())));
+        headers.set(ETag(EntityTag::new(false, foo.to_owned())));
     }
 
     if let Some(foo) = feed.last_modified() {
@@ -165,15 +174,10 @@ pub fn fetch_feeds(connection: &SqliteConnection) -> Result<Vec<(reqwest::Respon
     // 304: Up to date Feed, checked with the Etag
     // 410: Feed deleted
     match req.status() {
-            reqwest::StatusCode::NotModified => {
+        reqwest::StatusCode::NotModified => (),
-                continue;
-            }
         _ => (),
     };
 
     feed.update_etag(connection, &req)?;
-        results.push((req, feed.clone()));
+    Ok((req, feed.clone()))
-    }
-
-    Ok(results)
 }