Merge upstream master

2018-05-21 12:01:32 +01:00
parent ca5c7022ef
commit e181a9837a
15 changed files with 49 additions and 25 deletions
@@ -197,7 +197,8 @@ pub fn get_episode(
 }

 pub fn cache_image(pd: &PodcastCoverQuery) -> Result<String, DownloadError> {
-    let url = pd.image_uri()
+    let url = pd
+        .image_uri()
        .ok_or_else(|| DownloadError::NoImageLocation)?
        .to_owned();

@@ -215,7 +216,8 @@ pub fn cache_image(pd: &PodcastCoverQuery) -> Result<String, DownloadError> {
        // For some reason there is no .first() method so nth(0) is used
        let path = foo.nth(0).and_then(|x| x.ok());
        if let Some(p) = path {
-            return Ok(p.to_str()
+            return Ok(p
+                .to_str()
                .ok_or_else(|| DownloadError::InvalidCachedImageLocation)?
                .into());
        }