1 files changed, 17 insertions, 8 deletions

diff --git a/src/manager.rs b/src/manager.rs
index 34e19be..5330d80 100644
--- a/src/manager.rs
+++ b/src/manager.rs
@@ -13,7 +13,7 @@ pub struct Manager {
 }
 
 impl Manager {
-    pub async fn add_feed(&mut self, url: &str) -> Result<PullStatus, Error> {
+    fn add_feed(&mut self, url: &str) -> Result<&mut Feed, Error> {
         let link = Url::parse(&url).map_err(|e| AddError::InvalidUrl(e.to_string()))?;
 
         // check if this feed is already present
@@ -22,17 +22,24 @@ impl Manager {
         }
 
         // construct a new feed
-        let mut feed = Feed::new(link.clone());
-
-        let status = feed
-            .pull()
-            .await
-            .map_err(|pull_err| Error::Pull(link, pull_err))?;
+        let feed = Feed::new(link.clone());
 
         // add new feed
         self.feeds.push(feed);
 
-        Ok(status)
+        Ok(self.feeds.last_mut().unwrap())
+    }
+
+    pub async fn add_feed_and_pull(&mut self, url: &str) -> Result<PullStatus, Error> {
+        let feed = self.add_feed(url)?;
+        feed.pull()
+            .await
+            .map_err(|pull_err| Error::Pull(feed.link.clone(), pull_err))
+    }
+
+    pub async fn add_feeds_and_pull(&mut self, urls: &[&str]) -> Vec<Result<PullStatus, Error>> {
+        let add_results = urls.into_iter().map(|url| self.add_feed(&url));
+        self.pull()
     }
 
     pub async fn pull(&mut self) -> Vec<Result<PullStatus, PullError>> {
@@ -71,6 +78,8 @@ impl Manager {
     }
 }
 
+// an iterator over a combined list of feeds (assumes each feed is already a sorted list of
+// entries)
 struct EntryIterator<'e> {
     all_entries: Vec<&'e [Entry]>,
 }