Detect format by content type header

src/feed/mod.rs

@@ -39,6 +39,28 @@ impl<'a> Feed {
         Ok(feed)
     }
 
+    pub fn read_rss_from<R>(reader: R) -> Result<Self, FeedError>
+    where
+        R: BufRead,
+    {
+        let channel = rss::Channel::read_from(reader)?;
+
+        debug!(format = "RSS", items = channel.items().len(), "parsed feed");
+
+        Ok(Self::Rss(channel))
+    }
+
+    pub fn read_atom_from<R>(reader: R) -> Result<Self, FeedError>
+    where
+        R: BufRead,
+    {
+        let feed = atom_syndication::Feed::read_from(reader)?;
+
+        debug!(format = "Atom", items = feed.entries().len(), "parsed feed");
+
+        Ok(Self::Atom(feed))
+    }
+
     pub fn title(&self) -> &str {
         match self {
             Feed::Rss(c) => &c.title,

src/watcher.rs

@@ -8,7 +8,7 @@ use crate::{
 use std::time::Duration;
 
 use chrono::{DateTime, FixedOffset};
-use reqwest::{Client, IntoUrl, Url};
+use reqwest::{header, Client, IntoUrl, Url};
 use tokio::sync::broadcast::Receiver;
 use tracing::{debug, error};
 
@@ -167,9 +167,21 @@ impl<T: Sink> Watcher<T> {
         debug!("fetching feed");
 
         let res = self.client.get(self.url.as_ref()).send().await?;
-        let body = res.error_for_status()?.bytes().await?;
 
-        let feed = Feed::read_from(&body[..])?;
+        let feed = match res.headers().get(header::CONTENT_TYPE) {
+            Some(v) if v.as_bytes().starts_with(b"application/rss+xml") => {
+                let body = res.error_for_status()?.bytes().await?;
+                Feed::read_rss_from(&body[..])?
+            }
+            Some(v) if v.as_bytes().starts_with(b"application/atom+xml") => {
+                let body = res.error_for_status()?.bytes().await?;
+                Feed::read_atom_from(&body[..])?
+            }
+            _ => {
+                let body = res.error_for_status()?.bytes().await?;
+                Feed::read_from(&body[..])?
+            }
+        };
 
         Ok(feed)
     }