AboutEpisode: Initial commit.

Previously each time we wanted to inspect the `Progress` struct we
were blocking which was problematic since the downloader also wants
to block to update it.

Now we use try_lock() and if a lock can't be aquired we requeue another
callback. That way we can also be way more aggressive about the interval
in whihc it the callbacks will run.

.gitlab-ci.yml

@@ -1,6 +1,20 @@
 stages:
   - test
   - lint
+  - review
+
+variables:
+    BUNDLE: "hammond-dev.flatpak"
+
+.cargo_cache_template: &cargo_cache
+    cache:
+        # JOB_NAME - Each job will have it's own cache
+        # COMMIT_REF_SLUG = Lowercase name of the branch
+        # ^ Keep diffrerent caches for each branch
+        key: "$CI_JOB_NAME"
+        paths:
+            - target/
+            - .cargo_cache/
 
 .cargo_test_template: &cargo_test
     stage: test
@@ -25,15 +39,7 @@ stages:
         - cargo build
         - cargo test -- --test-threads=1
         - cargo test -- --test-threads=1 --ignored
-
-    cache:
-        # JOB_NAME - Each job will have it's own cache
-        # COMMIT_REF_SLUG = Lowercase name of the branch
-        # ^ Keep diffrerent caches for each branch
-        key: "$CI_JOB_NAME"
-        paths:
-            - target/
-            - .cargo_cache/
+    <<: *cargo_cache
 
 rust:stable:
     # https://hub.docker.com/_/rust/
@@ -49,7 +55,7 @@ rust:nightly:
         - web
 
 flatpak:
-    image: registry.gitlab.com/alatiera/gnome-nightly-oci/rust-bundle:latest
+    image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/rust_bundle:3.28
     stage: test
     script:
         - flatpak-builder --stop-at=hammond app org.gnome.Hammond.json
@@ -64,15 +70,15 @@ flatpak:
         - flatpak build-export repo app
 
         # Create a flatpak bundle
-        - flatpak build-bundle repo hammond-dev.flatpak org.gnome.Hammond
+        - flatpak build-bundle repo ${BUNDLE} org.gnome.Hammond
         # Run the tests
         # - flatpak-builder --run app org.gnome.Hammond.json cargo test -- --test-threads=1
         # - flatpak-builder --run app org.gnome.Hammond.json cargo test -- --test-threads=1 --ignored
 
     artifacts:
         paths:
-            - hammond-dev.flatpak
-        expire_in: 2 days
+            - $BUNDLE
+        expire_in: 30 days
 
     cache:
         # JOB_NAME - Each job will have it's own cache
@@ -83,6 +89,34 @@ flatpak:
           - .flatpak-builder/cache/
           - target/
 
+review:
+    stage: review
+    dependencies:
+        - flatpak
+    script:
+        - echo "Generating flatpak deployment"
+    artifacts:
+        paths:
+            - $BUNDLE
+        expire_in: 30 days
+    environment:
+        name: review/$CI_COMMIT_REF_NAME
+        url: https://gitlab.gnome.org/$CI_PROJECT_PATH/-/jobs/$CI_JOB_ID/artifacts/raw/${BUNDLE}
+        on_stop: stop_review
+    except:
+        - master@World/hammond
+
+stop_review:
+    stage: review
+    script:
+        - echo "Stopping flatpak deployment"
+    when: manual
+    environment:
+        name: review/$CI_COMMIT_REF_NAME
+        action: stop
+    except:
+        - master@World/hammond
+
 # Configure and run rustfmt on nightly
 # Exits and builds fails if on bad format
 rustfmt:
@@ -91,22 +125,20 @@ 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.
 clippy:
-    image: "rustlang/rust:nightly"
+    image: "registry.gitlab.gnome.org/alatiera/hammond-container-images/clippy:nightly"
     stage: lint
     variables:
         RUSTFLAGS: "--cfg rayon_unstable"
-    before_script:
-        - apt-get update -yqq
-        - apt-get install -yqq --no-install-recommends build-essential libgtk-3-dev meson
+        CARGO_HOME: ".cargo_cache"
     script:
         - rustc --version && cargo --version
-        - cargo install clippy --force
+        - cargo clippy --version
         # Force regeneration of gresources regardless of artifacts chage
         - cd hammond-gtk/resources/ && glib-compile-resources --generate resources.xml && cd ../../
         - cargo clippy --all
-    allow_failure: true
+    <<: *cargo_cache

.gitlab/issue_templates/Epic.md

@@ -0,0 +1,42 @@
+ Current problems
+ <!--
+ What are the problems that the current project has?
+
+ For example:
+ * User cannot use the keyboard to perform most common actions
+ or
+ * User cannot see documents from cloud services
+ -->
+
+ # Goals & use cases
+ <!--
+ What are the use cases that this proposal will cover? What are the end goals?
+
+ For example:
+ * User needs to share a file with their friends.
+ or
+ * It should be easy to edit a picture within the app.
+ -->
+
+ # Requirements
+ <!--
+ What does the solution needs to ensure for being succesful?
+
+ For example:
+ * Work on small form factors and touch
+ or
+ * Use the Meson build system and integrate with it
+ -->
+
+ # Relevant art
+ <!--
+ Is there any product that has implemented something similar? Put links to other
+ projects, pictures, links to other code, etc.
+ -->
+
+ # Proposal & plan
+ <!-- What's the solution and how should be achieved? It can be split in smaller
+ tasks of minimum change, so they can be delivered across several releases. -->
+
+ /label ~"Epic"
+

CHANGELOG.md

@@ -5,7 +5,36 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Added:
+- Keyboard Shortcuts and a Shortcuts dialog were implemented. (ZanderBrown) [!33](https://gitlab.gnome.org/World/hammond/merge_requests/33)
 
+### Changed:
+- The `FileChooser` of the OPML import was changed to use the `FileChooserNative` widget/API. (ZanderBrown) [!33](https://gitlab.gnome.org/World/hammond/merge_requests/33)
+- The `EpisdeWidget` was refactored. [!38](https://gitlab.gnome.org/World/hammond/merge_requests/38)
+- `EpisdeWidget`'s progressbar was changed to be non-blocking and should feel way more responsive now. 9b0ac5b83dadecdff51cd398293afdf0d5276012
+
+### Fixed:
+- Fixed a bug whre the about dialog would be unclosable. (ZanderBrown) [!37](https://gitlab.gnome.org/World/hammond/merge_requests/37)
+
+### 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.
+- ShowsView now rembmers the vertical alignment of the scrollbar between refreshes. 4d2b64e79d8518454b3677612664cd32044cf837
+
+### Changed:
+- Minimum `rustc` version requirment was bumped to `1.26`
+- Some animations should be smoother now. 7d598bb1d08b05fd5ab532657acdad967c0afbc3
+- InAppNotification now can be used to propagate some erros to the user. 7035fe05c4741b3e7ccce6827f72766226d5fc0a and 118dac5a1ab79c0b4ebe78e88256a4a38b138c04
+
+### Fixed:
+- Fixed a of by one bug in the `ShowsView` where the last show was never shown. bd12b09cbc8132fd39a266fd091e24bc6c3c040f
 
 ## [0.3.2] - 2018-05-07
 ### Added:

README.md

@@ -68,7 +68,7 @@ sudo ninja -C build install
 
 #### Dependencies
 
-* Rust stable 1.22 or later along with cargo.
+* Rust stable 1.26 or later along with cargo.
 * Gtk+ 3.22 or later
 * Meson
 * A network connection

TODO.md

@@ -4,12 +4,11 @@
 
 ## Priorities
 
-- [ ] Unplayed Only and Downloaded only view.
 - [ ] OPML import/export // Probably need to create a crate.
 
 ## Second
 
-- [ ] Make use of file metadas, [This](https://github.com/GuillaumeGomez/audio-video-metadata) might be helpfull.
+- [ ] Make use of file metadas?, [This](https://github.com/GuillaumeGomez/audio-video-metadata) might be helpfull.
 - [ ] Episode queue
 - [ ] Embedded player
 - [ ] MPRIS integration
@@ -19,14 +18,8 @@
 
 - [ ] Download Queue
 - [ ] Ability to Stream content on demand
-- [ ] soundcloud and itunes feeds // [This](http://getrssfeed.com) seems intresting.
+- [ ] rss feeds from soundcloud urls? // [This](http://getrssfeed.com) seems intresting.
 - [ ] Integrate with Itunes API for various crap?
 - [ ] YoutubeFeeds?
 
 ## Rest Tasks
-
-**Would be nice:**
-
-- [ ] Make Podcast cover fetchng and loading not block the execution of the program at startup.
-- [ ] Lazy evaluate episode loading based on the show_widget's scrolling.
-

hammond-data/Cargo.toml

@@ -16,8 +16,9 @@ rfc822_sanitizer = "0.3.3"
 rss = "1.5.0"
 url = "1.7.0"
 xdg = "2.1.0"
+xml-rs = "0.8.0"
 futures = "0.1.21"
-hyper = "0.11.25"
+hyper = "0.11.27"
 tokio-core = "0.1.17"
 hyper-tls = "0.1.3"
 native-tls = "0.1.5"
@@ -25,24 +26,20 @@ num_cpus = "1.8.0"
 failure = "0.1.1"
 failure_derive = "0.1.1"
 
-# newer stuff do not compile inside flatpak
-html5ever = "= 0.22.0"
-string_cache = "= 0.7.1"
-string_cache_codegen = "= 0.4.0"
-
 [dependencies.diesel]
 features = ["sqlite", "r2d2"]
-version = "1.2.2"
+version = "= 1.2.2"
 
 [dependencies.diesel_migrations]
 features = ["sqlite"]
-version = "1.2.0"
+version = "= 1.2.0"
 
 [dev-dependencies]
-rand = "0.4.2"
+rand = "0.5.0"
 tempdir = "0.3.7"
 criterion = "0.2.3"
 pretty_assertions = "0.5.1"
+maplit = "1.0.1"
 
 [[bench]]
 name = "bench"

hammond-data/src/database.rs

@@ -1,4 +1,6 @@
 //! Database Setup. This is only public to help with some unit tests.
+// Diesel embed_migrations! triggers the lint
+#![allow(unused_imports)]
 
 use diesel::prelude::*;
 use diesel::r2d2;

hammond-data/src/dbqueries.rs

@@ -129,6 +129,18 @@ pub fn get_episode_local_uri_from_id(ep_id: i32) -> Result<Option<String>, DataE
         .map_err(From::from)
 }
 
+pub fn get_episode_description(rowid_: i32) -> Result<Option<String>, DataError> {
+    use schema::episode::dsl::*;
+    let db = connection();
+    let con = db.get()?;
+
+    episode
+        .filter(rowid.eq(rowid_))
+        .select(description)
+        .get_result::<Option<String>>(&con)
+        .map_err(From::from)
+}
+
 pub fn get_episodes_widgets_filter_limit(
     filter_ids: &[i32],
     limit: u32,
@@ -360,7 +372,18 @@ pub(crate) fn episode_exists(title_: &str, podcast_id_: i32) -> Result<bool, Dat
         .map_err(From::from)
 }
 
-/// Check if the `episode table contains any rows
+pub fn episode_had_description(rowid_: i32) -> Result<bool, DataError> {
+    use schema::episode::dsl::*;
+
+    let db = connection();
+    let con = db.get()?;
+
+    select(exists(episode.filter(rowid.eq(rowid_))))
+        .get_result(&con)
+        .map_err(From::from)
+}
+
+/// Check if the `episode` table contains any rows
 ///
 /// Return true if `episode` table is populated.
 pub fn is_episodes_populated() -> Result<bool, DataError> {

hammond-data/src/errors.rs

@@ -5,6 +5,7 @@ use hyper;
 use native_tls;
 use rss;
 use url;
+use xml;
 
 use std::io;
 
@@ -49,6 +50,8 @@ pub enum DataError {
     IOError(#[cause] io::Error),
     #[fail(display = "RSS Error: {}", _0)]
     RssError(#[cause] rss::Error),
+    #[fail(display = "XML Reader Error: {}", _0)]
+    XmlReaderError(#[cause] xml::reader::Error),
     #[fail(display = "Error: {}", _0)]
     Bail(String),
     #[fail(display = "{}", _0)]
@@ -115,6 +118,12 @@ impl From<rss::Error> for DataError {
     }
 }
 
+impl From<xml::reader::Error> for DataError {
+    fn from(err: xml::reader::Error) -> Self {
+        DataError::XmlReaderError(err)
+    }
+}
+
 impl From<String> for DataError {
     fn from(err: String) -> Self {
         DataError::Bail(err)

hammond-data/src/feed.rs

@@ -25,23 +25,21 @@ pub struct Feed {
 
 impl Feed {
     /// Index the contents of the RSS `Feed` into the database.
-    pub fn index(self) -> Box<Future<Item = (), Error = DataError> + Send> {
-        let fut = self.parse_podcast_async()
+    pub fn index(self) -> impl Future<Item = (), Error = DataError> + Send {
+        self.parse_podcast_async()
             .and_then(|pd| pd.to_podcast())
-            .and_then(move |pd| self.index_channel_items(pd));
-
-        Box::new(fut)
+            .and_then(move |pd| self.index_channel_items(pd))
     }
 
     fn parse_podcast(&self) -> NewPodcast {
         NewPodcast::new(&self.channel, self.source_id)
     }
 
-    fn parse_podcast_async(&self) -> Box<Future<Item = NewPodcast, Error = DataError> + Send> {
-        Box::new(ok(self.parse_podcast()))
+    fn parse_podcast_async(&self) -> impl Future<Item = NewPodcast, Error = DataError> + Send {
+        ok(self.parse_podcast())
     }
 
-    fn index_channel_items(self, pd: Podcast) -> Box<Future<Item = (), Error = DataError> + Send> {
+    fn index_channel_items(self, pd: Podcast) -> impl Future<Item = (), Error = DataError> + Send {
         let stream = stream::iter_ok::<_, DataError>(self.channel.into_items());
 
         // Parse the episodes
@@ -52,11 +50,9 @@ impl Feed {
         });
 
         // Filter errors, Index updatable episodes, return insertables.
-        let insertables = filter_episodes(episodes);
-        // Batch index insertable episodes.
-        let idx = insertables.and_then(|eps| ok(batch_insert_episodes(&eps)));
-
-        Box::new(idx)
+        filter_episodes(episodes)
+            // Batch index insertable episodes.
+            .and_then(|eps| ok(batch_insert_episodes(&eps)))
     }
 }
 
@@ -87,11 +83,11 @@ fn determine_ep_state(
 
 fn filter_episodes<'a, S>(
     stream: S,
-) -> Box<Future<Item = Vec<NewEpisode>, Error = DataError> + Send + 'a>
+) -> impl Future<Item = Vec<NewEpisode>, Error = DataError> + Send + 'a
 where
     S: Stream<Item = IndexState<NewEpisode>, Error = DataError> + Send + 'a,
 {
-    let list = stream.filter_map(|state| match state {
+    stream.filter_map(|state| match state {
         IndexState::NotChanged => None,
         // Update individual rows, and filter them
         IndexState::Update((ref ep, rowid)) => {
@@ -105,9 +101,7 @@ where
         IndexState::Index(s) => Some(s),
     })
     // only Index is left, collect them for batch index
-    .collect();
-
-    Box::new(list)
+    .collect()
 }
 
 fn batch_insert_episodes(episodes: &[NewEpisode]) {
@@ -180,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/lib.rs

@@ -1,4 +1,5 @@
 #![recursion_limit = "1024"]
+#![allow(unknown_lints)]
 #![cfg_attr(all(test, feature = "clippy"), allow(option_unwrap_used, result_unwrap_used))]
 #![cfg_attr(feature = "cargo-clippy", allow(option_map_unit_fn))]
 #![cfg_attr(
@@ -9,15 +10,12 @@
         items_after_statements, used_underscore_binding
     )
 )]
-#![allow(unknown_lints)]
 #![warn(
     bad_style, const_err, dead_code, improper_ctypes, legacy_directory_ownership,
     non_shorthand_field_patterns, no_mangle_generic_items, overflowing_literals, path_statements,
     patterns_in_fns_without_body, plugin_as_library, private_in_public, private_no_mangle_fns,
     private_no_mangle_statics, safe_extern_statics, unconditional_recursion,
-    unions_with_drop_fields, unused_allocation, unused_comparisons, unused_parens, while_true
-)]
-#![warn(
+    unions_with_drop_fields, unused_allocation, unused_comparisons, unused_parens, while_true,
     missing_debug_implementations, missing_docs, trivial_casts, trivial_numeric_casts,
     unused_extern_crates, unused
 )]
@@ -29,6 +27,10 @@
 #[macro_use]
 extern crate pretty_assertions;
 
+#[cfg(test)]
+#[macro_use]
+extern crate maplit;
+
 #[macro_use]
 extern crate derive_builder;
 #[macro_use]
@@ -58,6 +60,7 @@ extern crate rss;
 extern crate tokio_core;
 extern crate url;
 extern crate xdg;
+extern crate xml;
 
 pub mod database;
 #[allow(missing_docs)]
@@ -66,6 +69,7 @@ pub mod dbqueries;
 pub mod errors;
 mod feed;
 pub(crate) mod models;
+pub mod opml;
 mod parser;
 pub mod pipeline;
 mod schema;

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.duration() == other.duration()) && (self.epoch() == other.epoch())
-            && (self.guid() == other.guid()) && (self.podcast_id() == other.podcast_id())
+        (self.title() == other.title())
+            && (self.uri() == other.uri())
+            && (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.duration() == other.duration()) && (self.epoch() == other.epoch())
-            && (self.guid() == other.guid()) && (self.podcast_id() == other.podcast_id())
+        (self.title() == other.title())
+            && (self.uri() == other.uri())
+            && (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.duration() == other.duration()) && (self.epoch() == other.epoch())
-            && (self.guid() == other.guid()) && (self.podcast_id() == other.podcast_id())
+        (self.title() == other.title())
+            && (self.uri() == other.uri())
+            && (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-data/src/models/source.rs

@@ -4,8 +4,9 @@ use rss::Channel;
 use url::Url;
 
 use hyper::client::HttpConnector;
-use hyper::header::{ETag, EntityTag, HttpDate, IfModifiedSince, IfNoneMatch, LastModified,
-                    Location, UserAgent};
+use hyper::header::{
+    ETag, EntityTag, HttpDate, IfModifiedSince, IfNoneMatch, LastModified, Location, UserAgent,
+};
 use hyper::{Client, Method, Request, Response, StatusCode, Uri};
 use hyper_tls::HttpsConnector;
 
@@ -177,7 +178,7 @@ impl Source {
         self,
         client: Client<HttpsConnector<HttpConnector>>,
         ignore_etags: bool,
-    ) -> Box<Future<Item = Feed, Error = DataError>> {
+    ) -> impl Future<Item = Feed, Error = DataError> {
         let id = self.id();
         let response = loop_fn(self, move |source| {
             source
@@ -194,7 +195,7 @@ impl Source {
                 })
         });
 
-        let feed = response
+        response
             .and_then(response_to_channel)
             .and_then(move |chan| {
                 FeedBuilder::default()
@@ -202,9 +203,7 @@ impl Source {
                     .source_id(id)
                     .build()
                     .map_err(From::from)
-            });
-
-        Box::new(feed)
+            })
     }
 
     // TODO: make ignore_etags an Enum for better ergonomics.
@@ -213,7 +212,7 @@ impl Source {
         self,
         client: &Client<HttpsConnector<HttpConnector>>,
         ignore_etags: bool,
-    ) -> Box<Future<Item = Response, Error = DataError>> {
+    ) -> impl Future<Item = Response, Error = DataError> {
         // FIXME: remove unwrap somehow
         let uri = Uri::from_str(self.uri()).unwrap();
         let mut req = Request::new(Method::Get, uri);
@@ -234,25 +233,22 @@ impl Source {
             }
         }
 
-        let work = client
+        client
             .request(req)
             .map_err(From::from)
-            .and_then(move |res| self.match_status(res));
-        Box::new(work)
+            .and_then(move |res| self.match_status(res))
     }
 }
 
 #[allow(needless_pass_by_value)]
-fn response_to_channel(res: Response) -> Box<Future<Item = Channel, Error = DataError> + Send> {
-    let chan = res.body()
+fn response_to_channel(res: Response) -> impl Future<Item = Channel, Error = DataError> + Send {
+    res.body()
         .concat2()
         .map(|x| x.into_iter())
         .map_err(From::from)
         .map(|iter| iter.collect::<Vec<u8>>())
         .map(|utf_8_bytes| String::from_utf8_lossy(&utf_8_bytes).into_owned())
-        .and_then(|buf| Channel::from_str(&buf).map_err(From::from));
-
-    Box::new(chan)
+        .and_then(|buf| Channel::from_str(&buf).map_err(From::from))
 }
 
 #[cfg(test)]

hammond-data/src/opml.rs

@@ -0,0 +1,167 @@
+//! FIXME: Docs
+
+// #![allow(unused)]
+
+use errors::DataError;
+use models::Source;
+use xml::reader;
+
+use std::collections::HashSet;
+use std::fs;
+use std::io::Read;
+use std::path::Path;
+
+// use std::fs::{File, OpenOptions};
+// use std::io::BufReader;
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+// FIXME: Make it a Diesel model
+/// Represents an `outline` xml element as per the `OPML` [specification][spec]
+/// not `RSS` related sub-elements are ommited.
+///
+/// [spec]: http://dev.opml.org/spec2.html
+pub struct Opml {
+    title: String,
+    description: String,
+    url: String,
+}
+
+/// Import feed url's from a `R` into the `Source` table.
+// TODO: Write test
+pub fn import_to_db<R: Read>(reader: R) -> Result<Vec<Source>, reader::Error> {
+    let feeds = extract_sources(reader)?
+        .iter()
+        .map(|opml| Source::from_url(&opml.url))
+        .filter_map(|s| {
+            if let Err(ref err) = s {
+                let txt = "If you think this might be a bug please consider filling a report over \
+                           at https://gitlab.gnome.org/World/hammond/issues/new";
+
+                error!("Failed to import a Show: {}", err);
+                error!("{}", txt);
+            }
+
+            s.ok()
+        })
+        .collect();
+
+    Ok(feeds)
+}
+
+/// Open a File from `P`, try to parse the OPML then insert the Feeds in the database and
+/// return the new `Source`s
+// TODO: Write test
+pub fn import_from_file<P: AsRef<Path>>(path: P) -> Result<Vec<Source>, DataError> {
+    let content = fs::read(path)?;
+    import_to_db(content.as_slice()).map_err(From::from)
+}
+
+/// Extracts the `outline` elemnts from a reader `R` and returns a `HashSet` of `Opml` structs.
+pub fn extract_sources<R: Read>(reader: R) -> Result<HashSet<Opml>, reader::Error> {
+    let mut list = HashSet::new();
+    let parser = reader::EventReader::new(reader);
+
+    parser
+        .into_iter()
+        .map(|e| match e {
+            Ok(reader::XmlEvent::StartElement {
+                name, attributes, ..
+            }) => {
+                if name.local_name == "outline" {
+                    let mut title = String::new();
+                    let mut url = String::new();
+                    let mut description = String::new();
+
+                    attributes.into_iter().for_each(|attribute| {
+                        match attribute.name.local_name.as_str() {
+                            "title" => title = attribute.value,
+                            "xmlUrl" => url = attribute.value,
+                            "description" => description = attribute.value,
+                            _ => {}
+                        }
+                    });
+
+                    let feed = Opml {
+                        title,
+                        description,
+                        url,
+                    };
+                    list.insert(feed);
+                }
+                Ok(())
+            }
+            Err(err) => Err(err),
+            _ => Ok(()),
+        })
+        .collect::<Result<Vec<_>, reader::Error>>()?;
+
+    Ok(list)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use chrono::Local;
+
+    #[test]
+    fn test_extract() {
+        let int_title = String::from("Intercepted with Jeremy Scahill");
+        let int_url = String::from("https://feeds.feedburner.com/InterceptedWithJeremyScahill");
+        let int_desc =
+            String::from(
+                "The people behind The Intercept’s fearless reporting and incisive \
+                 commentary—Jeremy Scahill, Glenn Greenwald, Betsy Reed and others—discuss the \
+                 crucial issues of our time: national security, civil liberties, foreign policy, \
+                 and criminal justice.  Plus interviews with artists, thinkers, and newsmakers \
+                 who challenge our preconceptions about the world we live in.",
+            );
+
+        let dec_title = String::from("Deconstructed with Mehdi Hasan");
+        let dec_url = String::from("https://rss.prod.firstlook.media/deconstructed/podcast.rss");
+        let dec_desc = String::from(
+            "Journalist Mehdi Hasan is known around the world for his televised takedowns of \
+             presidents and prime ministers. In this new podcast from The Intercept, Mehdi \
+             unpacks a game-changing news event of the week while challenging the conventional \
+             wisdom. As a Brit, a Muslim and an immigrant based in Donald Trump's Washington \
+             D.C., Mehdi gives a refreshingly provocative perspective on the ups and downs of \
+             American—and global—politics.",
+        );
+
+        #[cfg_attr(rustfmt, rustfmt_skip)]
+        let sample1 = format!(
+            "<?xml version=\"1.0\" encoding=\"UTF-8\"?> \
+             <opml version=\"2.0\"> \
+               <head> \
+                 <title>Test OPML File</title> \
+                 <dateCreated>{}</dateCreated> \
+                 <docs>http://www.opml.org/spec2</docs> \
+               </head> \
+               <body> \
+                 <outline type=\"rss\" title=\"{}\" description=\"{}\" xmlUrl=\"{}\"/> \
+                 <outline type=\"rss\" title=\"{}\" description=\"{}\" xmlUrl=\"{}\"/> \
+               </body> \
+             </opml>",
+            Local::now().format("%a, %d %b %Y %T %Z"),
+            int_title,
+            int_desc,
+            int_url,
+            dec_title,
+            dec_desc,
+            dec_url,
+        );
+
+        let map = hashset![
+            Opml {
+                title: int_title,
+                description: int_desc,
+                url: int_url
+            },
+            Opml {
+                title: dec_title,
+                description: dec_desc,
+                url: dec_url
+            },
+        ];
+        assert_eq!(extract_sources(sample1.as_bytes()).unwrap(), map);
+    }
+}

hammond-data/src/pipeline.rs

@@ -50,24 +50,22 @@ pub fn pipeline<'a, S>(
     sources: S,
     ignore_etags: bool,
     client: &HttpsClient,
-) -> Box<Future<Item = Vec<()>, Error = DataError> + 'a>
+) -> impl Future<Item = Vec<()>, Error = DataError> + 'a
 where
     S: Stream<Item = Source, Error = DataError> + 'a,
 {
-    let pipeline = sources
+    sources
         .and_then(clone!(client => move |s| s.into_feed(client.clone(), ignore_etags)))
         .and_then(|feed| rayon::scope(|s| s.spawn_future(feed.index())))
         // the stream will stop at the first error so
         // we ensure that everything will succeded regardless.
         .map_err(|err| error!("Error: {}", err))
         .then(|_| ok::<(), DataError>(()))
-        .collect();
-
-    Box::new(pipeline)
+        .collect()
 }
 
 /// Creates a tokio `reactor::Core`, and a `hyper::Client` and
-/// runs the pipeline.
+/// runs the pipeline to completion. The `reactor::Core` is dropped afterwards.
 pub fn run<S>(sources: S, ignore_etags: bool) -> Result<(), DataError>
 where
     S: IntoIterator<Item = Source>,

hammond-downloader/Cargo.toml

@@ -6,7 +6,7 @@ workspace = "../"
 
 [dependencies]
 error-chain = "0.11.0"
-hyper = "0.11.25"
+hyper = "0.11.27"
 log = "0.4.1"
 mime_guess = "1.8.4"
 reqwest = "0.8.5"

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/Cargo.toml

@@ -21,15 +21,14 @@ send-cell = "0.1.3"
 url = "1.7.0"
 failure = "0.1.1"
 failure_derive = "0.1.1"
-take_mut = "0.2.2"
-regex = "0.2.10"
+regex = "1.0.0"
 reqwest = "0.8.5"
-serde_json = "1.0.15"
+serde_json = "1.0.17"
 html2pango = { git = "https://gitlab.gnome.org/World/html2pango" }
 
 [dependencies.gtk]
 features = ["v3_22"]
-version = "0.4.0"
+version = "0.4.1"
 
 [dependencies.gio]
 features = ["v2_50"]

hammond-gtk/resources/gtk/episode_widget.ui

@@ -41,37 +41,26 @@ Tobias Bernard
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <child>
-          <object class="GtkBox">
+          <object class="GtkBox" id="info_container">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
-              <object class="GtkBox">
+              <object class="GtkLabel" id="title_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <child>
-                  <object class="GtkLabel" id="title_label">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Episode Title</property>
-                    <property name="ellipsize">end</property>
-                    <property name="width_chars">55</property>
-                    <property name="single_line_mode">True</property>
-                    <property name="track_visited_links">False</property>
-                    <property name="lines">1</property>
-                    <property name="xalign">0</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
+                <property name="label" translatable="yes">Episode Title</property>
+                <property name="ellipsize">end</property>
+                <property name="width_chars">55</property>
+                <property name="single_line_mode">True</property>
+                <property name="track_visited_links">False</property>
+                <property name="lines">1</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">False</property>
+                <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
@@ -213,23 +202,53 @@ Tobias Bernard
           </packing>
         </child>
         <child>
-          <object class="GtkBox">
+          <object class="GtkButtonBox" id="button_box">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="spacing">6</property>
+            <property name="layout_style">center</property>
             <child>
-              <object class="GtkButton" id="cancel_button">
-                <property name="label" translatable="yes">Cancel</property>
+              <object class="GtkButton" id="desc_button">
+                <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="no_show_all">True</property>
+                <property name="receives_default">True</property>
+                <property name="halign">center</property>
                 <property name="valign">center</property>
+                <child>
+                  <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="icon_name">view-paged-symbolic</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+                <property name="non_homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="play_button">
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="no_show_all">True</property>
+                <property name="tooltip_text" translatable="yes">Play this episode</property>
+                <property name="halign">center</property>
+                <property name="valign">center</property>
+                <child>
+                  <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="icon_name">media-playback-start-symbolic</property>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="pack_type">end</property>
-                <property name="position">0</property>
+                <property name="position">2</property>
+                <property name="non_homogeneous">True</property>
               </packing>
             </child>
             <child>
@@ -237,8 +256,8 @@ Tobias Bernard
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="no_show_all">True</property>
                 <property name="tooltip_text" translatable="yes">Download this episode</property>
+                <property name="halign">center</property>
                 <property name="valign">center</property>
                 <property name="always_show_image">True</property>
                 <child>
@@ -252,24 +271,17 @@ Tobias Bernard
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="pack_type">end</property>
-                <property name="position">2</property>
+                <property name="position">3</property>
+                <property name="non_homogeneous">True</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="play_button">
+              <object class="GtkButton" id="cancel_button">
+                <property name="label" translatable="yes">Cancel</property>
                 <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="no_show_all">True</property>
-                <property name="tooltip_text" translatable="yes">Play this episode</property>
+                <property name="receives_default">False</property>
+                <property name="halign">center</property>
                 <property name="valign">center</property>
-                <child>
-                  <object class="GtkImage">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="icon_name">media-playback-start-symbolic</property>
-                  </object>
-                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -282,7 +294,6 @@ Tobias Bernard
           <packing>
             <property name="expand">False</property>
             <property name="fill">False</property>
-            <property name="padding">6</property>
             <property name="pack_type">end</property>
             <property name="position">1</property>
           </packing>

hammond-gtk/resources/gtk/headerbar.ui

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.21.0 
+<!-- Generated with glade 3.22.0 
 
 Copyright (C) 2017 - 2018
 
@@ -168,7 +168,7 @@ Tobias Bernard
       </object>
     </child>
     <child>
-      <object class="GtkButton" id="back_button">
+      <object class="GtkButton" id="back">
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
         <property name="no_show_all">True</property>
@@ -257,12 +257,12 @@ Tobias Bernard
       </object>
     </child>
     <child>
-      <object class="GtkMenuButton" id="menu_toggle">
+      <object class="GtkMenuButton" id="menu_button">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
         <property name="valign">center</property>
-        <property name="popover">menu_popover</property>
+        <property name="use_popover">True</property>
         <child>
           <object class="GtkImage">
             <property name="visible">True</property>
@@ -281,98 +281,4 @@ Tobias Bernard
       </packing>
     </child>
   </object>
-  <object class="GtkPopover" id="menu_popover">
-    <property name="can_focus">False</property>
-    <property name="relative_to">menu_toggle</property>
-    <child>
-      <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_left">10</property>
-        <property name="margin_right">10</property>
-        <property name="margin_top">10</property>
-        <property name="margin_bottom">10</property>
-        <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkModelButton">
-            <property name="visible">True</property>
-            <property name="sensitive">False</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="text" translatable="yes">Preferences</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkModelButton" id="update_button">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="text" translatable="yes">Check for new episodes</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkSeparator">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkModelButton" id="about_button">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="text" translatable="yes">About</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">6</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkModelButton">
-            <property name="visible">True</property>
-            <property name="sensitive">False</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="text" translatable="yes">Help</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">7</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkModelButton">
-            <property name="visible">True</property>
-            <property name="sensitive">False</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="text" translatable="yes">Keyboard Shortcuts</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">8</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>
+</interface>

hammond-gtk/resources/gtk/help-overlay.ui

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="GtkShortcutsWindow" id="help_overlay">
+    <property name="modal">True</property>
+    <child>
+      <object class="GtkShortcutsSection">
+        <property name="section-name">shortcuts</property>
+        <property name="max-height">12</property>
+        <property name="visible">True</property>
+        <child>
+          <object class="GtkShortcutsGroup">
+            <property name="title" translatable="yes">General</property>
+            <property name="visible">True</property>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">True</property>
+                <property name="accelerator">&lt;primary&gt;r</property>
+                <property name="title" translatable="yes" context="shortcut window">Check for new episodes</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">True</property>
+                <property name="accelerator">&lt;primary&gt;q</property>
+                <property name="title" translatable="yes" context="shortcut window">Quit the application</property>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>

hammond-gtk/resources/gtk/menus.ui

@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <menu id="menu">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_Check for new episodes</attribute>
+        <attribute name="action">app.refresh</attribute>
+        <attribute name="accel">&lt;primary&gt;r</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">_Import Shows</attribute>
+        <attribute name="action">app.import</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">_Export Shows</attribute>
+        <attribute name="action">app.export</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_Preferences</attribute>
+        <attribute name="action">app.preferences</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_Keyboard Shortcuts</attribute>
+        <attribute name="action">win.show-help-overlay</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">_Help</attribute>
+        <attribute name="action">app.help</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">_About</attribute>
+        <attribute name="action">app.about</attribute>
+      </item>
+    </section>
+  </menu>
+</interface>

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

@@ -28,7 +28,7 @@
     </screenshot>
   </screenshots>
   <releases>
-    <release version="0.3.2" date="2018-05-07"/>
+    <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/resources/resources.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/org/gnome/hammond/">
+  <gresource prefix="/org/gnome/Hammond/">
       <file compressed="true" preprocess="xml-stripblanks">gtk/episode_widget.ui</file>
       <file compressed="true" preprocess="xml-stripblanks">gtk/show_widget.ui</file>
       <file compressed="true" preprocess="xml-stripblanks">gtk/empty_view.ui</file>
@@ -11,6 +11,8 @@
       <file compressed="true" preprocess="xml-stripblanks">gtk/shows_child.ui</file>
       <file compressed="true" preprocess="xml-stripblanks">gtk/headerbar.ui</file>
       <file compressed="true" preprocess="xml-stripblanks">gtk/inapp_notif.ui</file>
+      <file compressed="true" preprocess="xml-stripblanks">gtk/menus.ui</file>
+      <file compressed="true" preprocess="xml-stripblanks">gtk/help-overlay.ui</file>
       <file compressed="true">gtk/style.css</file>
   </gresource>
 </gresources>

hammond-gtk/src/app.rs

@@ -1,24 +1,42 @@
 #![allow(new_without_default)]
 
-use gio::{ApplicationExt, ApplicationExtManual, ApplicationFlags, Settings, SettingsExt};
+use gio::{
+    ActionMapExt, ApplicationExt, ApplicationExtManual, ApplicationFlags, Settings, SettingsExt,
+    SimpleAction, SimpleActionExt,
+};
 use glib;
 use gtk;
 use gtk::prelude::*;
 use gtk::SettingsExt as GtkSettingsExt;
 
-use hammond_data::Podcast;
+use crossbeam_channel::{unbounded, Sender};
+use hammond_data::{Podcast, dbqueries};
 
 use headerbar::Header;
 use settings::{self, WindowGeometry};
 use stacks::{Content, PopulatedState};
 use utils;
-use widgets::{mark_all_notif, remove_show_notif};
+use widgets::appnotif::{InAppNotification, UndoState};
+use widgets::{about_dialog, mark_all_notif, remove_show_notif};
 
 use std::rc::Rc;
-use std::sync::mpsc::{channel, Receiver, Sender};
 use std::sync::Arc;
 
-#[derive(Clone, Debug)]
+/// Creates an action named $called in the action map $on with the handler $handle
+macro_rules! action {
+    ($on:expr, $called:expr, $handle:expr) => {{
+        // Create a stateless, parameterless action
+        let act = SimpleAction::new($called, None);
+        // Connect the handler
+        act.connect_activate($handle);
+        // Add it to the map
+        $on.add_action(&act);
+        // Return the action
+        act
+    }};
+}
+
+#[derive(Debug, Clone)]
 pub enum Action {
     RefreshAllViews,
     RefreshEpisodesView,
@@ -34,17 +52,13 @@ pub enum Action {
     HeaderBarHideUpdateIndicator,
     MarkAllPlayerNotification(Arc<Podcast>),
     RemoveShow(Arc<Podcast>),
+    ErrorNotification(String),
+    AboutWidget(i32),
 }
 
 #[derive(Debug)]
 pub struct App {
     app_instance: gtk::Application,
-    window: gtk::Window,
-    overlay: gtk::Overlay,
-    header: Rc<Header>,
-    content: Rc<Content>,
-    receiver: Receiver<Action>,
-    sender: Sender<Action>,
     settings: Settings,
 }
 
@@ -61,66 +75,150 @@ impl App {
         let cleanup_date = settings::get_cleanup_date(&settings);
         utils::cleanup(cleanup_date);
 
-        // Create the main window
-        let window = gtk::Window::new(gtk::WindowType::Toplevel);
+        application.connect_startup(clone!(settings => move |app| {
+            let (sender, receiver) = unbounded();
 
-        window.set_title("Hammond");
+            App::setup_gactions(&app, &sender);
 
-        let app_clone = application.clone();
-        let window_clone = window.clone();
-        let settings_clone = settings.clone();
-        window.connect_delete_event(move |_, _| {
-            WindowGeometry::from_window(&window_clone).write(&settings_clone);
-            app_clone.quit();
-            Inhibit(false)
-        });
+            app.connect_activate(clone!(sender, settings => move |app| {
+                // Get the current window (if any)
+                if let Some(window) = app.get_active_window() {
+                    // Already open, just raise the window
+                    window.present();
+                } else {
+                    // Time to open one!
+                    // Create the main window
+                    let window = gtk::ApplicationWindow::new(&app);
+                    window.set_title("Hammond");
 
-        let (sender, receiver) = channel();
+                    window.connect_delete_event(clone!(app, settings => move |window, _| {
+                        WindowGeometry::from_window(&window).write(&settings);
+                        app.quit();
+                        Inhibit(false)
+                    }));
 
-        // Create a content instance
-        let content =
-            Rc::new(Content::new(sender.clone()).expect("Content Initialization failed."));
+                    // Create a content instance
+                    let content =
+                        Rc::new(Content::new(sender.clone()).expect(
+                            "Content Initialization failed."));
 
-        // Create the headerbar
-        let header = Rc::new(Header::new(&content, &window, &sender));
+                    // Create the headerbar
+                    let header = Rc::new(Header::new(&content, &window, &sender));
 
-        // Add the content main stack to the overlay.
-        let overlay = gtk::Overlay::new();
-        overlay.add(&content.get_stack());
+                    action!(window, "menu", clone!(header => move |_, _| {
+                        header.open_menu();
+                    }));
 
-        // Add the overlay to the main window
-        window.add(&overlay);
+                    // Add the content main stack to the overlay.
+                    let overlay = gtk::Overlay::new();
+                    overlay.add(&content.get_stack());
+
+                    // Add the overlay to the main window
+                    window.add(&overlay);
+
+                    WindowGeometry::from_settings(&settings).apply(&window);
+
+                    App::setup_timed_callbacks(&sender, &settings);
+
+                    window.show_all();
+                    window.activate();
+
+                    gtk::timeout_add(50, clone!(sender, receiver => move || {
+                        // Uses receiver, content, header, sender, overlay
+                        match receiver.try_recv() {
+                            Ok(Action::RefreshAllViews) => content.update(),
+                            Ok(Action::RefreshShowsView) => content.update_shows_view(),
+                            Ok(Action::RefreshWidgetIfSame(id)) =>
+                                content.update_widget_if_same(id),
+                            Ok(Action::RefreshEpisodesView) => content.update_home(),
+                            Ok(Action::RefreshEpisodesViewBGR) =>
+                                content.update_home_if_background(),
+                            Ok(Action::ReplaceWidget(pd)) => {
+                                let shows = content.get_shows();
+                                let mut pop = shows.borrow().populated();
+                                pop.borrow_mut()
+                                    .replace_widget(pd.clone())
+                                    .map_err(|err| error!("Failed to update ShowWidget: {}", err))
+                                    .map_err(|_|
+                                        error!("Failed ot update ShowWidget {}", pd.title()))
+                                    .ok();
+                            }
+                            Ok(Action::ShowWidgetAnimated) => {
+                                let shows = content.get_shows();
+                                let mut pop = shows.borrow().populated();
+                                pop.borrow_mut().switch_visible(
+                                    PopulatedState::Widget,
+                                    gtk::StackTransitionType::SlideLeft,
+                                );
+                            }
+                            Ok(Action::ShowShowsAnimated) => {
+                                let shows = content.get_shows();
+                                let mut pop = shows.borrow().populated();
+                                pop.borrow_mut()
+                                    .switch_visible(PopulatedState::View,
+                                                    gtk::StackTransitionType::SlideRight);
+                            }
+                            Ok(Action::HeaderBarShowTile(title)) =>
+                                header.switch_to_back(&title),
+                            Ok(Action::HeaderBarNormal) => header.switch_to_normal(),
+                            Ok(Action::HeaderBarShowUpdateIndicator) =>
+                                header.show_update_notification(),
+                            Ok(Action::HeaderBarHideUpdateIndicator) =>
+                                header.hide_update_notification(),
+                            Ok(Action::MarkAllPlayerNotification(pd)) => {
+                                let notif = mark_all_notif(pd, &sender);
+                                notif.show(&overlay);
+                            }
+                            Ok(Action::RemoveShow(pd)) => {
+                                let notif = remove_show_notif(pd, sender.clone());
+                                notif.show(&overlay);
+                            }
+                            Ok(Action::ErrorNotification(err)) => {
+                                error!("An error notification was triggered: {}", err);
+                                let callback = || glib::Continue(false);
+                                let notif = InAppNotification::new(&err, callback,
+                                                                   || {}, UndoState::Hidden);
+                                notif.show(&overlay);
+                            }
+                            Ok(Action::AboutWidget(rowid)) => {
+                                if let Ok(d) = dbqueries::get_episode_description(rowid) {
+                                    if let Some(_desc) = d {
+                                        let _stack = content.get_visible_stack();
+                                    }
+                                }
+                            }
+                            Err(_) => (),
+                        }
+
+                        Continue(true)
+                    }));
+                }
+            }));
+        }));
 
         App {
             app_instance: application,
-            window,
-            overlay,
-            header,
-            content,
-            receiver,
-            sender,
             settings,
         }
     }
 
-    fn setup_timed_callbacks(&self) {
-        self.setup_dark_theme();
-        self.setup_refresh_on_startup();
-        self.setup_auto_refresh();
+    fn setup_timed_callbacks(sender: &Sender<Action>, settings: &Settings) {
+        App::setup_dark_theme(settings);
+        App::setup_refresh_on_startup(&sender, settings);
+        App::setup_auto_refresh(&sender, settings);
     }
 
-    fn setup_dark_theme(&self) {
-        let settings = gtk::Settings::get_default().unwrap();
-        let enabled = self.settings.get_boolean("dark-theme");
+    fn setup_dark_theme(settings: &Settings) {
+        let gtk_settings = gtk::Settings::get_default().unwrap();
+        let enabled = settings.get_boolean("dark-theme");
 
-        settings.set_property_gtk_application_prefer_dark_theme(enabled);
+        gtk_settings.set_property_gtk_application_prefer_dark_theme(enabled);
     }
 
-    fn setup_refresh_on_startup(&self) {
+    fn setup_refresh_on_startup(sender: &Sender<Action>, settings: &Settings) {
         // Update the feeds right after the Application is initialized.
-        if self.settings.get_boolean("refresh-on-startup") {
-            let sender = self.sender.clone();
-
+        let sender = sender.clone();
+        if settings.get_boolean("refresh-on-startup") {
             info!("Refresh on startup.");
             // The ui loads async, after initialization
             // so we need to delay this a bit so it won't block
@@ -133,12 +231,12 @@ impl App {
         }
     }
 
-    fn setup_auto_refresh(&self) {
-        let refresh_interval = settings::get_refresh_interval(&self.settings).num_seconds() as u32;
-        let sender = self.sender.clone();
+    fn setup_auto_refresh(sender: &Sender<Action>, settings: &Settings) {
+        let refresh_interval = settings::get_refresh_interval(&settings).num_seconds() as u32;
 
         info!("Auto-refresh every {:?} seconds.", refresh_interval);
 
+        let sender = sender.clone();
         gtk::timeout_add_seconds(refresh_interval, move || {
             let s: Option<Vec<_>> = None;
             utils::refresh(s, sender.clone());
@@ -147,77 +245,55 @@ impl App {
         });
     }
 
-    #[inline]
+    /// Define the `GAction`s.
+    ///
+    /// Used in menus and the keyboard shortcuts dialog.
+    fn setup_gactions(app: &gtk::Application, sender: &Sender<Action>) {
+        // Create the `refresh` action.
+        //
+        // This will trigger a refresh of all the shows in the database.
+        action!(
+            app,
+            "refresh",
+            clone!(sender => move |_, _| {
+            gtk::idle_add(clone!(sender => move || {
+                let s: Option<Vec<_>> = None;
+                utils::refresh(s, sender.clone());
+                glib::Continue(false)
+            }));
+        })
+        );
+        app.set_accels_for_action("app.refresh", &["<primary>r"]);
+
+        // Create the `OPML` import action
+        action!(
+            app,
+            "import",
+            clone!(sender, app => move |_, _| {
+            let window = app.get_active_window().expect("Failed to get active window");
+            utils::on_import_clicked(&window, &sender);
+        })
+        );
+
+        // Create the action that shows a `gtk::AboutDialog`
+        action!(
+            app,
+            "about",
+            clone!(app => move |_, _| {
+            let window = app.get_active_window().expect("Failed to get active window");
+            about_dialog(&window);
+        })
+        );
+
+        // Create the quit action
+        action!(app, "quit", clone!(app => move |_, _| app.quit()));
+        app.set_accels_for_action("app.quit", &["<primary>q"]);
+
+        // Bind the hamburger menu button to `F10`
+        app.set_accels_for_action("win.menu", &["F10"]);
+    }
+
     pub fn run(self) {
-        WindowGeometry::from_settings(&self.settings).apply(&self.window);
-
-        let window = self.window.clone();
-
-        self.app_instance.connect_startup(move |app| {
-            build_ui(&window, app);
-        });
-        self.setup_timed_callbacks();
-
-        let content = self.content.clone();
-        let headerbar = self.header.clone();
-        let sender = self.sender.clone();
-        let overlay = self.overlay.clone();
-        let receiver = self.receiver;
-        gtk::timeout_add(50, move || {
-            match receiver.try_recv() {
-                Ok(Action::RefreshAllViews) => content.update(),
-                Ok(Action::RefreshShowsView) => content.update_shows_view(),
-                Ok(Action::RefreshWidgetIfSame(id)) => content.update_widget_if_same(id),
-                Ok(Action::RefreshEpisodesView) => content.update_home(),
-                Ok(Action::RefreshEpisodesViewBGR) => content.update_home_if_background(),
-                Ok(Action::ReplaceWidget(pd)) => {
-                    let shows = content.get_shows();
-                    let mut pop = shows.borrow().populated();
-                    pop.borrow_mut()
-                        .replace_widget(pd.clone())
-                        .map_err(|err| error!("Failed to update ShowWidget: {}", err))
-                        .map_err(|_| error!("Failed ot update ShowWidget {}", pd.title()))
-                        .ok();
-                }
-                Ok(Action::ShowWidgetAnimated) => {
-                    let shows = content.get_shows();
-                    let mut pop = shows.borrow().populated();
-                    pop.borrow_mut().switch_visible(
-                        PopulatedState::Widget,
-                        gtk::StackTransitionType::SlideLeft,
-                    );
-                }
-                Ok(Action::ShowShowsAnimated) => {
-                    let shows = content.get_shows();
-                    let mut pop = shows.borrow().populated();
-                    pop.borrow_mut()
-                        .switch_visible(PopulatedState::View, gtk::StackTransitionType::SlideRight);
-                }
-                Ok(Action::HeaderBarShowTile(title)) => headerbar.switch_to_back(&title),
-                Ok(Action::HeaderBarNormal) => headerbar.switch_to_normal(),
-                Ok(Action::HeaderBarShowUpdateIndicator) => headerbar.show_update_notification(),
-                Ok(Action::HeaderBarHideUpdateIndicator) => headerbar.hide_update_notification(),
-                Ok(Action::MarkAllPlayerNotification(pd)) => {
-                    let notif = mark_all_notif(pd, &sender);
-                    notif.show(&overlay);
-                }
-                Ok(Action::RemoveShow(pd)) => {
-                    let notif = remove_show_notif(pd, sender.clone());
-                    notif.show(&overlay);
-                }
-                Err(_) => (),
-            }
-
-            Continue(true)
-        });
-
         ApplicationExtManual::run(&self.app_instance, &[]);
     }
 }
-
-fn build_ui(window: &gtk::Window, app: &gtk::Application) {
-    window.set_application(app);
-    window.show_all();
-    window.activate();
-    app.connect_activate(move |_| ());
-}

hammond-gtk/src/headerbar.rs

@@ -1,3 +1,4 @@
+use gio::MenuModel;
 use glib;
 use gtk;
 use gtk::prelude::*;
@@ -6,69 +7,78 @@ use failure::Error;
 use failure::ResultExt;
 use url::Url;
 
-use hammond_data::dbqueries;
-use hammond_data::Source;
-
-use std::sync::mpsc::Sender;
+use crossbeam_channel::Sender;
+use hammond_data::{dbqueries, Source};
 
 use app::Action;
 use stacks::Content;
 use utils::{itunes_to_rss, refresh};
 
 #[derive(Debug, Clone)]
+// TODO: split this into smaller
 pub struct Header {
     container: gtk::HeaderBar,
     add_toggle: gtk::MenuButton,
     switch: gtk::StackSwitcher,
-    back_button: gtk::Button,
+    back: gtk::Button,
     show_title: gtk::Label,
-    about_button: gtk::ModelButton,
-    update_button: gtk::ModelButton,
     update_box: gtk::Box,
     update_label: gtk::Label,
     update_spinner: gtk::Spinner,
+    menu_button: gtk::MenuButton,
+    app_menu: MenuModel,
 }
 
 impl Default for Header {
     fn default() -> Header {
-        let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/headerbar.ui");
+        let builder = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/headerbar.ui");
+        let menus = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/menus.ui");
 
-        let header: gtk::HeaderBar = builder.get_object("headerbar").unwrap();
-        let add_toggle: gtk::MenuButton = builder.get_object("add_toggle").unwrap();
-        let switch: gtk::StackSwitcher = builder.get_object("switch").unwrap();
-        let back_button: gtk::Button = builder.get_object("back_button").unwrap();
-        let show_title: gtk::Label = builder.get_object("show_title").unwrap();
-        let update_button: gtk::ModelButton = builder.get_object("update_button").unwrap();
-        let update_box: gtk::Box = builder.get_object("update_notification").unwrap();
-        let update_label: gtk::Label = builder.get_object("update_label").unwrap();
-        let update_spinner: gtk::Spinner = builder.get_object("update_spinner").unwrap();
-        let about_button: gtk::ModelButton = builder.get_object("about_button").unwrap();
+        let header = builder.get_object("headerbar").unwrap();
+        let add_toggle = builder.get_object("add_toggle").unwrap();
+        let switch = builder.get_object("switch").unwrap();
+        let back = builder.get_object("back").unwrap();
+        let show_title = builder.get_object("show_title").unwrap();
+        let update_box = builder.get_object("update_notification").unwrap();
+        let update_label = builder.get_object("update_label").unwrap();
+        let update_spinner = builder.get_object("update_spinner").unwrap();
+        let menu_button = builder.get_object("menu_button").unwrap();
+        let app_menu = menus.get_object("menu").unwrap();
 
         Header {
             container: header,
             add_toggle,
             switch,
-            back_button,
+            back,
             show_title,
-            about_button,
-            update_button,
             update_box,
             update_label,
             update_spinner,
+            menu_button,
+            app_menu,
         }
     }
 }
 
 // TODO: Refactor components into smaller state machines
 impl Header {
-    pub fn new(content: &Content, window: &gtk::Window, sender: &Sender<Action>) -> Header {
+    pub fn new(
+        content: &Content,
+        window: &gtk::ApplicationWindow,
+        sender: &Sender<Action>,
+    ) -> Header {
         let h = Header::default();
         h.init(content, window, &sender);
         h
     }
 
-    pub fn init(&self, content: &Content, window: &gtk::Window, sender: &Sender<Action>) {
-        let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/headerbar.ui");
+    pub fn init(
+        &self,
+        content: &Content,
+        window: &gtk::ApplicationWindow,
+        sender: &Sender<Action>,
+    ) {
+        let builder = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/headerbar.ui");
 
         let add_popover: gtk::Popover = builder.get_object("add_popover").unwrap();
         let new_url: gtk::Entry = builder.get_object("new_url").unwrap();
@@ -91,27 +101,13 @@ impl Header {
 
         self.add_toggle.set_popover(&add_popover);
 
-        self.update_button
-            .connect_clicked(clone!(sender => move |_| {
-                gtk::idle_add(clone!(sender => move || {
-                    let s: Option<Vec<_>> = None;
-                    refresh(s, sender.clone());
-                    glib::Continue(false)
-                }));
-        }));
-
-        self.about_button
-            .connect_clicked(clone!(window => move |_| {
-                about_dialog(&window);
-        }));
-
         // Add the Headerbar to the window.
         window.set_titlebar(&self.container);
 
         let switch = &self.switch;
         let add_toggle = &self.add_toggle;
         let show_title = &self.show_title;
-        self.back_button.connect_clicked(
+        self.back.connect_clicked(
             clone!(switch, add_toggle, show_title, sender => move |back| {
                 switch.show();
                 add_toggle.show();
@@ -122,12 +118,14 @@ impl Header {
                     .ok();
             }),
         );
+
+        self.menu_button.set_menu_model(Some(&self.app_menu));
     }
 
     pub fn switch_to_back(&self, title: &str) {
         self.switch.hide();
         self.add_toggle.hide();
-        self.back_button.show();
+        self.back.show();
         self.set_show_title(title);
         self.show_title.show();
     }
@@ -135,7 +133,7 @@ impl Header {
     pub fn switch_to_normal(&self) {
         self.switch.show();
         self.add_toggle.show();
-        self.back_button.hide();
+        self.back.hide();
         self.show_title.hide();
     }
 
@@ -156,6 +154,10 @@ impl Header {
         self.update_spinner.hide();
         self.update_label.hide();
     }
+
+    pub fn open_menu(&self) {
+        self.menu_button.clicked();
+    }
 }
 
 // FIXME: THIS ALSO SUCKS!
@@ -219,39 +221,3 @@ fn on_url_change(
         }
     }
 }
-
-// Totally copied it from fractal.
-// https://gitlab.gnome.org/danigm/fractal/blob/503e311e22b9d7540089d735b92af8e8f93560c5/fractal-gtk/src/app.rs#L1883-1912
-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",
-        "Rowan Lewis",
-    ];
-
-    let dialog = gtk::AboutDialog::new();
-    // Waiting for a logo.
-    // dialog.set_logo_icon_name("org.gnome.Hammond");
-    dialog.set_logo_icon_name("multimedia-player");
-    dialog.set_comments("Podcast Client for the GNOME Desktop.");
-    dialog.set_copyright("© 2017, 2018 Jordan Petridis");
-    dialog.set_license_type(gtk::License::Gpl30);
-    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.2");
-    dialog.set_program_name("Hammond");
-    // TODO: Need a wiki page first.
-    // dialog.set_website("https://wiki.gnome.org/Design/Apps/Potential/Podcasts");
-    // dialog.set_website_label("Learn more about Hammond");
-    dialog.set_transient_for(window);
-
-    dialog.set_artists(&["Tobias Bernard"]);
-    dialog.set_authors(authors);
-
-    dialog.show();
-}

hammond-gtk/src/main.rs

@@ -38,7 +38,6 @@ extern crate regex;
 extern crate reqwest;
 extern crate send_cell;
 extern crate serde_json;
-extern crate take_mut;
 extern crate url;
 
 use log::Level;
@@ -70,7 +69,6 @@ mod widgets;
 mod app;
 mod headerbar;
 
-mod appnotif;
 mod manager;
 mod settings;
 mod static_resource;
@@ -86,7 +84,7 @@ fn main() {
 
     // Add custom style
     let provider = gtk::CssProvider::new();
-    gtk::CssProvider::load_from_resource(&provider, "/org/gnome/hammond/gtk/style.css");
+    gtk::CssProvider::load_from_resource(&provider, "/org/gnome/Hammond/gtk/style.css");
     gtk::StyleContext::add_provider_for_screen(
         &gdk::Screen::get_default().expect("Error initializing gtk css provider."),
         &provider,

hammond-gtk/src/settings.rs

@@ -15,7 +15,7 @@ pub struct WindowGeometry {
 }
 
 impl WindowGeometry {
-    pub fn from_window(window: &gtk::Window) -> WindowGeometry {
+    pub fn from_window(window: &gtk::ApplicationWindow) -> WindowGeometry {
         let position = window.get_position();
         let size = window.get_size();
         let left = position.0;
@@ -49,7 +49,7 @@ impl WindowGeometry {
         }
     }
 
-    pub fn apply(&self, window: &gtk::Window) {
+    pub fn apply(&self, window: &gtk::ApplicationWindow) {
         if self.width > 0 && self.height > 0 {
             window.resize(self.width, self.height);
         }

hammond-gtk/src/stacks/content.rs

@@ -1,6 +1,7 @@
 use gtk;
 use gtk::prelude::*;
 
+use crossbeam_channel::Sender;
 use failure::Error;
 
 use app::Action;
@@ -8,7 +9,6 @@ use stacks::{HomeStack, ShowStack};
 
 use std::cell::RefCell;
 use std::rc::Rc;
-use std::sync::mpsc::Sender;
 
 #[derive(Debug, Clone)]
 pub struct Content {
@@ -85,4 +85,8 @@ impl Content {
     pub fn get_shows(&self) -> Rc<RefCell<ShowStack>> {
         self.shows.clone()
     }
+
+    pub fn get_visible_stack(&self) -> Option<gtk::Stack> {
+        self.stack.get_visible_child().and_then(|w| w.downcast::<gtk::Stack>().ok())
+    }
 }

hammond-gtk/src/stacks/home.rs

@@ -1,6 +1,8 @@
 use gtk;
 use gtk::prelude::*;
+use gtk::StackTransitionType;
 
+use crossbeam_channel::Sender;
 use failure::Error;
 use hammond_data::dbqueries::is_episodes_populated;
 use hammond_data::errors::DataError;
@@ -9,7 +11,6 @@ use app::Action;
 use widgets::{EmptyView, HomeView};
 
 use std::rc::Rc;
-use std::sync::mpsc::Sender;
 
 #[derive(Debug, Clone, Copy)]
 enum State {
@@ -60,6 +61,7 @@ impl HomeStack {
             .ok();
 
         self.replace_view()?;
+        // Determine the actuall state.
         self.determine_state().map_err(From::from)
     }
 
@@ -69,8 +71,15 @@ impl HomeStack {
         let eps = HomeView::new(self.sender.clone())?;
 
         // Remove the old widget and add the new one
+        // during this the previous view is removed,
+        // and the visibile child fallsback to empty view.
         self.stack.remove(old);
         self.stack.add_named(&eps.container, "home");
+        // Keep the previous state.
+        let s = self.state;
+        // Set the visible child back to the previous one to avoid
+        // the stack transition animation to show the empty view
+        self.switch_visible(s, StackTransitionType::None);
 
         // replace view in the struct too
         self.episodes = eps;
@@ -81,28 +90,26 @@ impl HomeStack {
         Ok(())
     }
 
-    #[inline]
-    fn switch_visible(&mut self, s: State) {
+    fn switch_visible(&mut self, s: State, animation: StackTransitionType) {
         use self::State::*;
 
         match s {
             Home => {
-                self.stack.set_visible_child_name("home");
+                self.stack.set_visible_child_full("home", animation);
                 self.state = Home;
             }
             Empty => {
-                self.stack.set_visible_child_name("empty");
+                self.stack.set_visible_child_full("empty", animation);
                 self.state = Empty;
             }
         }
     }
 
-    #[inline]
     fn determine_state(&mut self) -> Result<(), DataError> {
         if is_episodes_populated()? {
-            self.switch_visible(State::Home);
+            self.switch_visible(State::Home, StackTransitionType::Crossfade);
         } else {
-            self.switch_visible(State::Empty);
+            self.switch_visible(State::Empty, StackTransitionType::Crossfade);
         };
 
         Ok(())

hammond-gtk/src/stacks/populated.rs

@@ -1,6 +1,8 @@
 use gtk;
 use gtk::prelude::*;
+use gtk::StackTransitionType;
 
+use crossbeam_channel::Sender;
 use failure::Error;
 
 use hammond_data::dbqueries;
@@ -10,7 +12,6 @@ use app::Action;
 use widgets::{ShowWidget, ShowsView};
 
 use std::rc::Rc;
-use std::sync::mpsc::Sender;
 use std::sync::Arc;
 
 #[derive(Debug, Clone, Copy)]
@@ -60,20 +61,30 @@ impl PopulatedStack {
     }
 
     pub fn update_shows(&mut self) -> Result<(), Error> {
+        // The current visible child might change depending on
+        // removal and insertion in the gtk::Stack, so we have
+        // to make sure it will stay the same.
+        let s = self.state;
+        self.replace_shows()?;
+        self.switch_visible(s, StackTransitionType::Crossfade);
+
+        Ok(())
+    }
+
+    pub fn replace_shows(&mut self) -> Result<(), Error> {
         let old = &self.populated.container.clone();
         debug!("Name: {:?}", WidgetExt::get_name(old));
 
+        self.populated
+            .save_alignment()
+            .map_err(|err| error!("Failed to set episodes_view allignment: {}", err))
+            .ok();
+
         let pop = ShowsView::new(self.sender.clone())?;
         self.populated = pop;
         self.stack.remove(old);
         self.stack.add_named(&self.populated.container, "shows");
 
-        // The current visible child might change depending on
-        // removal and insertion in the gtk::Stack, so we have
-        // to make sure it will stay the same.
-        let s = self.state;
-        self.switch_visible(s, gtk::StackTransitionType::None);
-
         old.destroy();
         Ok(())
     }
@@ -95,7 +106,7 @@ impl PopulatedStack {
         // removal and insertion in the gtk::Stack, so we have
         // to make sure it will stay the same.
         let s = self.state;
-        self.switch_visible(s, gtk::StackTransitionType::None);
+        self.switch_visible(s, StackTransitionType::None);
 
         Ok(())
     }
@@ -114,7 +125,7 @@ impl PopulatedStack {
         // removal and insertion in the gtk::Stack, so we have
         // to make sure it will stay the same.
         let s = self.state;
-        self.switch_visible(s, gtk::StackTransitionType::None);
+        self.switch_visible(s, StackTransitionType::Crossfade);
 
         old.destroy();
         Ok(())
@@ -134,8 +145,7 @@ impl PopulatedStack {
         self.container.clone()
     }
 
-    #[inline]
-    pub fn switch_visible(&mut self, state: PopulatedState, animation: gtk::StackTransitionType) {
+    pub fn switch_visible(&mut self, state: PopulatedState, animation: StackTransitionType) {
         use self::PopulatedState::*;
 
         match state {

hammond-gtk/src/stacks/show.rs

@@ -1,6 +1,7 @@
 use gtk;
 use gtk::prelude::*;
 
+use crossbeam_channel::Sender;
 use failure::Error;
 use hammond_data::dbqueries::is_podcasts_populated;
 
@@ -11,7 +12,6 @@ use widgets::EmptyView;
 
 use std::cell::RefCell;
 use std::rc::Rc;
-use std::sync::mpsc::Sender;
 
 #[derive(Debug, Clone, Copy)]
 pub enum ShowState {
@@ -63,7 +63,6 @@ impl ShowStack {
         self.determine_state()
     }
 
-    #[inline]
     fn switch_visible(&mut self, s: ShowState) {
         use self::ShowState::*;
 
@@ -79,7 +78,6 @@ impl ShowStack {
         };
     }
 
-    #[inline]
     fn determine_state(&mut self) -> Result<(), Error> {
         use self::ShowState::*;
 

hammond-gtk/src/utils.rs

@@ -8,6 +8,7 @@ use gtk::prelude::*;
 use gtk::{IsA, Widget};
 
 use chrono::prelude::*;
+use crossbeam_channel::Sender;
 use failure::Error;
 use rayon;
 use regex::Regex;
@@ -17,15 +18,15 @@ use serde_json::Value;
 
 // use hammond_data::feed;
 use hammond_data::dbqueries;
+use hammond_data::opml;
 use hammond_data::pipeline;
 use hammond_data::utils::checkup;
 use hammond_data::Source;
 use hammond_downloader::downloader;
 
 use std::collections::{HashMap, HashSet};
-use std::sync::mpsc::*;
-use std::sync::Arc;
-use std::sync::{Mutex, RwLock};
+use std::sync::mpsc::channel;
+use std::sync::{Arc, Mutex, RwLock};
 
 use app::Action;
 
@@ -48,7 +49,7 @@ use app::Action;
 ///
 /// let messages: Vec<Message> = Vec::new();
 /// let list = gtk::ListBox::new();
-/// let constructor = |m| { MessageWidget::new(m).0};
+/// let constructor = |m| MessageWidget::new(m).0;
 /// lazy_load(messages, list, constructor, || {});
 /// ```
 ///
@@ -62,17 +63,20 @@ use app::Action;
 /// let list = gtk::ListBox::new();
 /// lazy_load(widgets, list, |w| w, || {});
 /// ```
-#[inline]
 pub fn lazy_load<T, C, F, W, U>(data: T, container: C, mut contructor: F, callback: U)
 where
     T: IntoIterator + 'static,
     T::Item: 'static,
     C: ContainerExt + 'static,
     F: FnMut(T::Item) -> W + 'static,
-    W: IsA<Widget>,
+    W: IsA<Widget> + WidgetExt,
     U: Fn() + 'static,
 {
-    let func = move |x| container.add(&contructor(x));
+    let func = move |x| {
+        let widget = contructor(x);
+        container.add(&widget);
+        widget.show();
+    };
     lazy_load_full(data, func, callback);
 }
 
@@ -82,7 +86,6 @@ where
 /// This is a more flexible version of `lazy_load` with less constrains.
 /// If you just want to lazy add `widgets` to a `container` check if
 /// `lazy_load` fits your needs first.
-#[inline]
 #[cfg_attr(feature = "cargo-clippy", allow(redundant_closure))]
 pub fn lazy_load_full<T, F, U>(data: T, mut func: F, finish_callback: U)
 where
@@ -233,7 +236,6 @@ lazy_static! {
 // GObjects do not implement Send trait, so SendCell is a way around that.
 // Also lazy_static requires Sync trait, so that's what the mutexes are.
 // TODO: maybe use something that would just scale to requested size?
-#[inline]
 pub fn set_image_from_path(image: &gtk::Image, podcast_id: i32, size: u32) -> Result<(), Error> {
     // Check if there's an active download about this show cover.
     // If there is, a callback will be set so this function will be called again.
@@ -306,14 +308,12 @@ pub fn set_image_from_path(image: &gtk::Image, podcast_id: i32, size: u32) -> Re
     Ok(())
 }
 
-#[inline]
 // FIXME: the signature should be `fn foo(s: Url) -> Result<Url, Error>`
 pub fn itunes_to_rss(url: &str) -> Result<String, Error> {
     let id = itunes_id_from_url(url).ok_or_else(|| format_err!("Failed to find an Itunes ID."))?;
     lookup_id(id)
 }
 
-#[inline]
 fn itunes_id_from_url(url: &str) -> Option<u32> {
     lazy_static! {
         static ref RE: Regex = Regex::new(r"/id([0-9]+)").unwrap();
@@ -325,7 +325,6 @@ fn itunes_id_from_url(url: &str) -> Option<u32> {
     foo.parse::<u32>().ok()
 }
 
-#[inline]
 fn lookup_id(id: u32) -> Result<String, Error> {
     let url = format!("https://itunes.apple.com/lookup?id={}&entity=podcast", id);
     let req: Value = reqwest::get(&url)?.json()?;
@@ -335,6 +334,64 @@ fn lookup_id(id: u32) -> Result<String, Error> {
         .ok_or_else(|| format_err!("Failed to get url from itunes response"))
 }
 
+pub fn on_import_clicked(window: &gtk::Window, sender: &Sender<Action>) {
+    use glib::translate::ToGlib;
+    use gtk::{FileChooserAction, FileChooserNative, FileFilter, ResponseType};
+
+    // let dialog = FileChooserDialog::new(title, Some(&window), FileChooserAction::Open);
+    // TODO: It might be better to use a FileChooserNative widget.
+    // Create the FileChooser Dialog
+    let dialog = FileChooserNative::new(
+        Some("Select the file from which to you want to Import Shows."),
+        Some(window),
+        FileChooserAction::Open,
+        Some("_Import"),
+        None,
+    );
+
+    // Do not show hidden(.thing) files
+    dialog.set_show_hidden(false);
+
+    // Set a filter to show only xml files
+    let filter = FileFilter::new();
+    FileFilterExt::set_name(&filter, Some("OPML file"));
+    filter.add_mime_type("application/xml");
+    filter.add_mime_type("text/xml");
+    dialog.add_filter(&filter);
+
+    dialog.connect_response(clone!(sender => move |dialog, resp| {
+        debug!("Dialong Response {}", resp);
+        if resp == ResponseType::Accept.to_glib() {
+            // TODO: Show an in-app notifictaion if the file can not be accessed
+            if let Some(filename) = dialog.get_filename() {
+                debug!("File selected: {:?}", filename);
+
+                rayon::spawn(clone!(sender => move || {
+                    // Parse the file and import the feeds
+                    if let Ok(sources) = opml::import_from_file(filename) {
+                        // Refresh the succesfully parsed feeds to index them
+                        refresh(Some(sources), sender)
+                    } else {
+                        let text = String::from("Failed to parse the Imported file");
+                        sender.send(Action::ErrorNotification(text))
+                            .map_err(|err| error!("Action Sender: {}", err))
+                            .ok();
+                    }
+                }))
+            } else {
+                let text = String::from("Selected File could not be accessed.");
+                sender.send(Action::ErrorNotification(text))
+                    .map_err(|err| error!("Action Sender: {}", err))
+                    .ok();
+            }
+        }
+
+        dialog.destroy();
+    }));
+
+    dialog.run();
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;

hammond-gtk/src/widgets/aboutdialog.rs

@@ -0,0 +1,42 @@
+use gtk;
+use gtk::prelude::*;
+
+// Totally copied it from fractal.
+// https://gitlab.gnome.org/danigm/fractal/blob/503e311e22b9d7540089d735b92af8e8f93560c5/fractal-gtk/src/app.rs#L1883-1912
+/// Given a `window` create and attach an `gtk::AboutDialog` to it.
+pub 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",
+        "Rowan Lewis",
+        "Zander Brown",
+    ];
+
+    let dialog = gtk::AboutDialog::new();
+    // Waiting for a logo.
+    // dialog.set_logo_icon_name("org.gnome.Hammond");
+    dialog.set_logo_icon_name("multimedia-player");
+    dialog.set_comments("Podcast Client for the GNOME Desktop.");
+    dialog.set_copyright("© 2017, 2018 Jordan Petridis");
+    dialog.set_license_type(gtk::License::Gpl30);
+    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.4");
+    dialog.set_program_name("Hammond");
+    // TODO: Need a wiki page first.
+    // dialog.set_website("https://wiki.gnome.org/Design/Apps/Potential/Podcasts");
+    // dialog.set_website_label("Learn more about Hammond");
+    dialog.set_transient_for(window);
+
+    dialog.set_artists(&["Tobias Bernard"]);
+    dialog.set_authors(authors);
+
+    dialog.connect_response(|dlg, _| dlg.destroy());
+
+    dialog.show();
+}

hammond-gtk/src/widgets/appnotif.rs

@@ -5,6 +5,12 @@ use gtk::prelude::*;
 use std::cell::RefCell;
 use std::rc::Rc;
 
+#[derive(Debug, Clone, Copy)]
+pub enum UndoState {
+    Shown,
+    Hidden,
+}
+
 #[derive(Debug, Clone)]
 pub struct InAppNotification {
     revealer: gtk::Revealer,
@@ -15,7 +21,7 @@ pub struct InAppNotification {
 
 impl Default for InAppNotification {
     fn default() -> Self {
-        let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/inapp_notif.ui");
+        let builder = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/inapp_notif.ui");
 
         let revealer: gtk::Revealer = builder.get_object("revealer").unwrap();
         let text: gtk::Label = builder.get_object("text").unwrap();
@@ -32,7 +38,7 @@ impl Default for InAppNotification {
 }
 
 impl InAppNotification {
-    pub fn new<F, U>(text: &str, mut callback: F, undo_callback: U) -> Self
+    pub fn new<F, U>(text: &str, mut callback: F, undo_callback: U, show_undo: UndoState) -> Self
     where
         F: FnMut() -> glib::Continue + 'static,
         U: Fn() + 'static,
@@ -67,6 +73,11 @@ impl InAppNotification {
             revealer.set_reveal_child(false);
         });
 
+        match show_undo {
+            UndoState::Shown => (),
+            UndoState::Hidden => notif.undo.hide(),
+        }
+
         notif
     }
 

hammond-gtk/src/widgets/empty.rs

@@ -6,9 +6,8 @@ pub struct EmptyView {
 }
 
 impl Default for EmptyView {
-    #[inline]
     fn default() -> Self {
-        let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/empty_view.ui");
+        let builder = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/empty_view.ui");
         let view: gtk::Box = builder.get_object("empty_view").unwrap();
 
         EmptyView { container: view }
@@ -16,7 +15,6 @@ impl Default for EmptyView {
 }
 
 impl EmptyView {
-    #[inline]
     pub fn new() -> EmptyView {
         EmptyView::default()
     }

hammond-gtk/src/widgets/episode.rs

@@ -2,10 +2,12 @@ use glib;
 use gtk;
 use gtk::prelude::*;
 
+use chrono;
+use chrono::prelude::*;
+use crossbeam_channel::Sender;
 use failure::Error;
-use humansize::FileSize;
+use humansize::{file_size_opts as size_opts, FileSize};
 use open;
-use take_mut;
 
 use hammond_data::dbqueries;
 use hammond_data::utils::get_download_folder;
@@ -13,235 +15,448 @@ use hammond_data::EpisodeWidgetQuery;
 
 use app::Action;
 use manager;
-use widgets::episode_states::*;
 
-use std::cell::RefCell;
-use std::ops::DerefMut;
 use std::path::Path;
 use std::rc::Rc;
-use std::sync::mpsc::Sender;
-use std::sync::{Arc, Mutex};
+use std::sync::{Arc, Mutex, TryLockError};
 
-#[derive(Debug)]
+lazy_static! {
+    static ref SIZE_OPTS: Arc<size_opts::FileSizeOpts> =  {
+        // Declare a custom humansize option struct
+        // See: https://docs.rs/humansize/1.0.2/humansize/file_size_opts/struct.FileSizeOpts.html
+        Arc::new(size_opts::FileSizeOpts {
+            divider: size_opts::Kilo::Binary,
+            units: size_opts::Kilo::Decimal,
+            decimal_places: 0,
+            decimal_zeroes: 0,
+            fixed_at: size_opts::FixedAt::No,
+            long_units: false,
+            space: true,
+            suffix: "",
+            allow_negative: false,
+        })
+    };
+}
+
+#[derive(Clone, Debug)]
 pub struct EpisodeWidget {
     pub container: gtk::Box,
-    date: DateMachine,
-    duration: DurationMachine,
-    title: Rc<RefCell<TitleMachine>>,
-    media: Rc<RefCell<MediaMachine>>,
+    info: InfoLabels,
+    buttons: Buttons,
+    progressbar: gtk::ProgressBar,
+}
+
+#[derive(Clone, Debug)]
+struct InfoLabels {
+    container: gtk::Box,
+    title: gtk::Label,
+    date: gtk::Label,
+    separator1: gtk::Label,
+    duration: gtk::Label,
+    separator2: gtk::Label,
+    local_size: gtk::Label,
+    size_separator: gtk::Label,
+    total_size: gtk::Label,
+}
+
+#[derive(Clone, Debug)]
+struct Buttons {
+    container: gtk::ButtonBox,
+    play: gtk::Button,
+    download: gtk::Button,
+    cancel: gtk::Button,
+    desc: gtk::Button,
+}
+
+impl InfoLabels {
+    fn init(&self, episode: &EpisodeWidgetQuery) {
+        // Set the title label state.
+        self.set_title(episode);
+
+        // Set the date label.
+        self.set_date(episode.epoch());
+
+        // Set the duaration label.
+        self.set_duration(episode.duration());
+
+        // Set the total_size label.
+        self.set_size(episode.length())
+    }
+
+    fn set_title(&self, episode: &EpisodeWidgetQuery) {
+        self.title.set_text(episode.title());
+
+        if episode.played().is_some() {
+            self.title
+                .get_style_context()
+                .map(|c| c.add_class("dim-label"));
+        } else {
+            self.title
+                .get_style_context()
+                .map(|c| c.remove_class("dim-label"));
+        }
+    }
+
+    // Set the date label of the episode widget.
+    fn set_date(&self, epoch: i32) {
+        lazy_static! {
+            static ref NOW: DateTime<Utc> = Utc::now();
+        };
+
+        let ts = Utc.timestamp(i64::from(epoch), 0);
+
+        // If the episode is from a different year, print year as well
+        if NOW.year() != ts.year() {
+            self.date.set_text(ts.format("%e %b %Y").to_string().trim());
+        // Else omit the year from the label
+        } else {
+            self.date.set_text(ts.format("%e %b").to_string().trim());
+        }
+    }
+
+    // Set the duration label of the episode widget.
+    fn set_duration(&self, seconds: Option<i32>) {
+        // If lenght is provided
+        if let Some(s) = seconds {
+            // Convert seconds to minutes
+            let minutes = chrono::Duration::seconds(s.into()).num_minutes();
+            // If the lenght is 1 or more minutes
+            if minutes != 0 {
+                // Set the label and show them.
+                self.duration.set_text(&format!("{} min", minutes));
+                self.duration.show();
+                self.separator1.show();
+                return;
+            }
+        }
+
+        // Else hide the labels
+        self.separator1.hide();
+        self.duration.hide();
+    }
+
+    // Set the size label of the episode widget.
+    fn set_size(&self, bytes: Option<i32>) {
+        // Convert the bytes to a String label
+        let size = || -> Option<String> {
+            let s = bytes?;
+            if s == 0 {
+                return None;
+            }
+
+            s.file_size(SIZE_OPTS.clone()).ok()
+        };
+
+        if let Some(s) = size() {
+            self.total_size.set_text(&s);
+            self.total_size.show();
+            self.separator2.show();
+        } else {
+            self.total_size.hide();
+            self.separator2.hide();
+        }
+    }
 }
 
 impl Default for EpisodeWidget {
-    #[inline]
     fn default() -> Self {
-        let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/episode_widget.ui");
+        let builder = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/episode_widget.ui");
 
-        let container: gtk::Box = builder.get_object("episode_container").unwrap();
-        let progress: gtk::ProgressBar = builder.get_object("progress_bar").unwrap();
+        let container = builder.get_object("episode_container").unwrap();
+        let progressbar = builder.get_object("progress_bar").unwrap();
 
-        let download: gtk::Button = builder.get_object("download_button").unwrap();
-        let play: gtk::Button = builder.get_object("play_button").unwrap();
-        let cancel: gtk::Button = builder.get_object("cancel_button").unwrap();
+        let buttons_container = builder.get_object("button_box").unwrap();
+        let download = builder.get_object("download_button").unwrap();
+        let play = builder.get_object("play_button").unwrap();
+        let cancel = builder.get_object("cancel_button").unwrap();
+        let desc_button = builder.get_object("desc_button").unwrap();
 
-        let title: gtk::Label = builder.get_object("title_label").unwrap();
-        let date: gtk::Label = builder.get_object("date_label").unwrap();
-        let duration: gtk::Label = builder.get_object("duration_label").unwrap();
-        let local_size: gtk::Label = builder.get_object("local_size").unwrap();
-        let total_size: gtk::Label = builder.get_object("total_size").unwrap();
+        let info_container = builder.get_object("info_container").unwrap();
+        let title = builder.get_object("title_label").unwrap();
+        let date = builder.get_object("date_label").unwrap();
+        let duration = builder.get_object("duration_label").unwrap();
+        let local_size = builder.get_object("local_size").unwrap();
+        let total_size = builder.get_object("total_size").unwrap();
 
-        let separator1: gtk::Label = builder.get_object("separator1").unwrap();
-        let separator2: gtk::Label = builder.get_object("separator2").unwrap();
-        let prog_separator: gtk::Label = builder.get_object("prog_separator").unwrap();
+        let separator1 = builder.get_object("separator1").unwrap();
+        let separator2 = builder.get_object("separator2").unwrap();
 
-        let date_machine = DateMachine::new(date, 0);
-        let dur_machine = DurationMachine::new(duration, separator1, None);
-        let title_machine = Rc::new(RefCell::new(TitleMachine::new(title, false)));
-        let media = MediaMachine::new(
-            play,
-            download,
-            progress,
-            cancel,
-            total_size,
-            local_size,
-            separator2,
-            prog_separator,
-        );
-        let media_machine = Rc::new(RefCell::new(media));
+        let size_separator = builder.get_object("prog_separator").unwrap();
 
         EpisodeWidget {
+            info: InfoLabels {
+                container: info_container,
+                title,
+                date,
+                separator1,
+                duration,
+                separator2,
+                local_size,
+                total_size,
+                size_separator,
+            },
+            buttons: Buttons {
+                container: buttons_container,
+                play,
+                download,
+                cancel,
+                desc: desc_button,
+            },
+            progressbar,
             container,
-            title: title_machine,
-            duration: dur_machine,
-            date: date_machine,
-            media: media_machine,
         }
     }
 }
 
 impl EpisodeWidget {
-    #[inline]
-    pub fn new(episode: EpisodeWidgetQuery, sender: &Sender<Action>) -> EpisodeWidget {
-        let mut widget = EpisodeWidget::default();
-        widget.init(episode, sender);
+    pub fn new(episode: &EpisodeWidgetQuery, sender: &Sender<Action>) -> Rc<Self> {
+        let widget = Rc::new(Self::default());
+        widget.info.init(episode);
+        Self::determine_buttons_state(&widget, episode, sender)
+            .map_err(|err| error!("Error: {}", err))
+            .ok();
+        widget
+            .on_desc_clicked(episode, sender)
+            .map_err(|err| error!("Error: {}", err))
+            .ok();
         widget
     }
 
-    #[inline]
-    fn init(&mut self, episode: EpisodeWidgetQuery, sender: &Sender<Action>) {
-        // Set the date label.
-        self.set_date(episode.epoch());
-
-        // Set the title label state.
-        self.set_title(&episode);
-
-        // Set the duaration label.
-        self.set_duration(episode.duration());
-
-        // Determine what the state of the media widgets should be.
-        determine_media_state(&self.media, &episode)
-            .map_err(|err| error!("Error: {}", err))
-            .map_err(|_| error!("Could not determine Media State"))
-            .ok();
-
-        let episode = Arc::new(Mutex::new(episode));
-        self.connect_buttons(&episode, sender);
+    fn on_desc_clicked(
+        &self,
+        episode: &EpisodeWidgetQuery,
+        sender: &Sender<Action>,
+    ) -> Result<(), Error> {
+        let id = episode.rowid();
+        if dbqueries::episode_had_description(id)? {
+            self.buttons.desc.show();
+            self.buttons
+                .desc
+                .connect_clicked(clone!(sender => move |_| {
+                sender.send(Action::AboutWidget(id))
+                    .map_err(|err| error!("Action Sender: {}", err))
+                    .ok();
+            }));
+            Ok(())
+        } else {
+            self.buttons.desc.hide();
+            Ok(())
+        }
     }
 
-    #[inline]
-    fn connect_buttons(&self, episode: &Arc<Mutex<EpisodeWidgetQuery>>, sender: &Sender<Action>) {
-        let title = self.title.clone();
-        if let Ok(media) = self.media.try_borrow_mut() {
-            media.play_connect_clicked(clone!(episode, sender => move |_| {
-                if let Ok(mut ep) = episode.lock() {
-                    on_play_bttn_clicked(&mut ep, &title, &sender)
-                        .map_err(|err| error!("Error: {}", err))
-                        .ok();
+    // fn init(widget: Rc<Self>, sender: &Sender<Action>) {}
+
+    // InProgress State:
+    //   * Show ProgressBar and Cancel Button.
+    //   * Show `total_size`, `local_size` labels and `size_separator`.
+    //   * Hide Download and Play Buttons
+    fn state_prog(&self) {
+        self.progressbar.show();
+        self.buttons.cancel.show();
+
+        self.info.total_size.show();
+        self.info.local_size.show();
+        self.info.size_separator.show();
+
+        self.buttons.play.hide();
+        self.buttons.download.hide();
+    }
+
+    // Playable State:
+    //   * Hide ProgressBar and Cancel, Download Buttons.
+    //   * Hide `local_size` labels and `size_separator`.
+    //   * Show Play Button and `total_size` label
+    fn state_playable(&self) {
+        self.progressbar.hide();
+        self.buttons.cancel.hide();
+        self.buttons.download.hide();
+        self.info.local_size.hide();
+        self.info.size_separator.hide();
+
+        self.info.total_size.show();
+        self.buttons.play.show();
+    }
+
+    // ToDownload State:
+    //   * Hide ProgressBar and Cancel, Play Buttons.
+    //   * Hide `local_size` labels and `size_separator`.
+    //   * Show Download Button
+    //   * Determine `total_size` label state (Comes from `episode.lenght`).
+    fn state_download(&self) {
+        self.progressbar.hide();
+        self.buttons.cancel.hide();
+        self.buttons.play.hide();
+
+        self.info.local_size.hide();
+        self.info.size_separator.hide();
+
+        self.buttons.download.show();
+    }
+
+    fn update_progress(&self, local_size: &str, fraction: f64) {
+        self.info.local_size.set_text(local_size);
+        self.progressbar.set_fraction(fraction);
+    }
+
+    /// Change the state of the `EpisodeWidget`.
+    ///
+    /// Function Flowchart:
+    ///
+    /// -------------------       --------------
+    /// | Is the Episode  |  YES  |   State:   |
+    /// | currently being | ----> | InProgress |
+    /// |   downloaded?   |       |            |
+    /// -------------------       --------------
+    ///         |
+    ///         | NO
+    ///         |
+    ///        \_/
+    /// -------------------       --------------
+    /// | is the episode  |  YES  |   State:   |
+    /// |   downloaded    | ----> |  Playable  |
+    /// |    already?     |       |            |
+    /// -------------------       --------------
+    ///         |
+    ///         | NO
+    ///         |
+    ///        \_/
+    /// -------------------
+    /// |     State:      |
+    /// |   ToDownload    |
+    /// -------------------
+    fn determine_buttons_state(
+        widget: &Rc<Self>,
+        episode: &EpisodeWidgetQuery,
+        sender: &Sender<Action>,
+    ) -> Result<(), Error> {
+        // Reset the buttons state no matter the glade file.
+        // This is just to make it easier to port to relm in the future.
+        widget.buttons.cancel.hide();
+        widget.buttons.play.hide();
+        widget.buttons.download.hide();
+
+        // Check if the episode is being downloaded
+        let id = episode.rowid();
+        let active_dl = move || -> Result<Option<_>, Error> {
+            let m = manager::ACTIVE_DOWNLOADS
+                .read()
+                .map_err(|_| format_err!("Failed to get a lock on the mutex."))?;
+
+            Ok(m.get(&id).cloned())
+        };
+
+        // State: InProggress
+        if let Some(prog) = active_dl()? {
+            // set a callback that will update the state when the download finishes
+            let callback = clone!(widget, sender => move || {
+                if let Ok(guard) = manager::ACTIVE_DOWNLOADS.read() {
+                    if !guard.contains_key(&id) {
+                        if let Ok(ep) = dbqueries::get_episode_widget_from_rowid(id) {
+                            Self::determine_buttons_state(&widget, &ep, &sender)
+                                .map_err(|err| error!("Error: {}", err))
+                                .ok();
+
+                            return glib::Continue(false)
+                        }
+                    }
                 }
+
+                glib::Continue(true)
+            });
+            gtk::timeout_add(250, callback);
+
+            // Wire the cancel button
+            widget
+                .buttons
+                .cancel
+                .connect_clicked(clone!(prog, widget, sender => move |_| {
+                    // Cancel the download
+                    if let Ok(mut m) = prog.lock() {
+                        m.cancel();
+                    }
+
+                    // Cancel is not instant so we have to wait a bit
+                    timeout_add(50, clone!(widget, sender => move || {
+                        if let Ok(thing) = active_dl() {
+                            if thing.is_none() {
+                                // Recalculate the widget state
+                                dbqueries::get_episode_widget_from_rowid(id)
+                                    .map_err(From::from)
+                                    .and_then(|ep| Self::determine_buttons_state(&widget, &ep, &sender))
+                                    .map_err(|err| error!("Error: {}", err))
+                                    .ok();
+
+                                return glib::Continue(false)
+                            }
+                        }
+
+                        glib::Continue(true)
+                    }));
             }));
 
-            let media_machine = self.media.clone();
-            media.download_connect_clicked(clone!(media_machine, episode, sender => move |dl| {
+            // Setup a callback that will update the total_size label
+            // with the http ContentLength header number rather than
+            // relying to the RSS feed.
+            update_total_size_callback(&widget, &prog);
+
+            // Setup a callback that will update the progress bar.
+            update_progressbar_callback(&widget, &prog, id);
+
+            // Change the widget layout/state
+            widget.state_prog();
+
+            return Ok(());
+        }
+
+        // State: Playable
+        if episode.local_uri().is_some() {
+            // Change the widget layout/state
+            widget.state_playable();
+
+            // Wire the play button
+            widget
+                .buttons
+                .play
+                .connect_clicked(clone!(widget, sender => move |_| {
+                    if let Ok(mut ep) = dbqueries::get_episode_widget_from_rowid(id) {
+                        on_play_bttn_clicked(&widget, &mut ep, &sender)
+                            .map_err(|err| error!("Error: {}", err))
+                            .ok();
+                    }
+                }));
+
+            return Ok(());
+        }
+
+        // State: ToDownload
+        // Wire the download button
+        widget
+            .buttons
+            .download
+            .connect_clicked(clone!(widget, sender => move |dl| {
                 // Make the button insensitive so it won't be pressed twice
                 dl.set_sensitive(false);
-                if let Ok(ep) = episode.lock() {
+                if let Ok(ep) = dbqueries::get_episode_widget_from_rowid(id) {
                     on_download_clicked(&ep, &sender)
                         .and_then(|_| {
                             info!("Donwload started succesfully.");
-                            determine_media_state(&media_machine, &ep)
-                    })
-                    .map_err(|err| error!("Error: {}", err))
-                    .map_err(|_| error!("Could not determine Media State"))
-                    .ok();
+                            Self::determine_buttons_state(&widget, &ep, &sender)
+                        })
+                        .map_err(|err| error!("Error: {}", err))
+                        .ok();
                 }
 
                 // Restore sensitivity after operations above complete
                 dl.set_sensitive(true);
             }));
-        }
-    }
 
-    #[inline]
-    /// Determine the title state.
-    fn set_title(&mut self, episode: &EpisodeWidgetQuery) {
-        let mut machine = self.title.borrow_mut();
-        machine.set_title(episode.title());
-        take_mut::take(machine.deref_mut(), |title| {
-            title.determine_state(episode.played().is_some())
-        });
-    }
+        // Change the widget state into `ToDownload`
+        widget.state_download();
 
-    #[inline]
-    /// Set the date label depending on the current time.
-    fn set_date(&mut self, epoch: i32) {
-        let machine = &mut self.date;
-        take_mut::take(machine, |date| date.determine_state(i64::from(epoch)));
-    }
-
-    #[inline]
-    /// Set the duration label.
-    fn set_duration(&mut self, seconds: Option<i32>) {
-        let machine = &mut self.duration;
-        take_mut::take(machine, |duration| duration.determine_state(seconds));
+        Ok(())
     }
 }
 
-#[inline]
-fn determine_media_state(
-    media_machine: &Rc<RefCell<MediaMachine>>,
-    episode: &EpisodeWidgetQuery,
-) -> Result<(), Error> {
-    let id = episode.rowid();
-    let active_dl = || -> Result<Option<_>, Error> {
-        let m = manager::ACTIVE_DOWNLOADS
-            .read()
-            .map_err(|_| format_err!("Failed to get a lock on the mutex."))?;
-
-        Ok(m.get(&id).cloned())
-    }()?;
-
-    let mut lock = media_machine.try_borrow_mut()?;
-    take_mut::take(lock.deref_mut(), |media| {
-        media.determine_state(
-            episode.length(),
-            active_dl.is_some(),
-            episode.local_uri().is_some(),
-        )
-    });
-
-    // Show or hide the play/delete/download buttons upon widget initialization.
-    if let Some(prog) = active_dl {
-        // set a callback that will update the state when the download finishes
-        let id = episode.rowid();
-        let callback = clone!(media_machine => move || {
-            if let Ok(guard) = manager::ACTIVE_DOWNLOADS.read() {
-                if !guard.contains_key(&id) {
-                    if let Ok(ep) = dbqueries::get_episode_widget_from_rowid(id) {
-                        determine_media_state(&media_machine, &ep)
-                            .map_err(|err| error!("Error: {}", err))
-                            .map_err(|_| error!("Could not determine Media State"))
-                            .ok();
-
-                        return glib::Continue(false)
-                    }
-                }
-            }
-
-            glib::Continue(true)
-        });
-        gtk::timeout_add(250, callback);
-
-        lock.cancel_connect_clicked(clone!(prog, media_machine => move |_| {
-            if let Ok(mut m) = prog.lock() {
-                m.cancel();
-            }
-
-            if let Ok(mut lock) = media_machine.try_borrow_mut() {
-                if let Ok(episode) = dbqueries::get_episode_widget_from_rowid(id) {
-                    take_mut::take(lock.deref_mut(), |media| {
-                        media.determine_state(
-                            episode.length(),
-                            false,
-                            episode.local_uri().is_some(),
-                        )
-                    });
-                }
-            }
-        }));
-        drop(lock);
-
-        // Setup a callback that will update the progress bar.
-        update_progressbar_callback(&prog, &media_machine, id);
-
-        // Setup a callback that will update the total_size label
-        // with the http ContentLength header number rather than
-        // relying to the RSS feed.
-        update_total_size_callback(&prog, &media_machine);
-    }
-
-    Ok(())
-}
-
-#[inline]
 fn on_download_clicked(ep: &EpisodeWidgetQuery, sender: &Sender<Action>) -> Result<(), Error> {
     let pd = dbqueries::get_podcast_from_id(ep.podcast_id())?;
     let download_fold = get_download_folder(&pd.title())?;
@@ -250,30 +465,25 @@ fn on_download_clicked(ep: &EpisodeWidgetQuery, sender: &Sender<Action>) -> Resu
     manager::add(ep.rowid(), download_fold)?;
 
     // Update Views
-    sender.send(Action::RefreshEpisodesViewBGR)?;
-
-    Ok(())
+    sender
+        .send(Action::RefreshEpisodesViewBGR)
+        .map_err(From::from)
 }
 
-#[inline]
 fn on_play_bttn_clicked(
+    widget: &Rc<EpisodeWidget>,
     episode: &mut EpisodeWidgetQuery,
-    title: &Rc<RefCell<TitleMachine>>,
     sender: &Sender<Action>,
 ) -> Result<(), Error> {
     open_uri(episode.rowid())?;
     episode.set_played_now()?;
 
-    let mut machine = title.try_borrow_mut()?;
-    take_mut::take(machine.deref_mut(), |title| {
-        title.determine_state(episode.played().is_some())
-    });
-
-    sender.send(Action::RefreshEpisodesViewBGR)?;
-    Ok(())
+    widget.info.set_title(&episode);
+    sender
+        .send(Action::RefreshEpisodesViewBGR)
+        .map_err(From::from)
 }
 
-#[inline]
 fn open_uri(rowid: i32) -> Result<(), Error> {
     let uri = dbqueries::get_episode_local_uri_from_id(rowid)?
         .ok_or_else(|| format_err!("Expected Some found None."))?;
@@ -292,28 +502,27 @@ fn open_uri(rowid: i32) -> Result<(), Error> {
 #[inline]
 #[cfg_attr(feature = "cargo-clippy", allow(if_same_then_else))]
 fn update_progressbar_callback(
+    widget: &Rc<EpisodeWidget>,
     prog: &Arc<Mutex<manager::Progress>>,
-    media: &Rc<RefCell<MediaMachine>>,
     episode_rowid: i32,
 ) {
-    let callback = clone!(prog, media => move || {
-        progress_bar_helper(&prog, &media, episode_rowid)
+    let callback = clone!(widget, prog => move || {
+        progress_bar_helper(&widget, &prog, episode_rowid)
             .unwrap_or(glib::Continue(false))
     });
-    timeout_add(300, callback);
+    timeout_add(100, callback);
 }
 
-#[inline]
 #[allow(if_same_then_else)]
 fn progress_bar_helper(
+    widget: &Rc<EpisodeWidget>,
     prog: &Arc<Mutex<manager::Progress>>,
-    media: &Rc<RefCell<MediaMachine>>,
     episode_rowid: i32,
 ) -> Result<glib::Continue, Error> {
-    let (fraction, downloaded) = {
-        let m = prog.lock()
-            .map_err(|_| format_err!("Failed to get a lock on the mutex."))?;
-        (m.get_fraction(), m.get_downloaded())
+    let (fraction, downloaded) = match prog.try_lock() {
+        Ok(guard) => (guard.get_fraction(), guard.get_downloaded()),
+        Err(TryLockError::WouldBlock) => return Ok(glib::Continue(true)),
+        Err(TryLockError::Poisoned(_)) => return Err(format_err!("Progress Mutex is poisoned")),
     };
 
     // I hate floating points.
@@ -324,20 +533,16 @@ fn progress_bar_helper(
             .file_size(SIZE_OPTS.clone())
             .map_err(|err| format_err!("{}", err))?;
 
-        if let Ok(mut m) = media.try_borrow_mut() {
-            m.update_progress(&size, fraction);
-        }
+        widget.update_progress(&size, fraction);
     }
 
     // info!("Fraction: {}", progress_bar.get_fraction());
     // info!("Fraction: {}", fraction);
 
     // Check if the download is still active
-    let active = {
-        let m = manager::ACTIVE_DOWNLOADS
-            .read()
-            .map_err(|_| format_err!("Failed to get a lock on the mutex."))?;
-        m.contains_key(&episode_rowid)
+    let active = match manager::ACTIVE_DOWNLOADS.read() {
+        Ok(guard) => guard.contains_key(&episode_rowid),
+        Err(_) => return Err(format_err!("Failed to get a lock on the mutex.")),
     };
 
     if (fraction >= 1.0) && (!fraction.is_nan()) {
@@ -353,36 +558,28 @@ fn progress_bar_helper(
 // with the http ContentLength header number rather than
 // relying to the RSS feed.
 #[inline]
-fn update_total_size_callback(
-    prog: &Arc<Mutex<manager::Progress>>,
-    media: &Rc<RefCell<MediaMachine>>,
-) {
-    let callback = clone!(prog, media => move || {
-        total_size_helper(&prog, &media).unwrap_or(glib::Continue(true))
+fn update_total_size_callback(widget: &Rc<EpisodeWidget>, prog: &Arc<Mutex<manager::Progress>>) {
+    let callback = clone!(prog, widget => move || {
+        total_size_helper(&widget, &prog).unwrap_or(glib::Continue(true))
     });
-    timeout_add(500, callback);
+    timeout_add(100, callback);
 }
 
-#[inline]
 fn total_size_helper(
+    widget: &Rc<EpisodeWidget>,
     prog: &Arc<Mutex<manager::Progress>>,
-    media: &Rc<RefCell<MediaMachine>>,
 ) -> Result<glib::Continue, Error> {
     // Get the total_bytes.
-    let total_bytes = {
-        let m = prog.lock()
-            .map_err(|_| format_err!("Failed to get a lock on the mutex."))?;
-        m.get_total_size()
+    let total_bytes = match prog.try_lock() {
+        Ok(guard) => guard.get_total_size(),
+        Err(TryLockError::WouldBlock) => return Ok(glib::Continue(true)),
+        Err(TryLockError::Poisoned(_)) => return Err(format_err!("Progress Mutex is poisoned")),
     };
 
     debug!("Total Size: {}", total_bytes);
     if total_bytes != 0 {
         // Update the total_size label
-        if let Ok(mut m) = media.try_borrow_mut() {
-            take_mut::take(m.deref_mut(), |machine| {
-                machine.set_size(Some(total_bytes as i32))
-            });
-        }
+        widget.info.set_size(Some(total_bytes as i32));
 
         // Do not call again the callback
         Ok(glib::Continue(false))

hammond-gtk/src/widgets/episode_states.rs

@@ -1,936 +0,0 @@
-//  TODO: Things that should be done.
-//
-// * Wherever there's a function that take 2 or more arguments of the same type,
-//   eg: fn new(total_size: gtk::Label, local_size: gtk::Label ..)
-//   Wrap the types into Struct-tuples and imple deref so it won't be possible to pass
-//   the wrong argument to the wrong position.
-
-use chrono;
-use glib;
-use gtk;
-
-use chrono::prelude::*;
-use gtk::prelude::*;
-use humansize::{file_size_opts as size_opts, FileSize};
-
-use std::sync::Arc;
-
-lazy_static! {
-    pub static ref SIZE_OPTS: Arc<size_opts::FileSizeOpts> =  {
-        // Declare a custom humansize option struct
-        // See: https://docs.rs/humansize/1.0.2/humansize/file_size_opts/struct.FileSizeOpts.html
-        Arc::new(size_opts::FileSizeOpts {
-            divider: size_opts::Kilo::Binary,
-            units: size_opts::Kilo::Decimal,
-            decimal_places: 0,
-            decimal_zeroes: 0,
-            fixed_at: size_opts::FixedAt::No,
-            long_units: false,
-            space: true,
-            suffix: "",
-            allow_negative: false,
-        })
-    };
-
-    static ref NOW: DateTime<Utc> = Utc::now();
-}
-
-#[derive(Debug, Clone)]
-pub struct UnInitialized;
-
-#[derive(Debug, Clone)]
-pub struct Shown;
-#[derive(Debug, Clone)]
-pub struct Hidden;
-
-pub trait Visibility {}
-
-impl Visibility for Shown {}
-impl Visibility for Hidden {}
-
-#[derive(Debug, Clone)]
-pub struct Normal;
-#[derive(Debug, Clone)]
-pub struct GreyedOut;
-
-#[derive(Debug, Clone)]
-pub struct Title<S> {
-    title: gtk::Label,
-    state: S,
-}
-
-impl<S> Title<S> {
-    #[allow(unused_must_use)]
-    #[inline]
-    // This does not need to be &mut since gtk-rs does not model ownership
-    // But I think it wouldn't hurt if we treat it as a Rust api.
-    fn set_title(&mut self, s: &str) {
-        self.title.set_text(s);
-    }
-}
-
-impl Title<Normal> {
-    #[inline]
-    fn new(title: gtk::Label) -> Self {
-        Title {
-            title,
-            state: Normal {},
-        }
-    }
-}
-
-impl From<Title<Normal>> for Title<GreyedOut> {
-    #[inline]
-    fn from(f: Title<Normal>) -> Self {
-        f.title
-            .get_style_context()
-            .map(|c| c.add_class("dim-label"));
-
-        Title {
-            title: f.title,
-            state: GreyedOut {},
-        }
-    }
-}
-
-impl From<Title<GreyedOut>> for Title<Normal> {
-    #[inline]
-    fn from(f: Title<GreyedOut>) -> Self {
-        f.title
-            .get_style_context()
-            .map(|c| c.remove_class("dim-label"));
-
-        Title {
-            title: f.title,
-            state: Normal {},
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub enum TitleMachine {
-    Normal(Title<Normal>),
-    GreyedOut(Title<GreyedOut>),
-}
-
-impl TitleMachine {
-    #[inline]
-    pub fn new(label: gtk::Label, is_played: bool) -> Self {
-        let m = TitleMachine::Normal(Title::<Normal>::new(label));
-        m.determine_state(is_played)
-    }
-
-    #[inline]
-    pub fn determine_state(self, is_played: bool) -> Self {
-        use self::TitleMachine::*;
-
-        match (self, is_played) {
-            (title @ Normal(_), false) => title,
-            (title @ GreyedOut(_), true) => title,
-            (Normal(val), true) => GreyedOut(val.into()),
-            (GreyedOut(val), false) => Normal(val.into()),
-        }
-    }
-
-    #[inline]
-    pub fn set_title(&mut self, s: &str) {
-        use self::TitleMachine::*;
-
-        match *self {
-            Normal(ref mut val) => val.set_title(s),
-            GreyedOut(ref mut val) => val.set_title(s),
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct Usual;
-#[derive(Debug, Clone)]
-pub struct YearShown;
-
-#[derive(Debug, Clone)]
-pub struct Date<S> {
-    date: gtk::Label,
-    epoch: i64,
-    state: S,
-}
-
-impl<S> Date<S> {
-    #[inline]
-    fn into_usual(self, epoch: i64) -> Date<Usual> {
-        let ts = Utc.timestamp(epoch, 0);
-        self.date.set_text(ts.format("%e %b").to_string().trim());
-
-        Date {
-            date: self.date,
-            epoch: self.epoch,
-            state: Usual {},
-        }
-    }
-
-    #[inline]
-    fn into_year_shown(self, epoch: i64) -> Date<YearShown> {
-        let ts = Utc.timestamp(epoch, 0);
-        self.date.set_text(ts.format("%e %b %Y").to_string().trim());
-
-        Date {
-            date: self.date,
-            epoch: self.epoch,
-            state: YearShown {},
-        }
-    }
-}
-
-impl Date<UnInitialized> {
-    #[inline]
-    fn new(date: gtk::Label, epoch: i64) -> Self {
-        let ts = Utc.timestamp(epoch, 0);
-        date.set_text(ts.format("%e %b %Y").to_string().trim());
-
-        Date {
-            date,
-            epoch,
-            state: UnInitialized {},
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub enum DateMachine {
-    UnInitialized(Date<UnInitialized>),
-    Usual(Date<Usual>),
-    WithYear(Date<YearShown>),
-}
-
-impl DateMachine {
-    #[inline]
-    pub fn new(label: gtk::Label, epoch: i64) -> Self {
-        let m = DateMachine::UnInitialized(Date::<UnInitialized>::new(label, epoch));
-        m.determine_state(epoch)
-    }
-
-    #[inline]
-    pub fn determine_state(self, epoch: i64) -> Self {
-        use self::DateMachine::*;
-
-        let ts = Utc.timestamp(epoch, 0);
-        let is_old = NOW.year() != ts.year();
-
-        match (self, is_old) {
-            // Into Usual
-            (Usual(val), false) => Usual(val.into_usual(epoch)),
-            (WithYear(val), false) => Usual(val.into_usual(epoch)),
-            (UnInitialized(val), false) => Usual(val.into_usual(epoch)),
-
-            // Into Year Shown
-            (Usual(val), true) => WithYear(val.into_year_shown(epoch)),
-            (WithYear(val), true) => WithYear(val.into_year_shown(epoch)),
-            (UnInitialized(val), true) => WithYear(val.into_year_shown(epoch)),
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct Duration<S: Visibility> {
-    // TODO: make duration and separator diff types
-    duration: gtk::Label,
-    separator: gtk::Label,
-    state: S,
-}
-
-impl<S: Visibility> Duration<S> {
-    #[inline]
-    // This needs a better name.
-    // TODO: make me mut
-    fn set_duration(&self, minutes: i64) {
-        self.duration.set_text(&format!("{} min", minutes));
-    }
-}
-
-impl Duration<Hidden> {
-    #[inline]
-    fn new(duration: gtk::Label, separator: gtk::Label) -> Self {
-        duration.hide();
-        separator.hide();
-
-        Duration {
-            duration,
-            separator,
-            state: Hidden {},
-        }
-    }
-}
-
-impl From<Duration<Hidden>> for Duration<Shown> {
-    #[inline]
-    fn from(f: Duration<Hidden>) -> Self {
-        f.duration.show();
-        f.separator.show();
-
-        Duration {
-            duration: f.duration,
-            separator: f.separator,
-            state: Shown {},
-        }
-    }
-}
-
-impl From<Duration<Shown>> for Duration<Hidden> {
-    #[inline]
-    fn from(f: Duration<Shown>) -> Self {
-        f.duration.hide();
-        f.separator.hide();
-
-        Duration {
-            duration: f.duration,
-            separator: f.separator,
-            state: Hidden {},
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub enum DurationMachine {
-    Hidden(Duration<Hidden>),
-    Shown(Duration<Shown>),
-}
-
-impl DurationMachine {
-    #[inline]
-    pub fn new(duration: gtk::Label, separator: gtk::Label, seconds: Option<i32>) -> Self {
-        let m = DurationMachine::Hidden(Duration::<Hidden>::new(duration, separator));
-        m.determine_state(seconds)
-    }
-
-    #[inline]
-    pub fn determine_state(self, seconds: Option<i32>) -> Self {
-        match (self, seconds) {
-            (d @ DurationMachine::Hidden(_), None) => d,
-            (DurationMachine::Shown(val), None) => DurationMachine::Hidden(val.into()),
-            (DurationMachine::Hidden(val), Some(s)) => {
-                let minutes = chrono::Duration::seconds(s.into()).num_minutes();
-                if minutes == 0 {
-                    DurationMachine::Hidden(val)
-                } else {
-                    val.set_duration(minutes);
-                    DurationMachine::Shown(val.into())
-                }
-            }
-            (DurationMachine::Shown(val), Some(s)) => {
-                let minutes = chrono::Duration::seconds(s.into()).num_minutes();
-                if minutes == 0 {
-                    DurationMachine::Hidden(val.into())
-                } else {
-                    val.set_duration(minutes);
-                    DurationMachine::Shown(val)
-                }
-            }
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct Size<S> {
-    size: gtk::Label,
-    separator: gtk::Label,
-    state: S,
-}
-
-impl<S> Size<S> {
-    #[inline]
-    fn set_size(self, s: &str) -> Size<Shown> {
-        self.size.set_text(s);
-        self.size.show();
-        self.separator.show();
-        Size {
-            size: self.size,
-            separator: self.separator,
-            state: Shown {},
-        }
-    }
-
-    #[inline]
-    // https://play.rust-lang.org/?gist=1acffaf62743eeb85be1ae6ecf474784&version=stable
-    // It might be possible to make a generic definition with Specialization.
-    // https://github.com/rust-lang/rust/issues/31844
-    fn into_shown(self) -> Size<Shown> {
-        self.size.show();
-        self.separator.show();
-
-        Size {
-            size: self.size,
-            separator: self.separator,
-            state: Shown {},
-        }
-    }
-
-    #[inline]
-    fn into_hidden(self) -> Size<Hidden> {
-        self.size.hide();
-        self.separator.hide();
-
-        Size {
-            size: self.size,
-            separator: self.separator,
-            state: Hidden {},
-        }
-    }
-}
-
-impl Size<UnInitialized> {
-    #[inline]
-    fn new(size: gtk::Label, separator: gtk::Label) -> Self {
-        size.hide();
-        separator.hide();
-
-        Size {
-            size,
-            separator,
-            state: UnInitialized {},
-        }
-    }
-}
-
-// pub trait Playable {}
-
-// impl Playable for Download {}
-// impl Playable for Play {}
-
-#[derive(Debug, Clone)]
-pub struct Download;
-
-#[derive(Debug, Clone)]
-pub struct Play;
-
-#[derive(Debug, Clone)]
-// FIXME: Needs better name.
-// Should each button also has it's own type and machine?
-pub struct DownloadPlay<S> {
-    play: gtk::Button,
-    download: gtk::Button,
-    state: S,
-}
-
-impl<S> DownloadPlay<S> {
-    #[inline]
-    // https://play.rust-lang.org/?gist=1acffaf62743eeb85be1ae6ecf474784&version=stable
-    // It might be possible to make a generic definition with Specialization.
-    // https://github.com/rust-lang/rust/issues/31844
-    fn into_playable(self) -> DownloadPlay<Play> {
-        self.play.show();
-        self.download.hide();
-
-        DownloadPlay {
-            play: self.play,
-            download: self.download,
-            state: Play {},
-        }
-    }
-
-    #[inline]
-    fn into_fetchable(self) -> DownloadPlay<Download> {
-        self.play.hide();
-        self.download.show();
-
-        DownloadPlay {
-            play: self.play,
-            download: self.download,
-            state: Download {},
-        }
-    }
-
-    #[inline]
-    fn into_hidden(self) -> DownloadPlay<Hidden> {
-        self.play.hide();
-        self.download.hide();
-
-        DownloadPlay {
-            play: self.play,
-            download: self.download,
-            state: Hidden {},
-        }
-    }
-
-    #[inline]
-    fn download_connect_clicked<F: Fn(&gtk::Button) + 'static>(
-        &self,
-        f: F,
-    ) -> glib::SignalHandlerId {
-        self.download.connect_clicked(f)
-    }
-
-    #[inline]
-    fn play_connect_clicked<F: Fn(&gtk::Button) + 'static>(&self, f: F) -> glib::SignalHandlerId {
-        self.play.connect_clicked(f)
-    }
-}
-
-impl DownloadPlay<UnInitialized> {
-    #[inline]
-    fn new(play: gtk::Button, download: gtk::Button) -> Self {
-        play.hide();
-        download.hide();
-
-        DownloadPlay {
-            play,
-            download,
-            state: UnInitialized {},
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct Progress<S> {
-    bar: gtk::ProgressBar,
-    cancel: gtk::Button,
-    local_size: gtk::Label,
-    prog_separator: gtk::Label,
-    state: S,
-}
-
-impl<S> Progress<S> {
-    #[inline]
-    fn into_shown(self) -> Progress<Shown> {
-        self.bar.show();
-        self.cancel.show();
-        self.local_size.show();
-        self.prog_separator.show();
-
-        Progress {
-            bar: self.bar,
-            cancel: self.cancel,
-            local_size: self.local_size,
-            prog_separator: self.prog_separator,
-            state: Shown {},
-        }
-    }
-
-    #[inline]
-    fn into_hidden(self) -> Progress<Hidden> {
-        self.bar.hide();
-        self.cancel.hide();
-        self.local_size.hide();
-        self.prog_separator.hide();
-
-        Progress {
-            bar: self.bar,
-            cancel: self.cancel,
-            local_size: self.local_size,
-            prog_separator: self.prog_separator,
-            state: Hidden {},
-        }
-    }
-
-    #[allow(unused_must_use)]
-    #[inline]
-    // This does not need to be &mut since gtk-rs does not model ownership
-    // But I think it wouldn't hurt if we treat it as a Rust api.
-    fn update_progress(&mut self, local_size: &str, fraction: f64) {
-        self.local_size.set_text(local_size);
-        self.bar.set_fraction(fraction);
-    }
-
-    #[inline]
-    fn cancel_connect_clicked<F: Fn(&gtk::Button) + 'static>(&self, f: F) -> glib::SignalHandlerId {
-        self.cancel.connect_clicked(f)
-    }
-}
-
-impl Progress<UnInitialized> {
-    #[inline]
-    fn new(
-        bar: gtk::ProgressBar,
-        cancel: gtk::Button,
-        local_size: gtk::Label,
-        prog_separator: gtk::Label,
-    ) -> Self {
-        bar.hide();
-        cancel.hide();
-        local_size.hide();
-        prog_separator.hide();
-
-        Progress {
-            bar,
-            cancel,
-            local_size,
-            prog_separator,
-            state: UnInitialized {},
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct Media<X, Y, Z> {
-    dl: DownloadPlay<X>,
-    size: Size<Y>,
-    progress: Progress<Z>,
-}
-
-type New<Y> = Media<Download, Y, Hidden>;
-type Playable<Y> = Media<Play, Y, Hidden>;
-type InProgress = Media<Hidden, Shown, Shown>;
-
-impl<X, Y, Z> Media<X, Y, Z> {
-    #[inline]
-    fn set_size(self, s: &str) -> Media<X, Shown, Z> {
-        Media {
-            dl: self.dl,
-            size: self.size.set_size(s),
-            progress: self.progress,
-        }
-    }
-
-    #[inline]
-    fn hide_size(self) -> Media<X, Hidden, Z> {
-        Media {
-            dl: self.dl,
-            size: self.size.into_hidden(),
-            progress: self.progress,
-        }
-    }
-
-    #[inline]
-    fn into_new(self, size: &str) -> New<Shown> {
-        Media {
-            dl: self.dl.into_fetchable(),
-            size: self.size.set_size(size),
-            progress: self.progress.into_hidden(),
-        }
-    }
-
-    #[inline]
-    fn into_new_without(self) -> New<Hidden> {
-        Media {
-            dl: self.dl.into_fetchable(),
-            size: self.size.into_hidden(),
-            progress: self.progress.into_hidden(),
-        }
-    }
-
-    #[inline]
-    fn into_playable(self, size: &str) -> Playable<Shown> {
-        Media {
-            dl: self.dl.into_playable(),
-            size: self.size.set_size(size),
-            progress: self.progress.into_hidden(),
-        }
-    }
-
-    #[inline]
-    fn into_playable_without(self) -> Playable<Hidden> {
-        Media {
-            dl: self.dl.into_playable(),
-            size: self.size.into_hidden(),
-            progress: self.progress.into_hidden(),
-        }
-    }
-}
-
-impl<X, Z> Media<X, Shown, Z> {
-    #[inline]
-    fn into_progress(self) -> InProgress {
-        Media {
-            dl: self.dl.into_hidden(),
-            size: self.size.into_shown(),
-            progress: self.progress.into_shown(),
-        }
-    }
-}
-
-impl<X, Z> Media<X, Hidden, Z> {
-    #[inline]
-    fn into_progress(self) -> InProgress {
-        Media {
-            dl: self.dl.into_hidden(),
-            size: self.size.set_size("Unkown"),
-            progress: self.progress.into_shown(),
-        }
-    }
-}
-
-impl<X, Z> Media<X, UnInitialized, Z> {
-    #[inline]
-    fn into_progress(self, size: Option<String>) -> InProgress {
-        if let Some(s) = size {
-            Media {
-                dl: self.dl.into_hidden(),
-                size: self.size.set_size(&s),
-                progress: self.progress.into_shown(),
-            }
-        } else {
-            Media {
-                dl: self.dl.into_hidden(),
-                size: self.size.set_size("Unkown"),
-                progress: self.progress.into_shown(),
-            }
-        }
-    }
-}
-
-impl InProgress {
-    #[inline]
-    #[allow(unused_must_use)]
-    // This does not need to be &mut since gtk-rs does not model ownership
-    // But I think it wouldn't hurt if we treat it as a Rust api.
-    fn update_progress(&mut self, local_size: &str, fraction: f64) {
-        self.progress.update_progress(local_size, fraction)
-    }
-}
-
-#[derive(Debug, Clone)]
-pub enum ButtonsState {
-    New(Media<Download, Shown, Hidden>),
-    NewWithoutSize(Media<Download, Hidden, Hidden>),
-    Playable(Media<Play, Shown, Hidden>),
-    PlayableWithoutSize(Media<Play, Hidden, Hidden>),
-}
-
-impl ButtonsState {
-    #[inline]
-    pub fn determine_state(self, size: Option<String>, is_downloaded: bool) -> Self {
-        use self::ButtonsState::*;
-
-        match (self, size, is_downloaded) {
-            // From whatever to New
-            (New(m), Some(s), false) => New(m.into_new(&s)),
-            (Playable(m), Some(s), false) => New(m.into_new(&s)),
-
-            (NewWithoutSize(m), Some(s), false) => New(m.into_new(&s)),
-            (PlayableWithoutSize(m), Some(s), false) => New(m.into_new(&s)),
-
-            // From whatever to Playable
-            (New(m), Some(s), true) => Playable(m.into_playable(&s)),
-            (Playable(m), Some(s), true) => Playable(m.into_playable(&s)),
-
-            (NewWithoutSize(m), Some(s), true) => Playable(m.into_playable(&s)),
-            (PlayableWithoutSize(m), Some(s), true) => Playable(m.into_playable(&s)),
-
-            // From whatever to NewWithoutSize
-            (New(m), None, false) => NewWithoutSize(m.hide_size()),
-            (Playable(m), None, false) => NewWithoutSize(m.into_new_without()),
-
-            (b @ NewWithoutSize(_), None, false) => b,
-            (PlayableWithoutSize(m), None, false) => NewWithoutSize(m.into_new_without()),
-
-            // From whatever to PlayableWithoutSize
-            (New(m), None, true) => PlayableWithoutSize(m.into_playable_without()),
-            (Playable(m), None, true) => PlayableWithoutSize(m.hide_size()),
-
-            (NewWithoutSize(val), None, true) => PlayableWithoutSize(val.into_playable_without()),
-            (b @ PlayableWithoutSize(_), None, true) => b,
-        }
-    }
-
-    #[inline]
-    fn into_progress(self) -> InProgress {
-        use self::ButtonsState::*;
-
-        match self {
-            New(m) => m.into_progress(),
-            Playable(m) => m.into_progress(),
-            NewWithoutSize(m) => m.into_progress(),
-            PlayableWithoutSize(m) => m.into_progress(),
-        }
-    }
-
-    #[inline]
-    fn set_size(self, size: Option<String>) -> Self {
-        use self::ButtonsState::*;
-
-        match (self, size) {
-            (New(m), Some(s)) => New(m.set_size(&s)),
-            (New(m), None) => NewWithoutSize(m.hide_size()),
-            (Playable(m), Some(s)) => Playable(m.set_size(&s)),
-            (Playable(m), None) => PlayableWithoutSize(m.hide_size()),
-            (bttn @ NewWithoutSize(_), None) => bttn,
-            (bttn @ PlayableWithoutSize(_), None) => bttn,
-            (NewWithoutSize(m), Some(s)) => New(m.into_new(&s)),
-            (PlayableWithoutSize(m), Some(s)) => Playable(m.into_playable(&s)),
-        }
-    }
-
-    #[inline]
-    pub fn download_connect_clicked<F: Fn(&gtk::Button) + 'static>(
-        &self,
-        f: F,
-    ) -> glib::SignalHandlerId {
-        use self::ButtonsState::*;
-
-        match *self {
-            New(ref val) => val.dl.download_connect_clicked(f),
-            NewWithoutSize(ref val) => val.dl.download_connect_clicked(f),
-            Playable(ref val) => val.dl.download_connect_clicked(f),
-            PlayableWithoutSize(ref val) => val.dl.download_connect_clicked(f),
-        }
-    }
-
-    #[inline]
-    pub fn play_connect_clicked<F: Fn(&gtk::Button) + 'static>(
-        &self,
-        f: F,
-    ) -> glib::SignalHandlerId {
-        use self::ButtonsState::*;
-
-        match *self {
-            New(ref val) => val.dl.play_connect_clicked(f),
-            NewWithoutSize(ref val) => val.dl.play_connect_clicked(f),
-            Playable(ref val) => val.dl.play_connect_clicked(f),
-            PlayableWithoutSize(ref val) => val.dl.play_connect_clicked(f),
-        }
-    }
-
-    #[inline]
-    fn cancel_connect_clicked<F: Fn(&gtk::Button) + 'static>(&self, f: F) -> glib::SignalHandlerId {
-        use self::ButtonsState::*;
-
-        match *self {
-            New(ref val) => val.progress.cancel_connect_clicked(f),
-            NewWithoutSize(ref val) => val.progress.cancel_connect_clicked(f),
-            Playable(ref val) => val.progress.cancel_connect_clicked(f),
-            PlayableWithoutSize(ref val) => val.progress.cancel_connect_clicked(f),
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub enum MediaMachine {
-    UnInitialized(Media<UnInitialized, UnInitialized, UnInitialized>),
-    Initialized(ButtonsState),
-    InProgress(Media<Hidden, Shown, Shown>),
-}
-
-impl MediaMachine {
-    #[cfg_attr(feature = "cargo-clippy", allow(too_many_arguments))]
-    #[inline]
-    pub fn new(
-        play: gtk::Button,
-        download: gtk::Button,
-        bar: gtk::ProgressBar,
-        cancel: gtk::Button,
-        total_size: gtk::Label,
-        local_size: gtk::Label,
-        separator: gtk::Label,
-        prog_separator: gtk::Label,
-    ) -> Self {
-        let dl = DownloadPlay::<UnInitialized>::new(play, download);
-        let progress = Progress::<UnInitialized>::new(bar, cancel, local_size, prog_separator);
-        let size = Size::<UnInitialized>::new(total_size, separator);
-
-        MediaMachine::UnInitialized(Media { dl, progress, size })
-    }
-
-    #[inline]
-    pub fn download_connect_clicked<F: Fn(&gtk::Button) + 'static>(
-        &self,
-        f: F,
-    ) -> glib::SignalHandlerId {
-        use self::MediaMachine::*;
-
-        match *self {
-            UnInitialized(ref val) => val.dl.download_connect_clicked(f),
-            Initialized(ref val) => val.download_connect_clicked(f),
-            InProgress(ref val) => val.dl.download_connect_clicked(f),
-        }
-    }
-
-    #[inline]
-    pub fn play_connect_clicked<F: Fn(&gtk::Button) + 'static>(
-        &self,
-        f: F,
-    ) -> glib::SignalHandlerId {
-        use self::MediaMachine::*;
-
-        match *self {
-            UnInitialized(ref val) => val.dl.play_connect_clicked(f),
-            Initialized(ref val) => val.play_connect_clicked(f),
-            InProgress(ref val) => val.dl.play_connect_clicked(f),
-        }
-    }
-
-    #[inline]
-    pub fn cancel_connect_clicked<F: Fn(&gtk::Button) + 'static>(
-        &self,
-        f: F,
-    ) -> glib::SignalHandlerId {
-        use self::MediaMachine::*;
-
-        match *self {
-            UnInitialized(ref val) => val.progress.cancel_connect_clicked(f),
-            Initialized(ref val) => val.cancel_connect_clicked(f),
-            InProgress(ref val) => val.progress.cancel_connect_clicked(f),
-        }
-    }
-
-    #[inline]
-    pub fn determine_state(self, bytes: Option<i32>, is_active: bool, is_downloaded: bool) -> Self {
-        use self::ButtonsState::*;
-        use self::MediaMachine::*;
-
-        match (self, size_helper(bytes), is_downloaded, is_active) {
-            (UnInitialized(m), s, _, true) => InProgress(m.into_progress(s)),
-
-            // Into New
-            (UnInitialized(m), Some(s), false, false) => Initialized(New(m.into_new(&s))),
-            (UnInitialized(m), None, false, false) => {
-                Initialized(NewWithoutSize(m.into_new_without()))
-            }
-
-            // Into Playable
-            (UnInitialized(m), Some(s), true, false) => Initialized(Playable(m.into_playable(&s))),
-            (UnInitialized(m), None, true, false) => {
-                Initialized(PlayableWithoutSize(m.into_playable_without()))
-            }
-
-            (Initialized(bttn), s, dl, false) => Initialized(bttn.determine_state(s, dl)),
-            (Initialized(bttn), _, _, true) => InProgress(bttn.into_progress()),
-
-            // Into New
-            (InProgress(m), Some(s), false, false) => Initialized(New(m.into_new(&s))),
-            (InProgress(m), None, false, false) => {
-                Initialized(NewWithoutSize(m.into_new_without()))
-            }
-
-            // Into Playable
-            (InProgress(m), Some(s), true, false) => Initialized(Playable(m.into_playable(&s))),
-            (InProgress(m), None, true, false) => {
-                Initialized(PlayableWithoutSize(m.into_playable_without()))
-            }
-
-            (i @ InProgress(_), _, _, _) => i,
-        }
-    }
-
-    #[inline]
-    pub fn set_size(self, bytes: Option<i32>) -> Self {
-        use self::MediaMachine::*;
-        let size = size_helper(bytes);
-
-        match (self, size) {
-            (Initialized(bttn), s) => Initialized(bttn.set_size(s)),
-            (InProgress(val), Some(s)) => InProgress(val.set_size(&s)),
-            (n @ InProgress(_), None) => n,
-            (n @ UnInitialized(_), _) => n,
-        }
-    }
-
-    #[inline]
-    pub fn update_progress(&mut self, local_size: &str, fraction: f64) {
-        use self::MediaMachine::*;
-
-        match *self {
-            Initialized(_) => (),
-            UnInitialized(_) => (),
-            InProgress(ref mut val) => val.update_progress(local_size, fraction),
-        }
-    }
-}
-
-#[inline]
-fn size_helper(bytes: Option<i32>) -> Option<String> {
-    let s = bytes?;
-    if s == 0 {
-        return None;
-    }
-
-    s.file_size(SIZE_OPTS.clone()).ok()
-}

hammond-gtk/src/widgets/home_view.rs

@@ -4,6 +4,7 @@ use failure::Error;
 use gtk;
 use gtk::prelude::*;
 
+use crossbeam_channel::Sender;
 use hammond_data::dbqueries;
 use hammond_data::EpisodeWidgetQuery;
 use send_cell::SendCell;
@@ -13,7 +14,6 @@ use utils::{self, lazy_load_full};
 use widgets::EpisodeWidget;
 
 use std::rc::Rc;
-use std::sync::mpsc::Sender;
 use std::sync::Mutex;
 
 lazy_static! {
@@ -48,9 +48,8 @@ pub struct HomeView {
 }
 
 impl Default for HomeView {
-    #[inline]
     fn default() -> Self {
-        let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/episodes_view.ui");
+        let builder = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/episodes_view.ui");
         let container: gtk::Box = builder.get_object("container").unwrap();
         let scrolled_window: gtk::ScrolledWindow = builder.get_object("scrolled_window").unwrap();
         let frame_parent: gtk::Box = builder.get_object("frame_parent").unwrap();
@@ -85,7 +84,6 @@ impl Default for HomeView {
 
 // TODO: REFACTOR ME
 impl HomeView {
-    #[inline]
     pub fn new(sender: Sender<Action>) -> Result<Rc<HomeView>, Error> {
         use self::ListSplit::*;
 
@@ -97,7 +95,7 @@ impl HomeView {
         let view_ = view.clone();
         let func = move |ep: EpisodeWidgetQuery| {
             let epoch = ep.epoch();
-            let widget = EpisodesViewWidget::new(ep, &sender);
+            let widget = HomeEpisode::new(&ep, &sender);
 
             match split(&now_utc, i64::from(epoch)) {
                 Today => add_to_box(&widget, &view_.today_list, &view_.today_box),
@@ -121,7 +119,6 @@ impl HomeView {
         Ok(view)
     }
 
-    #[inline]
     /// Set scrolled window vertical adjustment.
     fn set_vadjustment(&self) -> Result<(), Error> {
         let guard = EPISODES_VIEW_VALIGNMENT
@@ -138,11 +135,11 @@ impl HomeView {
         Ok(())
     }
 
-    #[inline]
     /// 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));
@@ -153,13 +150,11 @@ impl HomeView {
     }
 }
 
-#[inline]
-fn add_to_box(widget: &EpisodesViewWidget, listbox: &gtk::ListBox, box_: &gtk::Box) {
+fn add_to_box(widget: &HomeEpisode, listbox: &gtk::ListBox, box_: &gtk::Box) {
     listbox.add(&widget.container);
     box_.show();
 }
 
-#[inline]
 fn split(now: &DateTime<Utc>, epoch: i64) -> ListSplit {
     let ep = Utc.timestamp(epoch, 0);
 
@@ -177,23 +172,23 @@ fn split(now: &DateTime<Utc>, epoch: i64) -> ListSplit {
 }
 
 #[derive(Debug, Clone)]
-struct EpisodesViewWidget {
+struct HomeEpisode {
     container: gtk::Box,
     image: gtk::Image,
+    // FIXME: Change it to `EpisodeWidget` instead of a `Box`?
     episode: gtk::Box,
 }
 
-impl Default for EpisodesViewWidget {
-    #[inline]
+impl Default for HomeEpisode {
     fn default() -> Self {
         let builder =
-            gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/episodes_view_widget.ui");
+            gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/episodes_view_widget.ui");
         let container: gtk::Box = builder.get_object("container").unwrap();
         let image: gtk::Image = builder.get_object("cover").unwrap();
         let ep = EpisodeWidget::default();
         container.pack_start(&ep.container, true, true, 6);
 
-        EpisodesViewWidget {
+        HomeEpisode {
             container,
             image,
             episode: ep.container,
@@ -201,26 +196,25 @@ impl Default for EpisodesViewWidget {
     }
 }
 
-impl EpisodesViewWidget {
-    fn new(episode: EpisodeWidgetQuery, sender: &Sender<Action>) -> EpisodesViewWidget {
+impl HomeEpisode {
+    fn new(episode: &EpisodeWidgetQuery, sender: &Sender<Action>) -> HomeEpisode {
         let builder =
-            gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/episodes_view_widget.ui");
+            gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/episodes_view_widget.ui");
         let container: gtk::Box = builder.get_object("container").unwrap();
         let image: gtk::Image = builder.get_object("cover").unwrap();
         let pid = episode.podcast_id();
         let ep = EpisodeWidget::new(episode, sender);
 
-        let view = EpisodesViewWidget {
+        let view = HomeEpisode {
             container,
             image,
-            episode: ep.container,
+            episode: ep.container.clone(),
         };
 
         view.init(pid);
         view
     }
 
-    #[inline]
     fn init(&self, podcast_id: i32) {
         self.set_cover(podcast_id)
             .map_err(|err| error!("Failed to set a cover: {}", err))
@@ -229,7 +223,6 @@ impl EpisodesViewWidget {
         self.container.pack_start(&self.episode, true, true, 6);
     }
 
-    #[inline]
     fn set_cover(&self, podcast_id: i32) -> Result<(), Error> {
         utils::set_image_from_path(&self.image, podcast_id, 64)
     }

hammond-gtk/src/widgets/mod.rs

@@ -1,10 +1,12 @@
+mod aboutdialog;
+pub mod appnotif;
 mod empty;
 mod episode;
-mod episode_states;
 mod home_view;
 mod show;
 mod shows_view;
 
+pub use self::aboutdialog::about_dialog;
 pub use self::empty::EmptyView;
 pub use self::episode::EpisodeWidget;
 pub use self::home_view::HomeView;

hammond-gtk/src/widgets/show.rs

@@ -2,6 +2,7 @@ use glib;
 use gtk;
 use gtk::prelude::*;
 
+use crossbeam_channel::{SendError, Sender};
 use failure::Error;
 use html2pango::markup_from_raw;
 use open;
@@ -13,12 +14,11 @@ use hammond_data::utils::delete_show;
 use hammond_data::Podcast;
 
 use app::Action;
-use appnotif::InAppNotification;
 use utils::{self, lazy_load};
+use widgets::appnotif::{InAppNotification, UndoState};
 use widgets::EpisodeWidget;
 
 use std::rc::Rc;
-use std::sync::mpsc::{SendError, Sender};
 use std::sync::{Arc, Mutex};
 
 lazy_static! {
@@ -40,9 +40,8 @@ pub struct ShowWidget {
 }
 
 impl Default for ShowWidget {
-    #[inline]
     fn default() -> Self {
-        let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/show_widget.ui");
+        let builder = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/show_widget.ui");
         let container: gtk::Box = builder.get_object("container").unwrap();
         let scrolled_window: gtk::ScrolledWindow = builder.get_object("scrolled_window").unwrap();
         let episodes = builder.get_object("episodes").unwrap();
@@ -68,7 +67,6 @@ impl Default for ShowWidget {
 }
 
 impl ShowWidget {
-    #[inline]
     pub fn new(pd: Arc<Podcast>, sender: Sender<Action>) -> Rc<ShowWidget> {
         let mut pdw = ShowWidget::default();
         pdw.init(&pd, &sender);
@@ -80,9 +78,8 @@ impl ShowWidget {
         pdw
     }
 
-    #[inline]
     pub fn init(&mut self, pd: &Arc<Podcast>, sender: &Sender<Action>) {
-        let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/show_widget.ui");
+        let builder = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/show_widget.ui");
 
         self.unsub
             .connect_clicked(clone!(pd, sender => move |bttn| {
@@ -120,23 +117,21 @@ impl ShowWidget {
         self.settings.set_popover(&show_menu);
     }
 
-    #[inline]
     /// Set the show cover.
     fn set_cover(&self, pd: &Arc<Podcast>) -> Result<(), Error> {
         utils::set_image_from_path(&self.cover, pd.id(), 256)
     }
 
-    #[inline]
     /// Set the descripton text.
     fn set_description(&self, text: &str) {
         self.description.set_markup(&markup_from_raw(text));
     }
 
-    #[inline]
     /// 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)));
@@ -146,7 +141,6 @@ impl ShowWidget {
         Ok(())
     }
 
-    #[inline]
     /// Set scrolled window vertical adjustment.
     fn set_vadjustment(&self, pd: &Arc<Podcast>) -> Result<(), Error> {
         let guard = SHOW_WIDGET_VALIGNMENT
@@ -176,7 +170,6 @@ impl ShowWidget {
     }
 }
 
-#[inline]
 /// Populate the listbox with the shows episodes.
 fn populate_listbox(
     show: &Rc<ShowWidget>,
@@ -197,7 +190,7 @@ fn populate_listbox(
     }));
 
     if count == 0 {
-        let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/empty_show.ui");
+        let builder = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/empty_show.ui");
         let container: gtk::Box = builder.get_object("empty_show").unwrap();
         show.episodes.add(&container);
         return Ok(());
@@ -214,7 +207,7 @@ fn populate_listbox(
         let list = show_.episodes.clone();
 
         let constructor = clone!(sender => move |ep| {
-            EpisodeWidget::new(ep, &sender).container
+            EpisodeWidget::new(&ep, &sender).container.clone()
         });
 
         let callback = clone!(pd, show_ => move || {
@@ -231,7 +224,6 @@ fn populate_listbox(
     Ok(())
 }
 
-#[inline]
 fn on_unsub_button_clicked(pd: Arc<Podcast>, unsub_button: &gtk::Button, sender: &Sender<Action>) {
     // hack to get away without properly checking for none.
     // if pressed twice would panic.
@@ -252,7 +244,6 @@ fn on_unsub_button_clicked(pd: Arc<Podcast>, unsub_button: &gtk::Button, sender:
     unsub_button.set_sensitive(true);
 }
 
-#[inline]
 fn on_played_button_clicked(pd: Arc<Podcast>, episodes: &gtk::ListBox, sender: &Sender<Action>) {
     if dim_titles(episodes).is_none() {
         error!("Something went horribly wrong when dimming the titles.");
@@ -265,7 +256,6 @@ fn on_played_button_clicked(pd: Arc<Podcast>, episodes: &gtk::ListBox, sender: &
         .ok();
 }
 
-#[inline]
 fn mark_all_watched(pd: &Podcast, sender: &Sender<Action>) -> Result<(), Error> {
     dbqueries::update_none_to_played_now(pd)?;
     // Not all widgets migth have been loaded when the mark_all is hit
@@ -274,7 +264,6 @@ fn mark_all_watched(pd: &Podcast, sender: &Sender<Action>) -> Result<(), Error>
     sender.send(Action::RefreshEpisodesView).map_err(From::from)
 }
 
-#[inline]
 pub fn mark_all_notif(pd: Arc<Podcast>, sender: &Sender<Action>) -> InAppNotification {
     let id = pd.id();
     let callback = clone!(sender => move || {
@@ -291,10 +280,9 @@ pub fn mark_all_notif(pd: Arc<Podcast>, sender: &Sender<Action>) -> InAppNotific
     });
 
     let text = "Marked all episodes as listened";
-    InAppNotification::new(text, callback, undo_callback)
+    InAppNotification::new(text, callback, undo_callback, UndoState::Shown)
 }
 
-#[inline]
 pub fn remove_show_notif(pd: Arc<Podcast>, sender: Sender<Action>) -> InAppNotification {
     let text = format!("Unsubscribed from {}", pd.title());
 
@@ -332,10 +320,9 @@ pub fn remove_show_notif(pd: Arc<Podcast>, sender: Sender<Action>) -> InAppNotif
         undo_wrap().map_err(|err| error!("{}", err)).ok();
     };
 
-    InAppNotification::new(&text, callback, undo_callback)
+    InAppNotification::new(&text, callback, undo_callback, UndoState::Shown)
 }
 
-#[inline]
 // Ideally if we had a custom widget this would have been as simple as:
 // `for row in listbox { ep = row.get_episode(); ep.dim_title(); }`
 // But now I can't think of a better way to do it than hardcoding the title
@@ -352,8 +339,7 @@ fn dim_titles(episodes: &gtk::ListBox) -> Option<()> {
             .downcast::<gtk::Box>()
             .ok()?;
         let bar = foo.get_children().remove(0).downcast::<gtk::Box>().ok()?;
-        let baz = bar.get_children().remove(0).downcast::<gtk::Box>().ok()?;
-        let title = baz.get_children().remove(0).downcast::<gtk::Label>().ok()?;
+        let title = bar.get_children().remove(0).downcast::<gtk::Label>().ok()?;
 
         title.get_style_context().map(|c| c.add_class("dim-label"));
     }

hammond-gtk/src/widgets/shows_view.rs

@@ -1,16 +1,23 @@
-use failure::Error;
 use gtk;
 use gtk::prelude::*;
 
+use crossbeam_channel::Sender;
+use failure::Error;
+use send_cell::SendCell;
+
 use hammond_data::dbqueries;
 use hammond_data::Podcast;
 
 use app::Action;
-use utils::{get_ignored_shows, lazy_load, set_image_from_path};
+use utils::{self, get_ignored_shows, lazy_load, set_image_from_path};
 
 use std::rc::Rc;
-use std::sync::mpsc::Sender;
 use std::sync::Arc;
+use std::sync::Mutex;
+
+lazy_static! {
+    static ref SHOWS_VIEW_VALIGNMENT: Mutex<Option<SendCell<gtk::Adjustment>>> = Mutex::new(None);
+}
 
 #[derive(Debug, Clone)]
 pub struct ShowsView {
@@ -20,9 +27,8 @@ pub struct ShowsView {
 }
 
 impl Default for ShowsView {
-    #[inline]
     fn default() -> Self {
-        let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/shows_view.ui");
+        let builder = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/shows_view.ui");
         let container: gtk::Box = builder.get_object("fb_parent").unwrap();
         let scrolled_window: gtk::ScrolledWindow = builder.get_object("scrolled_window").unwrap();
         let flowbox: gtk::FlowBox = builder.get_object("flowbox").unwrap();
@@ -36,41 +42,70 @@ impl Default for ShowsView {
 }
 
 impl ShowsView {
-    #[inline]
     pub fn new(sender: Sender<Action>) -> Result<Rc<Self>, Error> {
         let pop = Rc::new(ShowsView::default());
-        pop.init(sender)?;
+        pop.init(sender);
+        // Populate the flowbox with the Podcasts.
+        populate_flowbox(&pop)?;
         Ok(pop)
     }
 
-    #[inline]
-    pub fn init(&self, sender: Sender<Action>) -> Result<(), Error> {
+    pub fn init(&self, sender: Sender<Action>) {
         self.flowbox.connect_child_activated(move |_, child| {
             on_child_activate(child, &sender)
                 .map_err(|err| error!("Error along flowbox child activation: {}", err))
                 .ok();
         });
-        // Populate the flowbox with the Podcasts.
-        self.populate_flowbox()
     }
 
-    #[inline]
-    fn populate_flowbox(&self) -> Result<(), Error> {
-        let ignore = get_ignored_shows()?;
-        let podcasts = dbqueries::get_podcasts_filter(&ignore)?;
+    /// Set scrolled window vertical adjustment.
+    #[allow(unused)]
+    fn set_vadjustment(&self) -> Result<(), Error> {
+        let guard = SHOWS_VIEW_VALIGNMENT
+            .lock()
+            .map_err(|err| format_err!("Failed to lock widget align mutex: {}", err))?;
 
-        let flowbox = self.flowbox.clone();
-        let constructor = |parent| ShowsChild::new(&parent).child;
-        let callback = move || flowbox.show_all();
+        if let Some(ref sendcell) = *guard {
+            // Copy the vertical scrollbar adjustment from the old view into the new one.
+            sendcell
+                .try_get()
+                .map(|x| utils::smooth_scroll_to(&self.scrolled_window, &x));
+        }
 
-        let flowbox = self.flowbox.clone();
-        lazy_load(podcasts, flowbox, constructor, callback);
+        Ok(())
+    }
+
+    /// 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
+                .get_vadjustment()
+                .ok_or_else(|| format_err!("Could not get the adjustment"))?;
+            *guard = Some(SendCell::new(adj));
+            info!("Saved episodes_view alignment.");
+        }
 
         Ok(())
     }
 }
 
-#[inline]
+fn populate_flowbox(shows: &Rc<ShowsView>) -> Result<(), Error> {
+    let ignore = get_ignored_shows()?;
+    let podcasts = dbqueries::get_podcasts_filter(&ignore)?;
+
+    let constructor = move |parent| ShowsChild::new(&parent).child;
+    let callback = clone!(shows => move || {
+         shows.set_vadjustment()
+              .map_err(|err| error!("Failed to set ShowsView Alignment: {}", err))
+              .ok();
+     });
+
+    let flowbox = shows.flowbox.clone();
+    lazy_load(podcasts, flowbox, constructor, callback);
+    Ok(())
+}
+
 fn on_child_activate(child: &gtk::FlowBoxChild, sender: &Sender<Action>) -> Result<(), Error> {
     use gtk::WidgetExt;
 
@@ -94,9 +129,8 @@ struct ShowsChild {
 }
 
 impl Default for ShowsChild {
-    #[inline]
     fn default() -> Self {
-        let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/shows_child.ui");
+        let builder = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/shows_child.ui");
 
         let container: gtk::Box = builder.get_object("fb_child").unwrap();
         let cover: gtk::Image = builder.get_object("pd_cover").unwrap();
@@ -113,14 +147,12 @@ impl Default for ShowsChild {
 }
 
 impl ShowsChild {
-    #[inline]
     pub fn new(pd: &Podcast) -> ShowsChild {
         let child = ShowsChild::default();
         child.init(pd);
         child
     }
 
-    #[inline]
     fn init(&self, pd: &Podcast) {
         self.container.set_tooltip_text(pd.title());
         WidgetExt::set_name(&self.child, &pd.id().to_string());
@@ -130,7 +162,6 @@ impl ShowsChild {
             .ok();
     }
 
-    #[inline]
     fn set_cover(&self, podcast_id: i32) -> Result<(), Error> {
         set_image_from_path(&self.cover, podcast_id, 256)
     }

meson.build

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

org.gnome.Hammond.json

@@ -1,7 +1,7 @@
 {
     "app-id" : "org.gnome.Hammond",
     "runtime" : "org.gnome.Platform",
-    "runtime-version" : "master",
+    "runtime-version" : "3.28",
     "sdk" : "org.gnome.Sdk",
     "sdk-extensions" : [
         "org.freedesktop.Sdk.Extension.rust-stable"
@@ -30,7 +30,7 @@
         "env" : {
             "CARGO_HOME" : "/run/build/Hammond/cargo",
             "RUST_BACKTRACE" : "1",
-            "RUSTFLAGS" : "--cfg rayon_unstable"
+            "DEBUG" : "true"
         }
     },
     "modules" : [

rustfmt.toml

@@ -1,12 +1,10 @@
 unstable_features = true
-verbose = false
 max_width = 100
 comment_width = 100
 wrap_comments = true
 tab_spaces = 4
 hard_tabs = false
 newline_style = "Unix"
-write_mode = "Overwrite"
 condense_wildcard_suffixes = false
 format_strings = true
 normalize_comments = true

scripts/cargo.sh

@@ -3,4 +3,11 @@
 export CARGO_HOME=$1/target/cargo-home
 export RUSTFLAGS="--cfg rayon_unstable"
 
-cargo build --release -p hammond-gtk && cp $1/target/release/hammond-gtk $2
+if [[ $DEBUG = true ]]
+then
+    echo "DEBUG MODE"
+    cargo build -p hammond-gtk && cp $1/target/debug/hammond-gtk $2
+else
+    echo "RELEASE MODE"
+    cargo build --release -p hammond-gtk && cp $1/target/release/hammond-gtk $2
+fi