From 3d108d4a7a6850edc8186fb0179f97506ae59d4d Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jordanpetridis@protonmail.com>
Date: Fri, 17 Nov 2017 16:12:11 +0200
Subject: [PATCH] Make Feed fields private.

---
 hammond-data/benches/bench.rs         | 25 +++++++++--------
 hammond-data/src/index_feed.rs        | 40 +++++++++++++++++----------
 hammond-data/src/models/queryables.rs |  2 +-
 3 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/hammond-data/benches/bench.rs b/hammond-data/benches/bench.rs
index b47d286..a990f31 100644
--- a/hammond-data/benches/bench.rs
+++ b/hammond-data/benches/bench.rs
@@ -55,19 +55,20 @@ fn get_temp_db() -> TempDB {
 }
 
 fn index_urls(m: &Database) {
-    URLS.par_iter().for_each(|&(buff, url)| {
-        // Create and insert a Source into db
-        let s = {
-            let temp = m.lock().unwrap();
-            insert_return_source(&temp, url).unwrap()
-        };
-        // parse it into a channel
-        let chan = rss::Channel::read_from(buff).unwrap();
-        let feed = Feed(chan, s);
+    let mut feeds: Vec<_> = URLS.par_iter()
+        .map(|&(buff, url)| {
+            // Create and insert a Source into db
+            let s = {
+                let temp = m.lock().unwrap();
+                insert_return_source(&temp, url).unwrap()
+            };
+            // parse it into a channel
+            let chan = rss::Channel::read_from(buff).unwrap();
+            Feed::new_from_channel_source(chan, s)
+        })
+        .collect();
 
-        // Index the channel
-        index_feeds(m, &mut [feed]);
-    });
+    index_feeds(m, &mut feeds);
 }
 
 #[bench]
diff --git a/hammond-data/src/index_feed.rs b/hammond-data/src/index_feed.rs
index 00d701a..94b4144 100644
--- a/hammond-data/src/index_feed.rs
+++ b/hammond-data/src/index_feed.rs
@@ -13,9 +13,17 @@ use std::sync::{Arc, Mutex};
 pub type Database = Arc<Mutex<SqliteConnection>>;
 
 #[derive(Debug)]
-pub struct Feed(pub rss::Channel, pub Source);
+pub struct Feed(rss::Channel, Source);
 
 impl Feed {
+    pub fn new_from_source(db: &Database, s: Source) -> Result<Feed> {
+        s.refresh(db)
+    }
+
+    pub fn new_from_channel_source(chan: rss::Channel, s: Source) -> Feed {
+        Feed(chan, s)
+    }
+
     fn index(&self, db: &Database) -> Result<()> {
         let tempdb = db.lock().unwrap();
         let pd = self.index_channel(&tempdb)?;
@@ -146,7 +154,7 @@ pub fn fetch_feeds(db: &Database, feeds: Vec<Source>) -> Vec<Feed> {
         .into_par_iter()
         .filter_map(|x| {
             let uri = x.uri().to_owned();
-            let l = x.refresh(db);
+            let l = Feed::new_from_source(db, x);
             if l.is_ok() {
                 l.ok()
             } else {
@@ -244,21 +252,23 @@ mod tests {
             ),
         ];
 
-        urls.iter().for_each(|&(path, url)| {
-            let tempdb = m.lock().unwrap();
-            // Create and insert a Source into db
-            let s = insert_return_source(&tempdb, url).unwrap();
-            drop(tempdb);
+        let mut feeds: Vec<_> = urls.iter()
+            .map(|&(path, url)| {
+                let tempdb = m.lock().unwrap();
+                // Create and insert a Source into db
+                let s = insert_return_source(&tempdb, url).unwrap();
+                drop(tempdb);
 
-            // open the xml file
-            let feed = fs::File::open(path).unwrap();
-            // parse it into a channel
-            let chan = rss::Channel::read_from(BufReader::new(feed)).unwrap();
-            let feed = Feed(chan, s);
+                // open the xml file
+                let feed = fs::File::open(path).unwrap();
+                // parse it into a channel
+                let chan = rss::Channel::read_from(BufReader::new(feed)).unwrap();
+                Feed::new_from_channel_source(chan, s)
+            })
+            .collect();
 
-            // Index the channel
-            index_feeds(&m, &mut [feed]);
-        });
+        // Index the channel
+        index_feeds(&m, &mut feeds);
 
         // Assert the index rows equal the controlled results
         let tempdb = m.lock().unwrap();
diff --git a/hammond-data/src/models/queryables.rs b/hammond-data/src/models/queryables.rs
index 0699f63..3b6de35 100644
--- a/hammond-data/src/models/queryables.rs
+++ b/hammond-data/src/models/queryables.rs
@@ -339,6 +339,6 @@ impl<'a> Source {
         req.read_to_string(&mut buf)?;
         let chan = Channel::from_str(&buf)?;
 
-        Ok(Feed(chan, self))
+        Ok(Feed::new_from_channel_source(chan, self))
     }
 }