1 files changed, 19 insertions, 7 deletions

diff --git a/src/manager.rs b/src/manager.rs
index 5330d80..83e8c1b 100644
--- a/src/manager.rs
+++ b/src/manager.rs
@@ -13,8 +13,8 @@ pub struct Manager {
 }
 
 impl Manager {
-    fn add_feed(&mut self, url: &str) -> Result<&mut Feed, Error> {
-        let link = Url::parse(&url).map_err(|e| AddError::InvalidUrl(e.to_string()))?;
+    fn add_feed<P: AsRef<str>>(&mut self, url: P) -> Result<(), Error> {
+        let link = Url::parse(url.as_ref()).map_err(|e| AddError::InvalidUrl(e.to_string()))?;
 
         // check if this feed is already present
         if self.feeds.iter().any(|f| f.link == link) {
@@ -27,19 +27,31 @@ impl Manager {
         // add new feed
         self.feeds.push(feed);
 
-        Ok(self.feeds.last_mut().unwrap())
+        Ok(())
     }
 
     pub async fn add_feed_and_pull(&mut self, url: &str) -> Result<PullStatus, Error> {
-        let feed = self.add_feed(url)?;
+        self.add_feed(url)?;
+        let feed = self.feeds.last_mut().unwrap();
         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 add_feeds_and_pull<P: AsRef<str>>(
+        &mut self,
+        urls: &[P],
+    ) -> Vec<Result<PullStatus, Error>> {
+        for url in urls {
+            // TODO: handle this error
+            self.add_feed(&url);
+        }
+        futures::future::join_all(self.feeds.iter_mut().map(|feed| async {
+            feed.pull()
+                .await
+                .map_err(|pull_err| Error::Pull(feed.link.clone(), pull_err))
+        }))
+        .await
     }
 
     pub async fn pull(&mut self) -> Vec<Result<PullStatus, PullError>> {