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

Pipeline: add matching on status code.

Browse Source
This commit is contained in:
Jordan Petridis 2018-01-15 10:16:01 +02:00
parent 2f7a22355f
commit 10345ffda7
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hammond-data/benches/bench.rs
View File

@ -108,7 +108,6 @@ fn bench_get_future_feeds(b: &mut Bencher) {
b.iter(|| {
let sources = hammond_data::dbqueries::get_sources().unwrap();
hammond_data::pipeline::pipeline(sources).unwrap();
println!("I RUN");
hammond_data::pipeline::pipeline(sources, false).unwrap();
})
}

19
hammond-data/src/models/queryables.rs
View File

@ -6,6 +6,7 @@ use reqwest;
use diesel::SaveChangesDsl;
use rss::Channel;
use hyper;
use hyper::client::HttpConnector;
use hyper::{Client, Method, Request, Response, StatusCode, Uri};
use hyper::header::{ETag, EntityTag, HttpDate, IfModifiedSince, IfNoneMatch, LastModified};
@ -723,16 +724,16 @@ impl Source {
) -> Box<Future<Item = Feed, Error = Error>> {
let id = self.id();
// TODO: make URI future
// TODO: make a status match future
let feed = request_constructor(&self, client, ignore_etags)
.map(move |res| {
if let Err(err) = self.update_etag2(&res) {
error!("Failed to update Source struct with new etag values");
error!("Error: {}", err);
};
res
})
.map_err(From::from)
.and_then(move |res| {
self.update_etag2(&res)?;
Ok(res)
})
.and_then(|res| -> Result<Response> {
match_status(res.status())?;
Ok(res)
})
.and_then(|res| response_to_channel(res))
.map(move |chan| Feed::from_channel_source(chan, id));
@ -753,7 +754,7 @@ fn request_constructor(
s: &Source,
client: &Client<HttpsConnector<HttpConnector>>,
ignore_etags: bool,
) -> Box<Future<Item = Response, Error = Error>> {
) -> Box<Future<Item = Response, Error = hyper::Error>> {
// FIXME: remove unwrap
let uri = Uri::from_str(&s.uri()).unwrap();
let mut req = Request::new(Method::Get, uri);