toxblh/podcasts
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Initial split of fetch_feeds.

Browse Source
This commit is contained in:
Jordan Petridis 2017-09-26 12:35:40 +03:00
parent 580aeba095
commit ea15e6aa63
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
1 changed files with 42 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/index_feed.rs
View File

@ -132,48 +132,52 @@ pub fn index_loop(db: SqliteConnection) -> Result<()> {
Ok(()) Ok(())
} }
// TODO: refactor into an Iterator // TODO: maybe refactor into an Iterator for lazy evaluation.
// TODO: After fixing etag/lmod, add sent_etag:bool arg and logic to bypass it. // TODO: After fixing etag/lmod, add sent_etag:bool arg and logic to bypass it.
pub fn fetch_feeds(connection: &SqliteConnection) -> Result<Vec<(reqwest::Response, Source)>> { pub fn fetch_feeds(connection: &SqliteConnection) -> Result<Vec<(reqwest::Response, Source)>> {
use reqwest::header::{ETag, EntityTag, Headers, HttpDate, LastModified};
let mut results = Vec::new();
let mut feeds = dbqueries::get_sources(connection)?; let mut feeds = dbqueries::get_sources(connection)?;
for feed in feeds.iter_mut() { let results: Vec<(reqwest::Response, Source)> = feeds
let client = reqwest::Client::new()?; .iter_mut()
let mut headers = Headers::new(); .map(|x| refresh_source(connection, x).unwrap())
.collect();
if let Some(foo) = feed.http_etag() {
headers.set(ETag(EntityTag::new(true, foo.to_owned())));
}
if let Some(foo) = feed.last_modified() {
headers.set(LastModified(foo.parse::<HttpDate>()?));
}
info!("{:?}", headers);
// FIXME: I have fucked up somewhere here.
// Getting back 200 codes even though I supposedly sent etags.
let req = client.get(feed.uri())?.headers(headers).send()?;
info!("{}", req.status());
// TODO match on more stuff
// 301: Permanent redirect of the url
// 302: Temporary redirect of the url
// 304: Up to date Feed, checked with the Etag
// 410: Feed deleted
match req.status() {
reqwest::StatusCode::NotModified => {
continue;
}
_ => (),
};
feed.update_etag(connection, &req)?;
results.push((req, feed.clone()));
}
Ok(results) Ok(results)
} }
fn refresh_source(
connection: &SqliteConnection,
feed: &mut Source,
) -> Result<(reqwest::Response, Source)> {
use reqwest::header::{ETag, EntityTag, Headers, HttpDate, LastModified};
let client = reqwest::Client::new()?;
let mut headers = Headers::new();
if let Some(foo) = feed.http_etag() {
headers.set(ETag(EntityTag::new(false, foo.to_owned())));
}
if let Some(foo) = feed.last_modified() {
headers.set(LastModified(foo.parse::<HttpDate>()?));
}
info!("{:?}", headers);
// FIXME: I have fucked up somewhere here.
// Getting back 200 codes even though I supposedly sent etags.
let req = client.get(feed.uri())?.headers(headers).send()?;
info!("{}", req.status());
// TODO match on more stuff
// 301: Permanent redirect of the url
// 302: Temporary redirect of the url
// 304: Up to date Feed, checked with the Etag
// 410: Feed deleted
match req.status() {
reqwest::StatusCode::NotModified => (),
_ => (),
};
feed.update_etag(connection, &req)?;
Ok((req, feed.clone()))
}