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

Source: Pass owenership around instead of &mut, cause futures.

Browse Source
This commit is contained in:
Jordan Petridis 2018-02-01 15:55:19 +02:00
parent 2f062afb07
commit 7b62ef203d
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hammond-data/src/models/source.rs
View File

@ -2,7 +2,6 @@ use diesel::SaveChangesDsl;
use rss::Channel; use rss::Channel;
use url::Url; use url::Url;
use hyper;
use hyper::{Client, Method, Request, Response, StatusCode, Uri}; use hyper::{Client, Method, Request, Response, StatusCode, Uri};
use hyper::client::HttpConnector; use hyper::client::HttpConnector;
use hyper::header::{ETag, EntityTag, HttpDate, IfModifiedSince, IfNoneMatch, LastModified, use hyper::header::{ETag, EntityTag, HttpDate, IfModifiedSince, IfNoneMatch, LastModified,
@ -110,13 +109,13 @@ impl Source {
// 403: Forbidden // 403: Forbidden
// 408: Timeout // 408: Timeout
// 410: Feed deleted // 410: Feed deleted
fn match_status(&mut self, res: &Response) -> Result<()> { fn match_status(mut self, res: Response) -> Result<(Self, Response)> {
let code = res.status(); let code = res.status();
match code { match code {
StatusCode::NotModified => bail!("304: skipping.."), StatusCode::NotModified => bail!("304: skipping.."),
StatusCode::MovedPermanently => { StatusCode::MovedPermanently => {
error!("Feed was moved permanently."); error!("Feed was moved permanently.");
self.handle_301(res)?; self.handle_301(&res)?;
bail!("301: Feed was moved permanently.") bail!("301: Feed was moved permanently.")
} }
StatusCode::TemporaryRedirect => debug!("307: Temporary Redirect."), StatusCode::TemporaryRedirect => debug!("307: Temporary Redirect."),
@ -128,7 +127,7 @@ impl Source {
StatusCode::Gone => bail!("410: Feed was deleted."), StatusCode::Gone => bail!("410: Feed was deleted."),
_ => info!("HTTP StatusCode: {}", code), _ => info!("HTTP StatusCode: {}", code),
}; };
Ok(()) Ok((self, res))
} }
fn handle_301(&mut self, res: &Response) -> Result<()> { fn handle_301(&mut self, res: &Response) -> Result<()> {
@ -163,17 +162,15 @@ impl Source {
/// Consumes `self` and Returns the corresponding `Feed` Object. /// Consumes `self` and Returns the corresponding `Feed` Object.
// TODO: Refactor into TryInto once it lands on stable. // TODO: Refactor into TryInto once it lands on stable.
pub fn into_feed( pub fn into_feed(
mut self, self,
client: &Client<HttpsConnector<HttpConnector>>, client: &Client<HttpsConnector<HttpConnector>>,
pool: CpuPool, pool: CpuPool,
ignore_etags: bool, ignore_etags: bool,
) -> Box<Future<Item = Feed, Error = Error>> { ) -> Box<Future<Item = Feed, Error = Error>> {
let id = self.id(); let id = self.id();
let feed = self.request_constructor(client, ignore_etags) let feed = self.request_constructor(client, ignore_etags)
.map_err(From::from) .and_then(move |(mut source, res)| {
.and_then(move |res| { source.update_etag(&res)?;
self.update_etag(&res)?;
self.match_status(&res)?;
Ok(res) Ok(res)
}) })
.and_then(move |res| response_to_channel(res, pool)) .and_then(move |res| response_to_channel(res, pool))
@ -191,10 +188,10 @@ impl Source {
// TODO: make ignore_etags an Enum for better ergonomics. // TODO: make ignore_etags an Enum for better ergonomics.
// #bools_are_just_2variant_enmus // #bools_are_just_2variant_enmus
fn request_constructor( fn request_constructor(
&self, self,
client: &Client<HttpsConnector<HttpConnector>>, client: &Client<HttpsConnector<HttpConnector>>,
ignore_etags: bool, ignore_etags: bool,
) -> Box<Future<Item = Response, Error = hyper::Error>> { ) -> Box<Future<Item = (Self, Response), Error = Error>> {
// FIXME: remove unwrap somehow // FIXME: remove unwrap somehow
let uri = Uri::from_str(self.uri()).unwrap(); let uri = Uri::from_str(self.uri()).unwrap();
let mut req = Request::new(Method::Get, uri); let mut req = Request::new(Method::Get, uri);
@ -213,7 +210,10 @@ impl Source {
} }
} }
let work = client.request(req); let work = client
.request(req)
.map_err(From::from)
.and_then(move |res| self.match_status(res));
Box::new(work) Box::new(work)
} }
} }

2
scripts/cargo.sh
View File

@ -1,3 +1,3 @@
#!/bin/sh #!/bin/sh
cargo build --release && cp $1/target/release/hammond-gtk $2 cargo build --release -p hammond-gtk && cp $1/target/release/hammond-gtk $2