Merge branch 'master' into state-machines-experiements

hammond-gtk/src/app.rs

@@ -1,3 +1,5 @@
+#![allow(new_without_default)]
+
 use gio::{ApplicationExt, ApplicationExtManual, ApplicationFlags};
 use glib;
 use gtk;

hammond-gtk/src/headerbar.rs

@@ -209,15 +209,17 @@ fn on_url_change(
 fn about_dialog(window: &gtk::Window) {
     // Feel free to add yourself if you contribured.
     let authors = &[
+        "Constantin Nickel",
+        "Gabriele Musco",
+        "James Wykeham-Martin",
         "Jordan Petridis",
         "Julian Sparber",
-        "Gabriele Musco",
-        "Constantin Nickel",
     ];
 
     let dialog = gtk::AboutDialog::new();
     // Waiting for a logo.
-    dialog.set_logo_icon_name("org.gnome.Hammond");
+    // dialog.set_logo_icon_name("org.gnome.Hammond");
+    dialog.set_logo_icon_name("multimedia-player");
     dialog.set_comments("A Podcast Client for the GNOME Desktop.");
     dialog.set_copyright("© 2017, 2018 Jordan Petridis");
     dialog.set_license_type(gtk::License::Gpl30);

hammond-gtk/src/main.rs

@@ -1,5 +1,7 @@
-#![cfg_attr(feature = "cargo-clippy", allow(clone_on_ref_ptr, needless_pass_by_value))]
-// #![deny(unused_extern_crates, unused)]
+#![cfg_attr(feature = "cargo-clippy",
+            allow(clone_on_ref_ptr, needless_pass_by_value, useless_format))]
+#![allow(unknown_lints)]
+#![deny(unused_extern_crates, unused)]
 
 extern crate gdk;
 extern crate gdk_pixbuf;

hammond-gtk/src/stacks/show.rs

@@ -102,8 +102,9 @@ impl ShowStack {
         debug!("Name: {:?}", WidgetExt::get_name(&old));
 
         let new = ShowWidget::new(pd, self.sender.clone());
-        // Each composite ShowWidget is a gtkBox with the Podcast.id encoded in the gtk::Widget
-        // name. It's a hack since we can't yet subclass GObject easily.
+        // Each composite ShowWidget is a gtkBox with the Podcast.id encoded in the
+        // gtk::Widget name. It's a hack since we can't yet subclass GObject
+        // easily.
         let oldid = WidgetExt::get_name(&old);
         let newid = WidgetExt::get_name(&new.container);
         debug!("Old widget Name: {:?}\nNew widget Name: {:?}", oldid, newid);

hammond-gtk/src/static_resource.rs

@@ -2,14 +2,16 @@ use gio::{resources_register, Error, Resource};
 use glib::Bytes;
 
 pub fn init() -> Result<(), Error> {
-    // load the gresource binary at build time and include/link it into the final binary.
+    // load the gresource binary at build time and include/link it into the final
+    // binary.
     let res_bytes = include_bytes!("../resources/resources.gresource");
 
     // Create Resource it will live as long the value lives.
     let gbytes = Bytes::from_static(res_bytes.as_ref());
     let resource = Resource::new_from_data(&gbytes)?;
 
-    // Register the resource so It wont be dropped and will continue to live in memory.
+    // Register the resource so It wont be dropped and will continue to live in
+    // memory.
     resources_register(&resource);
 
     Ok(())

hammond-gtk/src/utils.rs

@@ -36,13 +36,14 @@ fn refresh_feed(source: Option<Vec<Source>>, sender: Sender<Action>) -> Result<(
         });
 
         // Work around to improve the feed addition experience.
-        // Many times links to rss feeds are just redirects(usually to an https version).
-        // Sadly I haven't figured yet a nice way to follow up links redirects without getting
-        // to lifetime hell with futures and hyper.
+        // Many times links to rss feeds are just redirects(usually to an https
+        // version). Sadly I haven't figured yet a nice way to follow up links
+        // redirects without getting to lifetime hell with futures and hyper.
         // So the requested refresh is only of 1 feed, and the feed fails to be indexed,
-        // (as a 301 redict would update the source entry and exit), another refresh is run.
-        // For more see hammond_data/src/models/source.rs `fn request_constructor`.
-        // also ping me on irc if or open an issue if you want to tackle it.
+        // (as a 301 redict would update the source entry and exit), another refresh is
+        // run. For more see hammond_data/src/models/source.rs `fn
+        // request_constructor`. also ping me on irc if or open an issue if you
+        // want to tackle it.
         if sources.len() == 1 {
             let source = sources.remove(0);
             let id = source.id();
@@ -56,12 +57,10 @@ fn refresh_feed(source: Option<Vec<Source>>, sender: Sender<Action>) -> Result<(
                     }
                 }
             }
-        } else {
-            // This is what would normally run
-            if let Err(err) = pipeline::run(sources, false) {
-                error!("Error While trying to update the database.");
-                error!("Error msg: {}", err);
-            }
+        // This is what would normally run
+        } else if let Err(err) = pipeline::run(sources, false) {
+            error!("Error While trying to update the database.");
+            error!("Error msg: {}", err);
         }
 
         sender

hammond-gtk/src/views/shows.rs

@@ -56,13 +56,10 @@ impl ShowsPopulated {
     fn populate_flowbox(&self) -> Result<(), Error> {
         let podcasts = dbqueries::get_podcasts()?;
 
-        podcasts
-            .into_iter()
-            .map(|pd| Arc::new(pd))
-            .for_each(|parent| {
-                let flowbox_child = ShowsChild::new(parent);
-                self.flowbox.add(&flowbox_child.child);
-            });
+        podcasts.into_iter().map(Arc::new).for_each(|parent| {
+            let flowbox_child = ShowsChild::new(parent);
+            self.flowbox.add(&flowbox_child.child);
+        });
         self.flowbox.show_all();
         Ok(())
     }

hammond-gtk/src/widgets/episode.rs

@@ -269,6 +269,7 @@ fn update_progressbar_callback(
 }
 
 #[inline]
+#[allow(if_same_then_else)]
 fn progress_bar_helper(
     prog: Arc<Mutex<manager::Progress>>,
     media: Arc<Mutex<MediaMachine>>,

hammond-gtk/src/widgets/show.rs

@@ -105,7 +105,8 @@ impl ShowWidget {
 
     /// Set the descripton text.
     fn set_description(&self, text: &str) {
-        // TODO: Temporary solution until we render html urls/bold/italic probably with markup.
+        // TODO: Temporary solution until we render html urls/bold/italic probably with
+        // markup.
         let desc = dissolve::strip_html_tags(text).join(" ");
         self.description.set_text(&replace_extra_spaces(&desc));
     }