move feed::get from FetchEnv into a pure function

Cargo.lock

@@ -1014,6 +1014,7 @@ name = "podal"
 version = "0.1.0"
 dependencies = [
  "atom_syndication",
+ "bytes",
  "clap",
  "reqwest",
  "scraper",

Cargo.toml

@@ -10,6 +10,7 @@ atom_syndication = "0.12.1"
 reqwest = { version = "0.11.18", features = ["json", "blocking"] }
 scraper = "0.17.1"
 clap = "4.3.19"
+bytes = "1.4.0"
 
 [dev-dependencies]
 tempfile = "*"

src/errors.rs

@@ -4,6 +4,13 @@ use std::{fmt::Display, str::Utf8Error, string::FromUtf8Error};
 pub struct Error {
     details: String,
 }
+impl Error {
+    pub fn message(details: &str) -> Self {
+        Self {
+            details: details.to_string(),
+        }
+    }
+}
 impl Display for Error {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.write_str(self.details.to_string().as_str())

src/feed/find.rs

@@ -23,12 +23,15 @@ pub fn find(site: &str, channel_name: &str, e: &NetworkEnv) -> Result<String> {
 #[cfg(test)]
 mod tests {
 
+    use crate::errors::Error;
+
     use super::*;
     #[test]
     fn finds_rss_url() -> Result<()> {
         //given
         let network_env = NetworkEnv {
             fetch_as_text: dummy_fetch_as_text,
+            fetch_as_bytes: dummy_fetch_as_bytes,
         };
         //when
         let result = find("site", "@channel", &network_env)?;
@@ -42,6 +45,7 @@ mod tests {
         //given
         let network_env = NetworkEnv {
             fetch_as_text: dummy_fetch_as_text,
+            fetch_as_bytes: dummy_fetch_as_bytes,
         };
         //when
         let result = find("site", "invalid-channel-name", &network_env);
@@ -58,4 +62,7 @@ mod tests {
         "#
         .to_string())
     }
+    fn dummy_fetch_as_bytes(_url: &str) -> Result<bytes::Bytes> {
+        Err(Error::message("Not implemented"))
+    }
 }

src/feed/get.rs

@@ -1,9 +0,0 @@
-use crate::prelude::*;
-
-use atom_syndication::Feed;
-
-pub fn reqwest_blocking_get(url: &str) -> Result<Feed> {
-    let content = reqwest::blocking::get(url)?.bytes()?;
-    let channel = Feed::read_from(&content[..])?;
-    Ok(channel)
-}

src/feed/mod.rs

@@ -1,18 +1,20 @@
 use crate::prelude::*;
 
 use crate::network::NetworkEnv;
+use atom_syndication::Feed;
 
 mod find;
-mod get;
 
-use atom_syndication::Feed;
 pub use find::find;
-pub use get::reqwest_blocking_get;
 
 pub struct FeedEnv {
     pub find: FeedFind,
-    pub get: FeedGet,
 }
 
 pub type FeedFind = fn(&str, &str, &NetworkEnv) -> Result<String>;
-pub type FeedGet = fn(&str) -> Result<Feed>;
+
+pub fn get(url: &str, e: &NetworkEnv) -> Result<Feed> {
+    let content = (e.fetch_as_bytes)(url)?;
+    let channel = Feed::read_from(&content[..])?;
+    Ok(channel)
+}

src/lib.rs

@@ -28,7 +28,7 @@ pub fn run(subscriptions: &str, history: &str, site: &str, e: Env) -> Result<()>
     for channel_name in file::read::lines_from(subscriptions, &e.file)? {
         println!("Channel: {}", channel_name);
         let feed_url = (e.feed.find)(site, &channel_name, &e.network)?;
-        for entry in (e.feed.get)(&feed_url)?.entries() {
+        for entry in feed::get(&feed_url, &e.network)?.entries() {
             if let Some(link) = entry.links().get(0).cloned() {
                 if !(e.history.find)(&link, history, &e.file)? {
                     println!("Downloading {}: {}", &channel_name, entry.title().as_str());

src/main.rs

@@ -17,7 +17,6 @@ fn main() -> Result<()> {
         podal::Env {
             feed: FeedEnv {
                 find: podal::feed::find,
-                get: podal::feed::reqwest_blocking_get,
             },
 
             history: HistoryEnv {

src/network/env.rs

@@ -2,11 +2,13 @@ use crate::prelude::*;
 
 pub struct NetworkEnv {
     pub fetch_as_text: fn(url: &str) -> Result<String>,
+    pub fetch_as_bytes: fn(url: &str) -> Result<bytes::Bytes>,
 }
 impl Default for NetworkEnv {
     fn default() -> Self {
         Self {
             fetch_as_text: |url| Ok(reqwest::blocking::get(url)?.text()?),
+            fetch_as_bytes: |url| Ok(reqwest::blocking::get(url)?.bytes()?),
         }
     }
 }