Merge upstream master

.gitlab-ci.yml

@@ -125,7 +125,7 @@ rustfmt:
     script:
         - rustc -Vv && cargo -Vv
         - cargo fmt --version
-        - cargo fmt --all -- --write-mode=diff
+        - cargo fmt --all -- --check
 
 # Configure and run clippy on nightly
 # Only fails on errors atm.
@@ -140,4 +140,4 @@ clippy:
         # Force regeneration of gresources regardless of artifacts chage
         - cd hammond-gtk/resources/ && glib-compile-resources --generate resources.xml && cd ../../
         - cargo clippy --all
-    <<: *cargo_cache
+    <<: *cargo_cache

CHANGELOG.md

@@ -10,6 +10,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Fixed:
 ### Removed:
 
+## [0.3.4] - 2018-05-20
+### Fixed:
+- Flatpak can now access the Home folder. This fixes the OPML import feature from
+not being able to access any file.
+
 ## [0.3.3] - 2018-05-19
 ### Added:
 - Initial functionality for importing shows from an OPML file was implemented.

hammond-data/src/feed.rs

@@ -174,7 +174,8 @@ mod tests {
     fn test_complete_index() {
         truncate_db().unwrap();
 
-        let feeds: Vec<_> = URLS.iter()
+        let feeds: Vec<_> = URLS
+            .iter()
             .map(|&(path, url)| {
                 // Create and insert a Source into db
                 let s = Source::from_url(url).unwrap();

hammond-data/src/models/new_episode.rs

@@ -101,17 +101,23 @@ impl Index<()> for NewEpisode {
 
 impl PartialEq<EpisodeMinimal> for NewEpisode {
     fn eq(&self, other: &EpisodeMinimal) -> bool {
-        (self.title() == other.title()) && (self.uri() == other.uri())
+        (self.title() == other.title())
-            && (self.duration() == other.duration()) && (self.epoch() == other.epoch())
+            && (self.uri() == other.uri())
-            && (self.guid() == other.guid()) && (self.podcast_id() == other.podcast_id())
+            && (self.duration() == other.duration())
+            && (self.epoch() == other.epoch())
+            && (self.guid() == other.guid())
+            && (self.podcast_id() == other.podcast_id())
     }
 }
 
 impl PartialEq<Episode> for NewEpisode {
     fn eq(&self, other: &Episode) -> bool {
-        (self.title() == other.title()) && (self.uri() == other.uri())
+        (self.title() == other.title())
-            && (self.duration() == other.duration()) && (self.epoch() == other.epoch())
+            && (self.uri() == other.uri())
-            && (self.guid() == other.guid()) && (self.podcast_id() == other.podcast_id())
+            && (self.duration() == other.duration())
+            && (self.epoch() == other.epoch())
+            && (self.guid() == other.guid())
+            && (self.podcast_id() == other.podcast_id())
             && (self.description() == other.description())
             && (self.length() == other.length())
     }
@@ -182,9 +188,12 @@ pub(crate) struct NewEpisodeMinimal {
 
 impl PartialEq<EpisodeMinimal> for NewEpisodeMinimal {
     fn eq(&self, other: &EpisodeMinimal) -> bool {
-        (self.title() == other.title()) && (self.uri() == other.uri())
+        (self.title() == other.title())
-            && (self.duration() == other.duration()) && (self.epoch() == other.epoch())
+            && (self.uri() == other.uri())
-            && (self.guid() == other.guid()) && (self.podcast_id() == other.podcast_id())
+            && (self.duration() == other.duration())
+            && (self.epoch() == other.epoch())
+            && (self.guid() == other.guid())
+            && (self.podcast_id() == other.podcast_id())
     }
 }
 

hammond-data/src/models/new_podcast.rs

@@ -83,7 +83,8 @@ impl Index<()> for NewPodcast {
 
 impl PartialEq<Podcast> for NewPodcast {
     fn eq(&self, other: &Podcast) -> bool {
-        (self.link() == other.link()) && (self.title() == other.title())
+        (self.link() == other.link())
+            && (self.title() == other.title())
             && (self.image_uri() == other.image_uri())
             && (self.description() == other.description())
             && (self.source_id() == other.source_id())
@@ -103,7 +104,8 @@ impl NewPodcast {
             .to_string();
 
         // Try to get the itunes img first
-        let itunes_img = chan.itunes_ext()
+        let itunes_img = chan
+            .itunes_ext()
             .and_then(|s| s.image().map(|url| url.trim()))
             .map(|s| s.to_owned());
         // If itunes is None, try to get the channel.image from the rss spec

hammond-downloader/src/downloader.rs

@@ -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());
         }

hammond-gtk/resources/org.gnome.Hammond.appdata.xml

@@ -28,7 +28,7 @@
     </screenshot>
   </screenshots>
   <releases>
-    <release version="0.3.3" date="2018-05-19"/>
+    <release version="0.3.4" date="2018-05-20"/>
   </releases>
   <url type="homepage">https://gitlab.gnome.org/World/hammond</url>
   <update_contact>jpetridis@gnome.org</update_contact>

hammond-gtk/src/app.rs

@@ -280,7 +280,7 @@ fn about_dialog(window: &gtk::Window) {
     dialog.set_modal(true);
     // TODO: make it show it fetches the commit hash from which it was built
     // and the version number is kept in sync automaticly
-    dialog.set_version("0.3.3");
+    dialog.set_version("0.3.4");
     dialog.set_program_name("Hammond");
     // TODO: Need a wiki page first.
     // dialog.set_website("https://wiki.gnome.org/Design/Apps/Potential/Podcasts");

hammond-gtk/src/headerbar.rs

@@ -202,3 +202,4 @@ fn on_url_change(
         }
     }
 }
+

hammond-gtk/src/widgets/episode.rs

@@ -299,7 +299,8 @@ fn progress_bar_helper(
     episode_rowid: i32,
 ) -> Result<glib::Continue, Error> {
     let (fraction, downloaded) = {
-        let m = prog.lock()
+        let m = prog
+            .lock()
             .map_err(|_| format_err!("Failed to get a lock on the mutex."))?;
         (m.get_fraction(), m.get_downloaded())
     };
@@ -357,7 +358,8 @@ fn total_size_helper(
 ) -> Result<glib::Continue, Error> {
     // Get the total_bytes.
     let total_bytes = {
-        let m = prog.lock()
+        let m = prog
+            .lock()
             .map_err(|_| format_err!("Failed to get a lock on the mutex."))?;
         m.get_total_size()
     };

hammond-gtk/src/widgets/home_view.rs

@@ -138,7 +138,8 @@ impl HomeView {
     /// Save the vertical scrollbar position.
     pub fn save_alignment(&self) -> Result<(), Error> {
         if let Ok(mut guard) = EPISODES_VIEW_VALIGNMENT.lock() {
-            let adj = self.scrolled_window
+            let adj = self
+                .scrolled_window
                 .get_vadjustment()
                 .ok_or_else(|| format_err!("Could not get the adjustment"))?;
             *guard = Some(SendCell::new(adj));

hammond-gtk/src/widgets/show.rs

@@ -130,7 +130,8 @@ impl ShowWidget {
     /// Save the scrollabar vajustment to the cache.
     pub fn save_vadjustment(&self, oldid: i32) -> Result<(), Error> {
         if let Ok(mut guard) = SHOW_WIDGET_VALIGNMENT.lock() {
-            let adj = self.scrolled_window
+            let adj = self
+                .scrolled_window
                 .get_vadjustment()
                 .ok_or_else(|| format_err!("Could not get the adjustment"))?;
             *guard = Some((oldid, SendCell::new(adj)));

hammond-gtk/src/widgets/shows_view.rs

@@ -78,7 +78,8 @@ impl ShowsView {
     /// Save the vertical scrollbar position.
     pub fn save_alignment(&self) -> Result<(), Error> {
         if let Ok(mut guard) = SHOWS_VIEW_VALIGNMENT.lock() {
-            let adj = self.scrolled_window
+            let adj = self
+                .scrolled_window
                 .get_vadjustment()
                 .ok_or_else(|| format_err!("Could not get the adjustment"))?;
             *guard = Some(SendCell::new(adj));

meson.build

@@ -3,7 +3,7 @@
 
 project(
   'hammond', 'rust',
-  version: '0.3.3',
+  version: '0.3.4',
   license: 'GPLv3',
 )
 

rustfmt.toml

@@ -1,5 +1,4 @@
 unstable_features = true
-verbose = false
 max_width = 100
 comment_width = 100
 wrap_comments = true