Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions rss-core/src/feed.rs
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,7 @@ impl FeedEntry {
if !self.url.is_empty() {
return format!("url:{}", self.url);
}
let ts = self
.published_at
.map(|d| d.timestamp())
.unwrap_or_default();
let ts = self.published_at.map(|d| d.timestamp()).unwrap_or_default();
format!("title:{}@{}", self.title, ts)
}
}
Expand Down
16 changes: 7 additions & 9 deletions rss-core/src/poller.rs
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,12 @@ pub fn spawn_poller(
PollerHandle { cancel_tx, join }
}

async fn fetch_feed(client: &Client, feed: &FeedDescriptor, timeout: Duration) -> Result<Vec<FeedEntry>, PollError> {
let response = client
.get(feed.url.clone())
.timeout(timeout)
.send()
.await?;
async fn fetch_feed(
client: &Client,
feed: &FeedDescriptor,
timeout: Duration,
) -> Result<Vec<FeedEntry>, PollError> {
let response = client.get(feed.url.clone()).timeout(timeout).send().await?;
let bytes = response.bytes().await?;
let mut cursor = std::io::Cursor::new(bytes.to_vec());
let channel = rss::Channel::read_from(&mut cursor)?;
Expand Down Expand Up @@ -177,9 +177,7 @@ impl PollConfig {
.map(Duration::from_millis)
.unwrap_or(defaults.request_timeout),
max_retries: raw.max_retries.unwrap_or(defaults.max_retries),
retry_backoff_ms: raw
.retry_backoff_ms
.unwrap_or(defaults.retry_backoff_ms),
retry_backoff_ms: raw.retry_backoff_ms.unwrap_or(defaults.retry_backoff_ms),
}
} else {
defaults
Expand Down
9 changes: 7 additions & 2 deletions rss-core/tests/poller_runtime_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use httpmock::prelude::*;
use reqwest::Client;
use tokio::sync::mpsc;

use rss_core::{shared_feed_list, spawn_poller, Event, FeedDescriptor, PollConfig, SeenStore};
use rss_core::{shared_feed_list, Event, FeedDescriptor, PollConfig, SeenStore};

#[tokio::test]
async fn spawn_poller_emits_event() {
Expand All @@ -20,7 +20,12 @@ async fn spawn_poller_emits_event() {
url: format!("{}/feed", server.base_url()),
}]);

let cfg = PollConfig { interval: std::time::Duration::from_millis(50), request_timeout: std::time::Duration::from_secs(2), max_retries: 1, retry_backoff_ms: 10 };
let cfg = PollConfig {
interval: std::time::Duration::from_millis(50),
request_timeout: std::time::Duration::from_secs(2),
max_retries: 1,
retry_backoff_ms: 10,
};
let client = Client::new();
let (tx, mut rx) = mpsc::channel(8);
let seen = SeenStore::in_memory();
Expand Down
7 changes: 6 additions & 1 deletion rss-core/tests/poller_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,12 @@ async fn poll_once_emits_new_articles_and_deduplicates() {
url: format!("{}/feed", server.base_url()),
};
let feeds = vec![feed];
let cfg = PollConfig { interval: std::time::Duration::from_millis(10), request_timeout: std::time::Duration::from_secs(2), max_retries: 1, retry_backoff_ms: 10 };
let cfg = PollConfig {
interval: std::time::Duration::from_millis(10),
request_timeout: std::time::Duration::from_secs(2),
max_retries: 1,
retry_backoff_ms: 10,
};
let client = Client::new();
let seen = SeenStore::in_memory();

Expand Down
Loading
Loading