AboutEpisode: Initial commit.

.gitignore

@@ -7,4 +7,3 @@ resources.gresource
 _build
 vendor/
 .criterion
-org.gnome.*.json~

.gitlab-ci.yml

@@ -25,7 +25,7 @@ variables:
 
     before_script:
         - apt-get update -yqq
-        - apt-get install -yqq --no-install-recommends build-essential libgtk-3-dev meson libgstreamer1.0-dev
+        - apt-get install -yqq --no-install-recommends build-essential libgtk-3-dev meson
 
         - mkdir -p .cargo_cache
         # Only stuff inside the repo directory can be cached
@@ -41,12 +41,12 @@ variables:
         - cargo test -- --test-threads=1 --ignored
     <<: *cargo_cache
 
-.rust:stable:
+rust:stable:
     # https://hub.docker.com/_/rust/
     image: "rust"
     <<: *cargo_test
 
-.rust:nightly:
+rust:nightly:
     # https://hub.docker.com/r/rustlang/rust/
     image: "rustlang/rust:nightly"
     <<: *cargo_test
@@ -129,7 +129,7 @@ rustfmt:
 
 # Configure and run clippy on nightly
 # Only fails on errors atm.
-.clippy:
+clippy:
     image: "registry.gitlab.gnome.org/alatiera/hammond-container-images/clippy:nightly"
     stage: lint
     variables:

.gitlab/issue_templates/Bug.md

@@ -1,42 +1,9 @@
-# Steps to reproduce
-<!--
-    Explain in detail the steps on how the issue can be reproduced.
--->
-1.
-2.
-3.
+Detailed description of the issue. Put as much information as you can, potentially
+with images showing the issue.
 
-Reproducible in:
-<!--
-    Please test if the issue was already fixed in the unstable version of the app.
-    For that, follow these steps:
-    1. Make sure Flatpak is installed or install it following these steps https://flatpak.org/setup
-    2. Install the unstable version of the app following this link 
-    https://gitlab.gnome.org/GNOME/gnome-apps-nightly/raw/master/nautilus.flatpakref and save
-    it as a ".flatpakref" file
+Steps to reproduce:
 
-    If these steps failed, write in 'Other' the distribution you’re using and
-    the version of the app.
--->
-- Flatpak unstable: (yes or no) <!-- Write "yes" or "no" after the semicolon. -->
-- Other:
+1. Open Hammond
+2. Do an action
+3. ...
 
-# Current behavior
-<!-- Describe the current behavior. -->
-
-
-# Expected behavior
-<!-- Describe the expected behavior. -->
-
-
-# Additional information
-<!--
-    Provide more information that could be relevant.
-    
-    If the issue is a crash, provide a stack trace following the steps in:
-    https://wiki.gnome.org/Community/GettingInTouch/Bugzilla/GettingTraces
--->
-
-
-<!-- Ignore the text under this line. -->
-/label ~"Bug"

.gitlab/issue_templates/Epic.md

@@ -1,41 +1,42 @@
-# Current problems
-<!--
-What are the problems that the current project has?
+ 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
--->
+ 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?
+ # 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.
--->
+ 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?
+ # 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
--->
+ 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.
--->
+ # 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. -->
+ # 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"
 
-/label ~"Epic"

.gitlab/issue_templates/Feature.md

@@ -1,24 +1,17 @@
-### Use cases
-<!-- 
-    Describe what problem(s) the user is experiencing and that this request
-    is trying to solve. 
--->
+Detailed description of the feature. Put as much information as you can.
 
+Proposed Mockups:
 
-### Desired behavior
-<!-- Describe the desired functionality. -->
+(Add mockups of the proposed feature)
 
+## Design Tasks
 
-### Benefits of the solution
-<!-- List the possible benefits of the solution and how it fits in the project. -->
+* [ ]  design tasks
 
+## Development Tasks
 
-### Possible drawbacks
-<!--
-     Describe possible drawbacks of the feature and list how it could affect
-     the project i.e. UI discoverability, complexity, impact in more or less
-     number of users, etc.
--->
+* [ ]  development tasks
 
-<!-- Ignore the text under this line. -->
-/label ~"Feature"
+## QA Tasks
+
+* [ ]  qa (quality assurance) tasks

CHANGELOG.md

@@ -6,32 +6,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 ### Added:
+- Keyboard Shortcuts and a Shortcuts dialog were implemented. (ZanderBrown) [!33](https://gitlab.gnome.org/World/hammond/merge_requests/33)
 
 ### Changed:
-
-### Fixed:
-
-### Removed:
-
-## [0.4.0] - 2018-07-04
-### 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)
+- 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
-- An embeded audio player was implemented!
-[!40](https://gitlab.gnome.org/World/hammond/merge_requests/40)
-- Various Database changes.
-[!41](https://gitlab.gnome.org/World/hammond/merge_requests/41)
 
 ### 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

README.md

@@ -68,9 +68,8 @@ sudo ninja -C build install
 
 #### Dependencies
 
-* Rust stable 1.27 or later along with cargo.
+* Rust stable 1.26 or later along with cargo.
 * Gtk+ 3.22 or later
-* Gstreamer 1.12 or later
 * Meson
 * A network connection
 
@@ -79,23 +78,15 @@ Offline build are possible too, but [`cargo-vendor`][vendor] would have to be se
 **Debian/Ubuntu**
 
 ```sh
-apt-get install -yqq cargo rustc libsqlite3-dev libssl-dev libgtk-3-dev meson \
-        libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev \
-        gstreamer1.0-plugins-base gstreamer1.0-plugins-good \
-        gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly \
-        gstreamer1.0-libav libgstrtspserver-1.0-dev ibgstreamer-plugins-bad1.0-dev
+apt-get update -yqq
+apt-get install -yqq --no-install-recommends build-essential
+apt-get install -yqq --no-install-recommends rustc cargo libgtk-3-dev meson
 ```
 
 **Fedora**
 
 ```sh
-dnf install -y rust cargo gtk3-devel glib2-devel openssl-devel sqlite-devel meson \
-    gstreamer1-devel gstreamer1-plugins-base-tools gstreamer1-devel-docs \
-    gstreamer1-plugins-base-devel gstreamer1-plugins-base-devel-docs \
-    gstreamer1-plugins-good gstreamer1-plugins-good-extras \
-    gstreamer1-plugins-bad-free gstreamer1-plugins-bad-free-devel \
-    gstreamer1-plugins-bad-free-extras
-
+dnf install -y rust cargo gtk3-devel glib2-devel openssl-devel sqlite-devel meson
 ```
 
 If you happen to build it on other distributions please let me know the names 

hammond-data/Cargo.toml

@@ -6,10 +6,10 @@ workspace = "../"
 
 [dependencies]
 ammonia = "1.1.0"
-chrono = "0.4.4"
+chrono = "0.4.2"
 derive_builder = "0.5.1"
-lazy_static = "1.0.1"
-log = "0.4.2"
+lazy_static = "1.0.0"
+log = "0.4.1"
 rayon = "1.0.1"
 rayon-futures = "0.1.0"
 rfc822_sanitizer = "0.3.3"
@@ -28,14 +28,14 @@ failure_derive = "0.1.1"
 
 [dependencies.diesel]
 features = ["sqlite", "r2d2"]
-version = "1.3.2"
+version = "= 1.2.2"
 
 [dependencies.diesel_migrations]
 features = ["sqlite"]
-version = "1.3.0"
+version = "= 1.2.0"
 
 [dev-dependencies]
-rand = "0.5.2"
+rand = "0.5.0"
 tempdir = "0.3.7"
 criterion = "0.2.3"
 pretty_assertions = "0.5.1"

hammond-data/diesel.toml

@@ -1,6 +0,0 @@
-# For documentation on how to configure this file,
-# see diesel.rs/guides/configuring-diesel-cli
-
-[print_schema]
-file = "src/schema.rs"
-patch_file = "src/schema.patch"

hammond-data/migrations/2018-06-30-141659_remove_dead_fields/down.sql

@@ -1,53 +0,0 @@
-ALTER TABLE episode RENAME TO old_table;
-
-CREATE TABLE episode (
-  title	TEXT NOT NULL,
-  uri	TEXT,
-  local_uri	TEXT,
-  description	TEXT,
-  epoch	INTEGER NOT NULL DEFAULT 0,
-  length	INTEGER,
-  duration	INTEGER,
-  guid	TEXT,
-  played	INTEGER,
-  podcast_id	INTEGER NOT NULL,
-  favorite	INTEGER DEFAULT 0,
-  archive	INTEGER DEFAULT 0,
-  PRIMARY KEY (title, podcast_id)
-);
-
-INSERT INTO episode (title, uri, local_uri, description, epoch, length, duration, guid, played, podcast_id, favorite, archive)
-SELECT title, uri, local_uri, description, epoch, length, duration, guid, played, podcast_id, 0, 0
-FROM old_table;
-
-Drop table old_table;
-
-ALTER TABLE podcast RENAME TO old_table;
-CREATE TABLE `podcast` (
-  `id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT UNIQUE,
-  `title`	TEXT NOT NULL,
-  `link`	TEXT NOT NULL,
-  `description`	TEXT NOT NULL,
-  `image_uri`	TEXT,
-  `source_id`	INTEGER NOT NULL UNIQUE,
-  `favorite`  INTEGER NOT NULL DEFAULT 0,
-  `archive`	  INTEGER NOT NULL DEFAULT 0,
-  `always_dl`	INTEGER NOT NULL DEFAULT 0
-);
-
-INSERT INTO podcast (
-  id,
-  title,
-  link,
-  description,
-  image_uri,
-  source_id
-) SELECT id,
-  title,
-  link,
-  description,
-  image_uri,
-  source_id
-FROM old_table;
-
-Drop table old_table;

hammond-data/migrations/2018-06-30-141659_remove_dead_fields/up.sql

@@ -1,66 +0,0 @@
-ALTER TABLE episode RENAME TO old_table;
-
-CREATE TABLE episode (
-  title	TEXT NOT NULL,
-  uri	TEXT,
-  local_uri	TEXT,
-  description	TEXT,
-  epoch	INTEGER NOT NULL DEFAULT 0,
-  length	INTEGER,
-  duration	INTEGER,
-  guid	TEXT,
-  played	INTEGER,
-  podcast_id	INTEGER NOT NULL,
-  PRIMARY KEY (title, podcast_id)
-);
-
-INSERT INTO episode (
-  title,
-  uri,
-  local_uri,
-  description,
-  epoch,
-  length,
-  duration,
-  guid,
-  played,
-  podcast_id
-) SELECT title,
-  uri,
-  local_uri,
-  description,
-  epoch, length,
-  duration,
-  guid,
-  played,
-  podcast_id
-FROM old_table;
-
-Drop table old_table;
-
-ALTER TABLE podcast RENAME TO old_table;
-CREATE TABLE `podcast` (
-  `id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT UNIQUE,
-  `title`	TEXT NOT NULL,
-  `link`	TEXT NOT NULL,
-  `description`	TEXT NOT NULL,
-  `image_uri`	TEXT,
-  `source_id`	INTEGER NOT NULL UNIQUE
-);
-
-INSERT INTO podcast (
-  id,
-  title,
-  link,
-  description,
-  image_uri,
-  source_id
-) SELECT id,
-  title,
-  link,
-  description,
-  image_uri,
-  source_id
-FROM old_table;
-
-Drop table old_table;

hammond-data/migrations/2018-06-30-150717_rename_tables/down.sql

@@ -1,40 +0,0 @@
-ALTER TABLE episodes RENAME TO old_table;
-ALTER TABLE shows RENAME TO podcast;
-
-CREATE TABLE episode (
-  title	TEXT NOT NULL,
-  uri	TEXT,
-  local_uri	TEXT,
-  description	TEXT,
-  epoch	INTEGER NOT NULL DEFAULT 0,
-  length	INTEGER,
-  duration	INTEGER,
-  guid	TEXT,
-  played	INTEGER,
-  podcast_id	INTEGER NOT NULL,
-  PRIMARY KEY (title, podcast_id)
-);
-
-INSERT INTO episode (
-  title,
-  uri,
-  local_uri,
-  description,
-  epoch,
-  length,
-  duration,
-  guid,
-  played,
-  podcast_id
-) SELECT title,
-  uri,
-  local_uri,
-  description,
-  epoch, length,
-  duration,
-  guid,
-  played,
-  show_id
-FROM old_table;
-
-Drop table old_table;

hammond-data/migrations/2018-06-30-150717_rename_tables/up.sql

@@ -1,40 +0,0 @@
-ALTER TABLE episode RENAME TO old_table;
-ALTER TABLE podcast RENAME TO shows;
-
-CREATE TABLE episodes (
-  title	TEXT NOT NULL,
-  uri	TEXT,
-  local_uri	TEXT,
-  description	TEXT,
-  epoch	INTEGER NOT NULL DEFAULT 0,
-  length	INTEGER,
-  duration	INTEGER,
-  guid	TEXT,
-  played	INTEGER,
-  show_id	INTEGER NOT NULL,
-  PRIMARY KEY (title, show_id)
-);
-
-INSERT INTO episodes (
-  title,
-  uri,
-  local_uri,
-  description,
-  epoch,
-  length,
-  duration,
-  guid,
-  played,
-  show_id
-) SELECT title,
-  uri,
-  local_uri,
-  description,
-  epoch, length,
-  duration,
-  guid,
-  played,
-  podcast_id
-FROM old_table;
-
-Drop table old_table;

hammond-data/src/database.rs

@@ -68,8 +68,8 @@ fn run_migration_on(connection: &SqliteConnection) -> Result<(), DataError> {
 pub fn truncate_db() -> Result<(), DataError> {
     let db = connection();
     let con = db.get()?;
-    con.execute("DELETE FROM episodes")?;
-    con.execute("DELETE FROM shows")?;
+    con.execute("DELETE FROM episode")?;
+    con.execute("DELETE FROM podcast")?;
     con.execute("DELETE FROM source")?;
     Ok(())
 }

hammond-data/src/dbqueries.rs

@@ -23,157 +23,169 @@ pub fn get_sources() -> Result<Vec<Source>, DataError> {
         .map_err(From::from)
 }
 
-pub fn get_podcasts() -> Result<Vec<Show>, DataError> {
-    use schema::shows::dsl::*;
+pub fn get_podcasts() -> Result<Vec<Podcast>, DataError> {
+    use schema::podcast::dsl::*;
     let db = connection();
     let con = db.get()?;
 
-    shows
+    podcast
         .order(title.asc())
-        .load::<Show>(&con)
+        .load::<Podcast>(&con)
         .map_err(From::from)
 }
 
-pub fn get_podcasts_filter(filter_ids: &[i32]) -> Result<Vec<Show>, DataError> {
-    use schema::shows::dsl::*;
+pub fn get_podcasts_filter(filter_ids: &[i32]) -> Result<Vec<Podcast>, DataError> {
+    use schema::podcast::dsl::*;
     let db = connection();
     let con = db.get()?;
 
-    shows
+    podcast
         .order(title.asc())
         .filter(id.ne_all(filter_ids))
-        .load::<Show>(&con)
+        .load::<Podcast>(&con)
         .map_err(From::from)
 }
 
 pub fn get_episodes() -> Result<Vec<Episode>, DataError> {
-    use schema::episodes::dsl::*;
+    use schema::episode::dsl::*;
     let db = connection();
     let con = db.get()?;
 
-    episodes
+    episode
         .order(epoch.desc())
         .load::<Episode>(&con)
         .map_err(From::from)
 }
 
-pub(crate) fn get_downloaded_episodes() -> Result<Vec<EpisodeCleanerModel>, DataError> {
-    use schema::episodes::dsl::*;
+pub(crate) fn get_downloaded_episodes() -> Result<Vec<EpisodeCleanerQuery>, DataError> {
+    use schema::episode::dsl::*;
     let db = connection();
     let con = db.get()?;
 
-    episodes
+    episode
         .select((rowid, local_uri, played))
         .filter(local_uri.is_not_null())
-        .load::<EpisodeCleanerModel>(&con)
+        .load::<EpisodeCleanerQuery>(&con)
         .map_err(From::from)
 }
 
 // pub(crate) fn get_played_episodes() -> Result<Vec<Episode>, DataError> {
-//     use schema::episodes::dsl::*;
+//     use schema::episode::dsl::*;
 
 //     let db = connection();
 //     let con = db.get()?;
-//     episodes
+//     episode
 //         .filter(played.is_not_null())
 //         .load::<Episode>(&con)
 //         .map_err(From::from)
 // }
 
-pub(crate) fn get_played_cleaner_episodes() -> Result<Vec<EpisodeCleanerModel>, DataError> {
-    use schema::episodes::dsl::*;
+pub(crate) fn get_played_cleaner_episodes() -> Result<Vec<EpisodeCleanerQuery>, DataError> {
+    use schema::episode::dsl::*;
     let db = connection();
     let con = db.get()?;
 
-    episodes
+    episode
         .select((rowid, local_uri, played))
         .filter(played.is_not_null())
-        .load::<EpisodeCleanerModel>(&con)
+        .load::<EpisodeCleanerQuery>(&con)
         .map_err(From::from)
 }
 
 pub fn get_episode_from_rowid(ep_id: i32) -> Result<Episode, DataError> {
-    use schema::episodes::dsl::*;
+    use schema::episode::dsl::*;
     let db = connection();
     let con = db.get()?;
 
-    episodes
+    episode
         .filter(rowid.eq(ep_id))
         .get_result::<Episode>(&con)
         .map_err(From::from)
 }
 
-pub fn get_episode_widget_from_rowid(ep_id: i32) -> Result<EpisodeWidgetModel, DataError> {
-    use schema::episodes::dsl::*;
+pub fn get_episode_widget_from_rowid(ep_id: i32) -> Result<EpisodeWidgetQuery, DataError> {
+    use schema::episode::dsl::*;
     let db = connection();
     let con = db.get()?;
 
-    episodes
+    episode
         .select((
-            rowid, title, uri, local_uri, epoch, length, duration, played, show_id,
+            rowid, title, uri, local_uri, epoch, length, duration, played, podcast_id,
         ))
         .filter(rowid.eq(ep_id))
-        .get_result::<EpisodeWidgetModel>(&con)
+        .get_result::<EpisodeWidgetQuery>(&con)
         .map_err(From::from)
 }
 
 pub fn get_episode_local_uri_from_id(ep_id: i32) -> Result<Option<String>, DataError> {
-    use schema::episodes::dsl::*;
+    use schema::episode::dsl::*;
     let db = connection();
     let con = db.get()?;
 
-    episodes
+    episode
         .filter(rowid.eq(ep_id))
         .select(local_uri)
         .get_result::<Option<String>>(&con)
         .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,
-) -> Result<Vec<EpisodeWidgetModel>, DataError> {
-    use schema::episodes::dsl::*;
+) -> Result<Vec<EpisodeWidgetQuery>, DataError> {
+    use schema::episode::dsl::*;
     let db = connection();
     let con = db.get()?;
     let columns = (
-        rowid, title, uri, local_uri, epoch, length, duration, played, show_id,
+        rowid, title, uri, local_uri, epoch, length, duration, played, podcast_id,
     );
 
-    episodes
+    episode
         .select(columns)
         .order(epoch.desc())
-        .filter(show_id.ne_all(filter_ids))
+        .filter(podcast_id.ne_all(filter_ids))
         .limit(i64::from(limit))
-        .load::<EpisodeWidgetModel>(&con)
+        .load::<EpisodeWidgetQuery>(&con)
         .map_err(From::from)
 }
 
-pub fn get_podcast_from_id(pid: i32) -> Result<Show, DataError> {
-    use schema::shows::dsl::*;
+pub fn get_podcast_from_id(pid: i32) -> Result<Podcast, DataError> {
+    use schema::podcast::dsl::*;
     let db = connection();
     let con = db.get()?;
 
-    shows
+    podcast
         .filter(id.eq(pid))
-        .get_result::<Show>(&con)
+        .get_result::<Podcast>(&con)
         .map_err(From::from)
 }
 
-pub fn get_podcast_cover_from_id(pid: i32) -> Result<ShowCoverModel, DataError> {
-    use schema::shows::dsl::*;
+pub fn get_podcast_cover_from_id(pid: i32) -> Result<PodcastCoverQuery, DataError> {
+    use schema::podcast::dsl::*;
     let db = connection();
     let con = db.get()?;
 
-    shows
+    podcast
         .select((id, title, image_uri))
         .filter(id.eq(pid))
-        .get_result::<ShowCoverModel>(&con)
+        .get_result::<PodcastCoverQuery>(&con)
         .map_err(From::from)
 }
 
-pub fn get_pd_episodes(parent: &Show) -> Result<Vec<Episode>, DataError> {
-    use schema::episodes::dsl::*;
+pub fn get_pd_episodes(parent: &Podcast) -> Result<Vec<Episode>, DataError> {
+    use schema::episode::dsl::*;
     let db = connection();
     let con = db.get()?;
 
@@ -183,7 +195,7 @@ pub fn get_pd_episodes(parent: &Show) -> Result<Vec<Episode>, DataError> {
         .map_err(From::from)
 }
 
-pub fn get_pd_episodes_count(parent: &Show) -> Result<i64, DataError> {
+pub fn get_pd_episodes_count(parent: &Podcast) -> Result<i64, DataError> {
     let db = connection();
     let con = db.get()?;
 
@@ -193,24 +205,24 @@ pub fn get_pd_episodes_count(parent: &Show) -> Result<i64, DataError> {
         .map_err(From::from)
 }
 
-pub fn get_pd_episodeswidgets(parent: &Show) -> Result<Vec<EpisodeWidgetModel>, DataError> {
-    use schema::episodes::dsl::*;
+pub fn get_pd_episodeswidgets(parent: &Podcast) -> Result<Vec<EpisodeWidgetQuery>, DataError> {
+    use schema::episode::dsl::*;
     let db = connection();
     let con = db.get()?;
     let columns = (
-        rowid, title, uri, local_uri, epoch, length, duration, played, show_id,
+        rowid, title, uri, local_uri, epoch, length, duration, played, podcast_id,
     );
 
-    episodes
+    episode
         .select(columns)
-        .filter(show_id.eq(parent.id()))
+        .filter(podcast_id.eq(parent.id()))
         .order(epoch.desc())
-        .load::<EpisodeWidgetModel>(&con)
+        .load::<EpisodeWidgetQuery>(&con)
         .map_err(From::from)
 }
 
-pub fn get_pd_unplayed_episodes(parent: &Show) -> Result<Vec<Episode>, DataError> {
-    use schema::episodes::dsl::*;
+pub fn get_pd_unplayed_episodes(parent: &Podcast) -> Result<Vec<Episode>, DataError> {
+    use schema::episode::dsl::*;
     let db = connection();
     let con = db.get()?;
 
@@ -221,8 +233,8 @@ pub fn get_pd_unplayed_episodes(parent: &Show) -> Result<Vec<Episode>, DataError
         .map_err(From::from)
 }
 
-// pub(crate) fn get_pd_episodes_limit(parent: &Show, limit: u32) ->
-// Result<Vec<Episode>, DataError> {     use schema::episodes::dsl::*;
+// pub(crate) fn get_pd_episodes_limit(parent: &Podcast, limit: u32) ->
+// Result<Vec<Episode>, DataError> {     use schema::episode::dsl::*;
 
 //     let db = connection();
 //     let con = db.get()?;
@@ -256,25 +268,25 @@ pub fn get_source_from_id(id_: i32) -> Result<Source, DataError> {
         .map_err(From::from)
 }
 
-pub fn get_podcast_from_source_id(sid: i32) -> Result<Show, DataError> {
-    use schema::shows::dsl::*;
+pub fn get_podcast_from_source_id(sid: i32) -> Result<Podcast, DataError> {
+    use schema::podcast::dsl::*;
     let db = connection();
     let con = db.get()?;
 
-    shows
+    podcast
         .filter(source_id.eq(sid))
-        .get_result::<Show>(&con)
+        .get_result::<Podcast>(&con)
         .map_err(From::from)
 }
 
 pub fn get_episode_from_pk(title_: &str, pid: i32) -> Result<Episode, DataError> {
-    use schema::episodes::dsl::*;
+    use schema::episode::dsl::*;
     let db = connection();
     let con = db.get()?;
 
-    episodes
+    episode
         .filter(title.eq(title_))
-        .filter(show_id.eq(pid))
+        .filter(podcast_id.eq(pid))
         .get_result::<Episode>(&con)
         .map_err(From::from)
 }
@@ -283,19 +295,19 @@ pub(crate) fn get_episode_minimal_from_pk(
     title_: &str,
     pid: i32,
 ) -> Result<EpisodeMinimal, DataError> {
-    use schema::episodes::dsl::*;
+    use schema::episode::dsl::*;
     let db = connection();
     let con = db.get()?;
 
-    episodes
-        .select((rowid, title, uri, epoch, length, duration, guid, show_id))
+    episode
+        .select((rowid, title, uri, epoch, duration, guid, podcast_id))
         .filter(title.eq(title_))
-        .filter(show_id.eq(pid))
+        .filter(podcast_id.eq(pid))
         .get_result::<EpisodeMinimal>(&con)
         .map_err(From::from)
 }
 
-pub(crate) fn remove_feed(pd: &Show) -> Result<(), DataError> {
+pub(crate) fn remove_feed(pd: &Podcast) -> Result<(), DataError> {
     let db = connection();
     let con = db.get()?;
 
@@ -314,16 +326,16 @@ fn delete_source(con: &SqliteConnection, source_id: i32) -> QueryResult<usize> {
     diesel::delete(source.filter(id.eq(source_id))).execute(con)
 }
 
-fn delete_podcast(con: &SqliteConnection, show_id: i32) -> QueryResult<usize> {
-    use schema::shows::dsl::*;
+fn delete_podcast(con: &SqliteConnection, podcast_id: i32) -> QueryResult<usize> {
+    use schema::podcast::dsl::*;
 
-    diesel::delete(shows.filter(id.eq(show_id))).execute(con)
+    diesel::delete(podcast.filter(id.eq(podcast_id))).execute(con)
 }
 
 fn delete_podcast_episodes(con: &SqliteConnection, parent_id: i32) -> QueryResult<usize> {
-    use schema::episodes::dsl::*;
+    use schema::episode::dsl::*;
 
-    diesel::delete(episodes.filter(show_id.eq(parent_id))).execute(con)
+    diesel::delete(episode.filter(podcast_id.eq(parent_id))).execute(con)
 }
 
 pub fn source_exists(url: &str) -> Result<bool, DataError> {
@@ -338,70 +350,81 @@ pub fn source_exists(url: &str) -> Result<bool, DataError> {
 }
 
 pub(crate) fn podcast_exists(source_id_: i32) -> Result<bool, DataError> {
-    use schema::shows::dsl::*;
+    use schema::podcast::dsl::*;
 
     let db = connection();
     let con = db.get()?;
 
-    select(exists(shows.filter(source_id.eq(source_id_))))
+    select(exists(podcast.filter(source_id.eq(source_id_))))
         .get_result(&con)
         .map_err(From::from)
 }
 
 #[cfg_attr(rustfmt, rustfmt_skip)]
-pub(crate) fn episode_exists(title_: &str, show_id_: i32) -> Result<bool, DataError> {
-    use schema::episodes::dsl::*;
+pub(crate) fn episode_exists(title_: &str, podcast_id_: i32) -> Result<bool, DataError> {
+    use schema::episode::dsl::*;
 
     let db = connection();
     let con = db.get()?;
 
-    select(exists(episodes.filter(show_id.eq(show_id_)).filter(title.eq(title_))))
+    select(exists(episode.filter(podcast_id.eq(podcast_id_)).filter(title.eq(title_))))
         .get_result(&con)
         .map_err(From::from)
 }
 
-/// Check if the `episodes 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 `episodes` table is populated.
+/// Return true if `episode` table is populated.
 pub fn is_episodes_populated() -> Result<bool, DataError> {
-    use schema::episodes::dsl::*;
+    use schema::episode::dsl::*;
 
     let db = connection();
     let con = db.get()?;
 
-    select(exists(episodes.as_query()))
+    select(exists(episode.as_query()))
         .get_result(&con)
         .map_err(From::from)
 }
 
-/// Check if the `shows` table contains any rows
+/// Check if the `podcast` table contains any rows
 ///
-/// Return true if `shows table is populated.
+/// Return true if `podcast table is populated.
 pub fn is_podcasts_populated(filter_ids: &[i32]) -> Result<bool, DataError> {
-    use schema::shows::dsl::*;
+    use schema::podcast::dsl::*;
 
     let db = connection();
     let con = db.get()?;
 
-    select(exists(shows.filter(id.ne_all(filter_ids))))
+    select(exists(podcast.filter(id.ne_all(filter_ids))))
         .get_result(&con)
         .map_err(From::from)
 }
 
 pub(crate) fn index_new_episodes(eps: &[NewEpisode]) -> Result<(), DataError> {
-    use schema::episodes::dsl::*;
+    use schema::episode::dsl::*;
     let db = connection();
     let con = db.get()?;
 
-    diesel::insert_into(episodes)
+    diesel::insert_into(episode)
         .values(eps)
         .execute(&*con)
         .map_err(From::from)
         .map(|_| ())
 }
 
-pub fn update_none_to_played_now(parent: &Show) -> Result<usize, DataError> {
-    use schema::episodes::dsl::*;
+pub fn update_none_to_played_now(parent: &Podcast) -> Result<usize, DataError> {
+    use schema::episode::dsl::*;
     let db = connection();
     let con = db.get()?;
 

hammond-data/src/feed.rs

@@ -9,7 +9,7 @@ use rss;
 use dbqueries;
 use errors::DataError;
 use models::{Index, IndexState, Update};
-use models::{NewEpisode, NewEpisodeMinimal, NewShow, Show};
+use models::{NewEpisode, NewEpisodeMinimal, NewPodcast, Podcast};
 
 /// Wrapper struct that hold a `Source` id and the `rss::Channel`
 /// that corresponds to the `Source.uri` field.
@@ -31,15 +31,15 @@ impl Feed {
             .and_then(move |pd| self.index_channel_items(pd))
     }
 
-    fn parse_podcast(&self) -> NewShow {
-        NewShow::new(&self.channel, self.source_id)
+    fn parse_podcast(&self) -> NewPodcast {
+        NewPodcast::new(&self.channel, self.source_id)
     }
 
-    fn parse_podcast_async(&self) -> impl Future<Item = NewShow, Error = DataError> + Send {
+    fn parse_podcast_async(&self) -> impl Future<Item = NewPodcast, Error = DataError> + Send {
         ok(self.parse_podcast())
     }
 
-    fn index_channel_items(self, pd: Show) -> impl 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
@@ -65,12 +65,12 @@ fn determine_ep_state(
     item: &rss::Item,
 ) -> Result<IndexState<NewEpisode>, DataError> {
     // Check if feed exists
-    let exists = dbqueries::episode_exists(ep.title(), ep.show_id())?;
+    let exists = dbqueries::episode_exists(ep.title(), ep.podcast_id())?;
 
     if !exists {
         Ok(IndexState::Index(ep.into_new_episode(item)))
     } else {
-        let old = dbqueries::get_episode_minimal_from_pk(ep.title(), ep.show_id())?;
+        let old = dbqueries::get_episode_minimal_from_pk(ep.title(), ep.podcast_id())?;
         let rowid = old.rowid();
 
         if ep != old {
@@ -204,7 +204,7 @@ mod tests {
         let file = fs::File::open(path).unwrap();
         let channel = Channel::read_from(BufReader::new(file)).unwrap();
 
-        let pd = NewShow::new(&channel, 42);
+        let pd = NewPodcast::new(&channel, 42);
         assert_eq!(feed.parse_podcast(), pd);
     }
 

hammond-data/src/lib.rs

@@ -10,21 +10,17 @@
         items_after_statements, used_underscore_binding
     )
 )]
-// Enable lint group collections
-#![warn(nonstandard_style, edition_2018, rust_2018_idioms, bad_style, unused)]
-// standalone lints
 #![warn(
-    const_err, improper_ctypes, non_shorthand_field_patterns, no_mangle_generic_items,
-    overflowing_literals, plugin_as_library, private_no_mangle_fns, private_no_mangle_statics,
-    unconditional_recursion, unions_with_drop_fields, while_true, missing_debug_implementations,
-    missing_docs, trivial_casts, trivial_numeric_casts, elided_lifetime_in_paths,
-    missing_copy_implementations
+    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,
+    missing_debug_implementations, missing_docs, trivial_casts, trivial_numeric_casts,
+    unused_extern_crates, unused
 )]
 #![deny(warnings)]
 
-// warn when code is not using dyn Trait syntax. req rustc 1.27
-// #![deny(bare_trait_object)]
-
 //! FIXME: Docs
 
 #[cfg(test)]
@@ -81,13 +77,11 @@ pub mod utils;
 
 pub use feed::{Feed, FeedBuilder};
 pub use models::Save;
-pub use models::{Episode, EpisodeWidgetModel, Show, ShowCoverModel, Source};
+pub use models::{Episode, EpisodeWidgetQuery, Podcast, PodcastCoverQuery, Source};
 
 // Set the user agent, See #53 for more
 // Keep this in sync with Tor-browser releases
-/// The user-agent to be used for all the requests.
-/// It originates from the Tor-browser UA.
-pub const USER_AGENT: &str = "Mozilla/5.0 (Windows NT 6.1; rv:52.0) Gecko/20100101 Firefox/52.0";
+const USER_AGENT: &str = "Mozilla/5.0 (Windows NT 6.1; rv:52.0) Gecko/20100101 Firefox/52.0";
 
 /// [XDG Base Direcotory](https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html) Paths.
 #[allow(missing_debug_implementations)]

hammond-data/src/models/episode.rs

@@ -5,14 +5,14 @@ use diesel::SaveChangesDsl;
 
 use database::connection;
 use errors::DataError;
-use models::{Save, Show};
-use schema::episodes;
+use models::{Podcast, Save};
+use schema::episode;
 
 #[derive(Queryable, Identifiable, AsChangeset, Associations, PartialEq)]
-#[table_name = "episodes"]
+#[table_name = "episode"]
 #[changeset_options(treat_none_as_null = "true")]
-#[primary_key(title, show_id)]
-#[belongs_to(Show, foreign_key = "show_id")]
+#[primary_key(title, podcast_id)]
+#[belongs_to(Podcast, foreign_key = "podcast_id")]
 #[derive(Debug, Clone)]
 /// Diesel Model of the episode table.
 pub struct Episode {
@@ -26,7 +26,9 @@ pub struct Episode {
     duration: Option<i32>,
     guid: Option<String>,
     played: Option<i32>,
-    show_id: i32,
+    favorite: bool,
+    archive: bool,
+    podcast_id: i32,
 }
 
 impl Save<Episode> for Episode {
@@ -152,9 +154,32 @@ impl Episode {
         self.played = value;
     }
 
-    /// `Show` table foreign key.
-    pub fn show_id(&self) -> i32 {
-        self.show_id
+    /// Represents the archiving policy for the episode.
+    pub fn archive(&self) -> bool {
+        self.archive
+    }
+
+    /// Set the `archive` policy.
+    ///
+    /// If true, the download cleanr will ignore the episode
+    /// and the corresponding media value will never be automaticly deleted.
+    pub fn set_archive(&mut self, b: bool) {
+        self.archive = b
+    }
+
+    /// Get the `favorite` status of the `Episode`.
+    pub fn favorite(&self) -> bool {
+        self.favorite
+    }
+
+    /// Set `favorite` status.
+    pub fn set_favorite(&mut self, b: bool) {
+        self.favorite = b
+    }
+
+    /// `Podcast` table foreign key.
+    pub fn podcast_id(&self) -> i32 {
+        self.podcast_id
     }
 
     /// Sets the `played` value with the current `epoch` timestap and save it.
@@ -166,12 +191,12 @@ impl Episode {
 }
 
 #[derive(Queryable, AsChangeset, PartialEq)]
-#[table_name = "episodes"]
+#[table_name = "episode"]
 #[changeset_options(treat_none_as_null = "true")]
-#[primary_key(title, show_id)]
+#[primary_key(title, podcast_id)]
 #[derive(Debug, Clone)]
 /// Diesel Model to be used for constructing `EpisodeWidgets`.
-pub struct EpisodeWidgetModel {
+pub struct EpisodeWidgetQuery {
     rowid: i32,
     title: String,
     uri: Option<String>,
@@ -180,12 +205,14 @@ pub struct EpisodeWidgetModel {
     length: Option<i32>,
     duration: Option<i32>,
     played: Option<i32>,
-    show_id: i32,
+    // favorite: bool,
+    // archive: bool,
+    podcast_id: i32,
 }
 
-impl From<Episode> for EpisodeWidgetModel {
-    fn from(e: Episode) -> EpisodeWidgetModel {
-        EpisodeWidgetModel {
+impl From<Episode> for EpisodeWidgetQuery {
+    fn from(e: Episode) -> EpisodeWidgetQuery {
+        EpisodeWidgetQuery {
             rowid: e.rowid,
             title: e.title,
             uri: e.uri,
@@ -194,30 +221,30 @@ impl From<Episode> for EpisodeWidgetModel {
             length: e.length,
             duration: e.duration,
             played: e.played,
-            show_id: e.show_id,
+            podcast_id: e.podcast_id,
         }
     }
 }
 
-impl Save<usize> for EpisodeWidgetModel {
+impl Save<usize> for EpisodeWidgetQuery {
     type Error = DataError;
 
     /// Helper method to easily save/"sync" current state of self to the
     /// Database.
     fn save(&self) -> Result<usize, Self::Error> {
-        use schema::episodes::dsl::*;
+        use schema::episode::dsl::*;
 
         let db = connection();
         let tempdb = db.get()?;
 
-        diesel::update(episodes.filter(rowid.eq(self.rowid)))
+        diesel::update(episode.filter(rowid.eq(self.rowid)))
             .set(self)
             .execute(&*tempdb)
             .map_err(From::from)
     }
 }
 
-impl EpisodeWidgetModel {
+impl EpisodeWidgetQuery {
     /// Get the value of the sqlite's `ROW_ID`
     pub fn rowid(&self) -> i32 {
         self.rowid
@@ -292,9 +319,32 @@ impl EpisodeWidgetModel {
         self.played = value;
     }
 
-    /// `Show` table foreign key.
-    pub fn show_id(&self) -> i32 {
-        self.show_id
+    // /// Represents the archiving policy for the episode.
+    // pub fn archive(&self) -> bool {
+    //     self.archive
+    // }
+
+    // /// Set the `archive` policy.
+    // ///
+    // /// If true, the download cleanr will ignore the episode
+    // /// and the corresponding media value will never be automaticly deleted.
+    // pub fn set_archive(&mut self, b: bool) {
+    //     self.archive = b
+    // }
+
+    // /// Get the `favorite` status of the `Episode`.
+    // pub fn favorite(&self) -> bool {
+    //     self.favorite
+    // }
+
+    // /// Set `favorite` status.
+    // pub fn set_favorite(&mut self, b: bool) {
+    //     self.favorite = b
+    // }
+
+    /// `Podcast` table foreign key.
+    pub fn podcast_id(&self) -> i32 {
+        self.podcast_id
     }
 
     /// Sets the `played` value with the current `epoch` timestap and save it.
@@ -306,38 +356,38 @@ impl EpisodeWidgetModel {
 }
 
 #[derive(Queryable, AsChangeset, PartialEq)]
-#[table_name = "episodes"]
+#[table_name = "episode"]
 #[changeset_options(treat_none_as_null = "true")]
-#[primary_key(title, show_id)]
+#[primary_key(title, podcast_id)]
 #[derive(Debug, Clone)]
 /// Diesel Model to be used internal with the `utils::checkup` function.
-pub struct EpisodeCleanerModel {
+pub struct EpisodeCleanerQuery {
     rowid: i32,
     local_uri: Option<String>,
     played: Option<i32>,
 }
 
-impl Save<usize> for EpisodeCleanerModel {
+impl Save<usize> for EpisodeCleanerQuery {
     type Error = DataError;
 
     /// Helper method to easily save/"sync" current state of self to the
     /// Database.
     fn save(&self) -> Result<usize, Self::Error> {
-        use schema::episodes::dsl::*;
+        use schema::episode::dsl::*;
 
         let db = connection();
         let tempdb = db.get()?;
 
-        diesel::update(episodes.filter(rowid.eq(self.rowid)))
+        diesel::update(episode.filter(rowid.eq(self.rowid)))
             .set(self)
             .execute(&*tempdb)
             .map_err(From::from)
     }
 }
 
-impl From<Episode> for EpisodeCleanerModel {
-    fn from(e: Episode) -> EpisodeCleanerModel {
-        EpisodeCleanerModel {
+impl From<Episode> for EpisodeCleanerQuery {
+    fn from(e: Episode) -> EpisodeCleanerQuery {
+        EpisodeCleanerQuery {
             rowid: e.rowid(),
             local_uri: e.local_uri,
             played: e.played,
@@ -345,7 +395,7 @@ impl From<Episode> for EpisodeCleanerModel {
     }
 }
 
-impl EpisodeCleanerModel {
+impl EpisodeCleanerQuery {
     /// Get the value of the sqlite's `ROW_ID`
     pub fn rowid(&self) -> i32 {
         self.rowid
@@ -378,9 +428,9 @@ impl EpisodeCleanerModel {
 }
 
 #[derive(Queryable, AsChangeset, PartialEq)]
-#[table_name = "episodes"]
+#[table_name = "episode"]
 #[changeset_options(treat_none_as_null = "true")]
-#[primary_key(title, show_id)]
+#[primary_key(title, podcast_id)]
 #[derive(Debug, Clone)]
 /// Diesel Model to be used for FIXME.
 pub struct EpisodeMinimal {
@@ -388,10 +438,9 @@ pub struct EpisodeMinimal {
     title: String,
     uri: Option<String>,
     epoch: i32,
-    length: Option<i32>,
     duration: Option<i32>,
     guid: Option<String>,
-    show_id: i32,
+    podcast_id: i32,
 }
 
 impl From<Episode> for EpisodeMinimal {
@@ -400,11 +449,10 @@ impl From<Episode> for EpisodeMinimal {
             rowid: e.rowid,
             title: e.title,
             uri: e.uri,
-            length: e.length,
             guid: e.guid,
             epoch: e.epoch,
             duration: e.duration,
-            show_id: e.show_id,
+            podcast_id: e.podcast_id,
         }
     }
 }
@@ -440,18 +488,6 @@ impl EpisodeMinimal {
         self.epoch
     }
 
-    /// Get the `length`.
-    ///
-    /// The number represents the size of the file in bytes.
-    pub fn length(&self) -> Option<i32> {
-        self.length
-    }
-
-    /// Set the `length`.
-    pub fn set_length(&mut self, value: Option<i32>) {
-        self.length = value;
-    }
-
     /// Get the `duration` value.
     ///
     /// The number represents the duration of the item/episode in seconds.
@@ -459,8 +495,8 @@ impl EpisodeMinimal {
         self.duration
     }
 
-    /// `Show` table foreign key.
-    pub fn show_id(&self) -> i32 {
-        self.show_id
+    /// `Podcast` table foreign key.
+    pub fn podcast_id(&self) -> i32 {
+        self.podcast_id
     }
 }

hammond-data/src/models/mod.rs

@@ -1,26 +1,26 @@
 mod new_episode;
-mod new_show;
+mod new_podcast;
 mod new_source;
 
 mod episode;
-mod show;
+mod podcast;
 mod source;
 
 // use futures::prelude::*;
 // use futures::future::*;
 
-pub(crate) use self::episode::EpisodeCleanerModel;
+pub(crate) use self::episode::EpisodeCleanerQuery;
 pub(crate) use self::new_episode::{NewEpisode, NewEpisodeMinimal};
-pub(crate) use self::new_show::NewShow;
+pub(crate) use self::new_podcast::NewPodcast;
 pub(crate) use self::new_source::NewSource;
 
 #[cfg(test)]
 pub(crate) use self::new_episode::NewEpisodeBuilder;
 #[cfg(test)]
-pub(crate) use self::new_show::NewShowBuilder;
+pub(crate) use self::new_podcast::NewPodcastBuilder;
 
-pub use self::episode::{Episode, EpisodeMinimal, EpisodeWidgetModel};
-pub use self::show::{Show, ShowCoverModel};
+pub use self::episode::{Episode, EpisodeMinimal, EpisodeWidgetQuery};
+pub use self::podcast::{Podcast, PodcastCoverQuery};
 pub use self::source::Source;
 
 #[derive(Debug, Clone, PartialEq)]

hammond-data/src/models/new_episode.rs

@@ -9,11 +9,11 @@ use dbqueries;
 use errors::DataError;
 use models::{Episode, EpisodeMinimal, Index, Insert, Update};
 use parser;
-use schema::episodes;
+use schema::episode;
 use utils::url_cleaner;
 
 #[derive(Insertable, AsChangeset)]
-#[table_name = "episodes"]
+#[table_name = "episode"]
 #[derive(Debug, Clone, Default, Builder, PartialEq)]
 #[builder(default)]
 #[builder(derive(Debug))]
@@ -26,7 +26,7 @@ pub(crate) struct NewEpisode {
     duration: Option<i32>,
     guid: Option<String>,
     epoch: i32,
-    show_id: i32,
+    podcast_id: i32,
 }
 
 impl From<NewEpisodeMinimal> for NewEpisode {
@@ -36,7 +36,7 @@ impl From<NewEpisodeMinimal> for NewEpisode {
             .uri(e.uri)
             .duration(e.duration)
             .epoch(e.epoch)
-            .show_id(e.show_id)
+            .podcast_id(e.podcast_id)
             .guid(e.guid)
             .build()
             .unwrap()
@@ -47,12 +47,12 @@ impl Insert<()> for NewEpisode {
     type Error = DataError;
 
     fn insert(&self) -> Result<(), DataError> {
-        use schema::episodes::dsl::*;
+        use schema::episode::dsl::*;
         let db = connection();
         let con = db.get()?;
 
         info!("Inserting {:?}", self.title);
-        diesel::insert_into(episodes)
+        diesel::insert_into(episode)
             .values(self)
             .execute(&con)
             .map_err(From::from)
@@ -64,12 +64,12 @@ impl Update<()> for NewEpisode {
     type Error = DataError;
 
     fn update(&self, episode_id: i32) -> Result<(), DataError> {
-        use schema::episodes::dsl::*;
+        use schema::episode::dsl::*;
         let db = connection();
         let con = db.get()?;
 
         info!("Updating {:?}", self.title);
-        diesel::update(episodes.filter(rowid.eq(episode_id)))
+        diesel::update(episode.filter(rowid.eq(episode_id)))
             .set(self)
             .execute(&con)
             .map_err(From::from)
@@ -83,10 +83,10 @@ impl Index<()> for NewEpisode {
     // Does not update the episode description if it's the only thing that has
     // changed.
     fn index(&self) -> Result<(), DataError> {
-        let exists = dbqueries::episode_exists(self.title(), self.show_id())?;
+        let exists = dbqueries::episode_exists(self.title(), self.podcast_id())?;
 
         if exists {
-            let other = dbqueries::get_episode_minimal_from_pk(self.title(), self.show_id())?;
+            let other = dbqueries::get_episode_minimal_from_pk(self.title(), self.podcast_id())?;
 
             if self != &other {
                 self.update(other.rowid())
@@ -106,7 +106,7 @@ impl PartialEq<EpisodeMinimal> for NewEpisode {
             && (self.duration() == other.duration())
             && (self.epoch() == other.epoch())
             && (self.guid() == other.guid())
-            && (self.show_id() == other.show_id())
+            && (self.podcast_id() == other.podcast_id())
     }
 }
 
@@ -117,7 +117,7 @@ impl PartialEq<Episode> for NewEpisode {
             && (self.duration() == other.duration())
             && (self.epoch() == other.epoch())
             && (self.guid() == other.guid())
-            && (self.show_id() == other.show_id())
+            && (self.podcast_id() == other.podcast_id())
             && (self.description() == other.description())
             && (self.length() == other.length())
     }
@@ -126,14 +126,14 @@ impl PartialEq<Episode> for NewEpisode {
 impl NewEpisode {
     /// Parses an `rss::Item` into a `NewEpisode` Struct.
     #[allow(dead_code)]
-    pub(crate) fn new(item: &rss::Item, show_id: i32) -> Result<Self, DataError> {
-        NewEpisodeMinimal::new(item, show_id).map(|ep| ep.into_new_episode(item))
+    pub(crate) fn new(item: &rss::Item, podcast_id: i32) -> Result<Self, DataError> {
+        NewEpisodeMinimal::new(item, podcast_id).map(|ep| ep.into_new_episode(item))
     }
 
     #[allow(dead_code)]
     pub(crate) fn to_episode(&self) -> Result<Episode, DataError> {
         self.index()?;
-        dbqueries::get_episode_from_pk(&self.title, self.show_id).map_err(From::from)
+        dbqueries::get_episode_from_pk(&self.title, self.podcast_id).map_err(From::from)
     }
 }
 
@@ -167,24 +167,23 @@ impl NewEpisode {
         self.length
     }
 
-    pub(crate) fn show_id(&self) -> i32 {
-        self.show_id
+    pub(crate) fn podcast_id(&self) -> i32 {
+        self.podcast_id
     }
 }
 
 #[derive(Insertable, AsChangeset)]
-#[table_name = "episodes"]
+#[table_name = "episode"]
 #[derive(Debug, Clone, Builder, PartialEq)]
 #[builder(derive(Debug))]
 #[builder(setter(into))]
 pub(crate) struct NewEpisodeMinimal {
     title: String,
     uri: Option<String>,
-    length: Option<i32>,
     duration: Option<i32>,
     epoch: i32,
     guid: Option<String>,
-    show_id: i32,
+    podcast_id: i32,
 }
 
 impl PartialEq<EpisodeMinimal> for NewEpisodeMinimal {
@@ -194,7 +193,7 @@ impl PartialEq<EpisodeMinimal> for NewEpisodeMinimal {
             && (self.duration() == other.duration())
             && (self.epoch() == other.epoch())
             && (self.guid() == other.guid())
-            && (self.show_id() == other.show_id())
+            && (self.podcast_id() == other.podcast_id())
     }
 }
 
@@ -212,19 +211,12 @@ impl NewEpisodeMinimal {
         let title = item.title().unwrap().trim().to_owned();
         let guid = item.guid().map(|s| s.value().trim().to_owned());
 
-        // Get the mime type, the `http` url and the length from the enclosure
-        // http://www.rssboard.org/rss-specification#ltenclosuregtSubelementOfLtitemgt
-        let enc = item.enclosure();
-
-        // Get the url
-        let uri = enc.map(|s| url_cleaner(s.url().trim()))
+        let uri = item.enclosure()
+            .map(|s| url_cleaner(s.url().trim()))
             // Fallback to Rss.Item.link if enclosure is None.
             .or_else(|| item.link().map(|s| url_cleaner(s.trim())));
 
-        // Get the size of the content, it should be in bytes
-        let length = enc.and_then(|x| x.length().parse().ok());
-
-        // If url is still None return an Error as this behaviour is not
+        // If url is still None return an Error as this behaviour is
         // compliant with the RSS Spec.
         if uri.is_none() {
             let err = DataError::ParseEpisodeError {
@@ -246,18 +238,17 @@ impl NewEpisodeMinimal {
         NewEpisodeMinimalBuilder::default()
             .title(title)
             .uri(uri)
-            .length(length)
             .duration(duration)
             .epoch(epoch)
             .guid(guid)
-            .show_id(parent_id)
+            .podcast_id(parent_id)
             .build()
             .map_err(From::from)
     }
 
     // TODO: TryInto is stabilizing in rustc v1.26!
-    // ^ Jokes on you past self!
     pub(crate) fn into_new_episode(self, item: &rss::Item) -> NewEpisode {
+        let length = item.enclosure().and_then(|x| x.length().parse().ok());
         let description = item.description().and_then(|s| {
             let sanitized_html = ammonia::Builder::new()
                 // Remove `rel` attributes from `<a>` tags
@@ -272,9 +263,9 @@ impl NewEpisodeMinimal {
             .uri(self.uri)
             .duration(self.duration)
             .epoch(self.epoch)
-            .show_id(self.show_id)
+            .podcast_id(self.podcast_id)
             .guid(self.guid)
-            .length(self.length)
+            .length(length)
             .description(description)
             .build()
             .unwrap()
@@ -303,11 +294,10 @@ impl NewEpisodeMinimal {
         self.epoch
     }
 
-    pub(crate) fn show_id(&self) -> i32 {
-        self.show_id
+    pub(crate) fn podcast_id(&self) -> i32 {
+        self.podcast_id
     }
 }
-
 #[cfg(test)]
 mod tests {
     use database::truncate_db;
@@ -333,9 +323,8 @@ mod tests {
                 )))
                 .guid(Some(String::from("7df4070a-9832-11e7-adac-cb37b05d5e24")))
                 .epoch(1505296800)
-                .length(Some(66738886))
                 .duration(Some(4171))
-                .show_id(42)
+                .podcast_id(42)
                 .build()
                 .unwrap()
         };
@@ -347,9 +336,8 @@ mod tests {
                 )))
                 .guid(Some(String::from("7c207a24-e33f-11e6-9438-eb45dcf36a1d")))
                 .epoch(1502272800)
-                .length(Some(67527575))
                 .duration(Some(4415))
-                .show_id(42)
+                .podcast_id(42)
                 .build()
                 .unwrap()
         };
@@ -370,7 +358,7 @@ mod tests {
                 .length(Some(66738886))
                 .epoch(1505296800)
                 .duration(Some(4171))
-                .show_id(42)
+                .podcast_id(42)
                 .build()
                 .unwrap()
         };
@@ -394,7 +382,7 @@ mod tests {
                 .length(Some(67527575))
                 .epoch(1502272800)
                 .duration(Some(4415))
-                .show_id(42)
+                .podcast_id(42)
                 .build()
                 .unwrap()
         };
@@ -409,7 +397,7 @@ mod tests {
                 .length(Some(66738886))
                 .epoch(1505296800)
                 .duration(Some(424242))
-                .show_id(42)
+                .podcast_id(42)
                 .build()
                 .unwrap()
         };
@@ -420,10 +408,9 @@ mod tests {
                     "http://www.podtrac.com/pts/redirect.mp3/traffic.libsyn.com/jnite/lup-0214.mp3",
                 )))
                 .guid(Some(String::from("78A682B4-73E8-47B8-88C0-1BE62DD4EF9D")))
-                .length(Some(46479789))
                 .epoch(1505280282)
                 .duration(Some(5733))
-                .show_id(42)
+                .podcast_id(42)
                 .build()
                 .unwrap()
         };
@@ -435,9 +422,8 @@ mod tests {
                 )))
                 .guid(Some(String::from("1CE57548-B36C-4F14-832A-5D5E0A24E35B")))
                 .epoch(1504670247)
-                .length(Some(36544272))
                 .duration(Some(4491))
-                .show_id(42)
+                .podcast_id(42)
                 .build()
                 .unwrap()
         };
@@ -457,7 +443,7 @@ mod tests {
                 .length(Some(46479789))
                 .epoch(1505280282)
                 .duration(Some(5733))
-                .show_id(42)
+                .podcast_id(42)
                 .build()
                 .unwrap()
         };
@@ -479,7 +465,7 @@ mod tests {
                 .length(Some(36544272))
                 .epoch(1504670247)
                 .duration(Some(4491))
-                .show_id(42)
+                .podcast_id(42)
                 .build()
                 .unwrap()
         };
@@ -553,10 +539,6 @@ mod tests {
         let ep = EXPECTED_MINIMAL_INTERCEPTED_1
             .clone()
             .into_new_episode(&item);
-        println!(
-            "EPISODE: {:#?}\nEXPECTED: {:#?}",
-            ep, *EXPECTED_INTERCEPTED_1
-        );
         assert_eq!(ep, *EXPECTED_INTERCEPTED_1);
 
         let item = channel.items().iter().nth(15).unwrap();
@@ -576,7 +558,7 @@ mod tests {
         let episode = channel.items().iter().nth(14).unwrap();
         let new_ep = NewEpisode::new(&episode, 42).unwrap();
         new_ep.insert().unwrap();
-        let ep = dbqueries::get_episode_from_pk(new_ep.title(), new_ep.show_id()).unwrap();
+        let ep = dbqueries::get_episode_from_pk(new_ep.title(), new_ep.podcast_id()).unwrap();
 
         assert_eq!(new_ep, ep);
         assert_eq!(&new_ep, &*EXPECTED_INTERCEPTED_1);
@@ -585,7 +567,7 @@ mod tests {
         let episode = channel.items().iter().nth(15).unwrap();
         let new_ep = NewEpisode::new(&episode, 42).unwrap();
         new_ep.insert().unwrap();
-        let ep = dbqueries::get_episode_from_pk(new_ep.title(), new_ep.show_id()).unwrap();
+        let ep = dbqueries::get_episode_from_pk(new_ep.title(), new_ep.podcast_id()).unwrap();
 
         assert_eq!(new_ep, ep);
         assert_eq!(&new_ep, &*EXPECTED_INTERCEPTED_2);
@@ -599,15 +581,21 @@ mod tests {
 
         let updated = &*UPDATED_DURATION_INTERCEPTED_1;
         updated.update(old.rowid()).unwrap();
-        let new = dbqueries::get_episode_from_pk(old.title(), old.show_id()).unwrap();
+        let mut new = dbqueries::get_episode_from_pk(old.title(), old.podcast_id()).unwrap();
 
-        // Assert that updating does not change the rowid and show_id
+        // Assert that updating does not change the rowid and podcast_id
         assert_ne!(old, new);
         assert_eq!(old.rowid(), new.rowid());
-        assert_eq!(old.show_id(), new.show_id());
+        assert_eq!(old.podcast_id(), new.podcast_id());
 
         assert_eq!(updated, &new);
         assert_ne!(updated, &old);
+
+        new.set_archive(true);
+        new.save().unwrap();
+
+        let new2 = dbqueries::get_episode_from_pk(old.title(), old.podcast_id()).unwrap();
+        assert_eq!(true, new2.archive());
     }
 
     #[test]
@@ -620,7 +608,7 @@ mod tests {
         // Second identical, This should take the early return path
         assert!(expected.index().is_ok());
         // Get the episode
-        let old = dbqueries::get_episode_from_pk(expected.title(), expected.show_id()).unwrap();
+        let old = dbqueries::get_episode_from_pk(expected.title(), expected.podcast_id()).unwrap();
         // Assert that NewPodcast is equal to the Indexed one
         assert_eq!(*expected, old);
 
@@ -629,22 +617,23 @@ mod tests {
         // Update the podcast
         assert!(updated.index().is_ok());
         // Get the new Podcast
-        let new = dbqueries::get_episode_from_pk(expected.title(), expected.show_id()).unwrap();
+        let new = dbqueries::get_episode_from_pk(expected.title(), expected.podcast_id()).unwrap();
         // Assert it's diff from the old one.
         assert_ne!(new, old);
         assert_eq!(*updated, new);
         assert_eq!(new.rowid(), old.rowid());
-        assert_eq!(new.show_id(), old.show_id());
+        assert_eq!(new.podcast_id(), old.podcast_id());
     }
 
     #[test]
     fn test_new_episode_to_episode() {
         let expected = &*EXPECTED_INTERCEPTED_1;
+        let updated = &*UPDATED_DURATION_INTERCEPTED_1;
 
         // Assert insert() produces the same result that you would get with to_podcast()
         truncate_db().unwrap();
         expected.insert().unwrap();
-        let old = dbqueries::get_episode_from_pk(expected.title(), expected.show_id()).unwrap();
+        let old = dbqueries::get_episode_from_pk(expected.title(), expected.podcast_id()).unwrap();
         let ep = expected.to_episode().unwrap();
         assert_eq!(old, ep);
 
@@ -653,7 +642,17 @@ mod tests {
         let ep = expected.to_episode().unwrap();
         // This should error as a unique constrain violation
         assert!(expected.insert().is_err());
-        let old = dbqueries::get_episode_from_pk(expected.title(), expected.show_id()).unwrap();
+        let mut old =
+            dbqueries::get_episode_from_pk(expected.title(), expected.podcast_id()).unwrap();
         assert_eq!(old, ep);
+
+        old.set_archive(true);
+        old.save().unwrap();
+
+        // Assert that it does not mess with user preferences
+        let ep = updated.to_episode().unwrap();
+        let old = dbqueries::get_episode_from_pk(expected.title(), expected.podcast_id()).unwrap();
+        assert_eq!(old, ep);
+        assert_eq!(old.archive(), true);
     }
 }

hammond-data/src/models/new_podcast.rs

@@ -4,21 +4,21 @@ use diesel::prelude::*;
 use rss;
 
 use errors::DataError;
-use models::Show;
+use models::Podcast;
 use models::{Index, Insert, Update};
-use schema::shows;
+use schema::podcast;
 
 use database::connection;
 use dbqueries;
 use utils::url_cleaner;
 
 #[derive(Insertable, AsChangeset)]
-#[table_name = "shows"]
+#[table_name = "podcast"]
 #[derive(Debug, Clone, Default, Builder, PartialEq)]
 #[builder(default)]
 #[builder(derive(Debug))]
 #[builder(setter(into))]
-pub(crate) struct NewShow {
+pub(crate) struct NewPodcast {
     title: String,
     link: String,
     description: String,
@@ -26,15 +26,15 @@ pub(crate) struct NewShow {
     source_id: i32,
 }
 
-impl Insert<()> for NewShow {
+impl Insert<()> for NewPodcast {
     type Error = DataError;
 
     fn insert(&self) -> Result<(), Self::Error> {
-        use schema::shows::dsl::*;
+        use schema::podcast::dsl::*;
         let db = connection();
         let con = db.get()?;
 
-        diesel::insert_into(shows)
+        diesel::insert_into(podcast)
             .values(self)
             .execute(&con)
             .map(|_| ())
@@ -42,16 +42,16 @@ impl Insert<()> for NewShow {
     }
 }
 
-impl Update<()> for NewShow {
+impl Update<()> for NewPodcast {
     type Error = DataError;
 
-    fn update(&self, show_id: i32) -> Result<(), Self::Error> {
-        use schema::shows::dsl::*;
+    fn update(&self, podcast_id: i32) -> Result<(), Self::Error> {
+        use schema::podcast::dsl::*;
         let db = connection();
         let con = db.get()?;
 
         info!("Updating {}", self.title);
-        diesel::update(shows.filter(id.eq(show_id)))
+        diesel::update(podcast.filter(id.eq(podcast_id)))
             .set(self)
             .execute(&con)
             .map(|_| ())
@@ -61,7 +61,7 @@ impl Update<()> for NewShow {
 
 // TODO: Maybe return an Enum<Action(Resut)> Instead.
 // It would make unti testing better too.
-impl Index<()> for NewShow {
+impl Index<()> for NewPodcast {
     type Error = DataError;
 
     fn index(&self) -> Result<(), DataError> {
@@ -81,8 +81,8 @@ impl Index<()> for NewShow {
     }
 }
 
-impl PartialEq<Show> for NewShow {
-    fn eq(&self, other: &Show) -> bool {
+impl PartialEq<Podcast> for NewPodcast {
+    fn eq(&self, other: &Podcast) -> bool {
         (self.link() == other.link())
             && (self.title() == other.title())
             && (self.image_uri() == other.image_uri())
@@ -91,9 +91,9 @@ impl PartialEq<Show> for NewShow {
     }
 }
 
-impl NewShow {
-    /// Parses a `rss::Channel` into a `NewShow` Struct.
-    pub(crate) fn new(chan: &rss::Channel, source_id: i32) -> NewShow {
+impl NewPodcast {
+    /// Parses a `rss::Channel` into a `NewPodcast` Struct.
+    pub(crate) fn new(chan: &rss::Channel, source_id: i32) -> NewPodcast {
         let title = chan.title().trim();
         let link = url_cleaner(chan.link().trim());
 
@@ -111,7 +111,7 @@ impl NewShow {
         // If itunes is None, try to get the channel.image from the rss spec
         let image_uri = itunes_img.or_else(|| chan.image().map(|s| s.url().trim().to_owned()));
 
-        NewShowBuilder::default()
+        NewPodcastBuilder::default()
             .title(title)
             .description(description)
             .link(link)
@@ -122,14 +122,14 @@ impl NewShow {
     }
 
     // Look out for when tryinto lands into stable.
-    pub(crate) fn to_podcast(&self) -> Result<Show, DataError> {
+    pub(crate) fn to_podcast(&self) -> Result<Podcast, DataError> {
         self.index()?;
         dbqueries::get_podcast_from_source_id(self.source_id).map_err(From::from)
     }
 }
 
 // Ignore the following geters. They are used in unit tests mainly.
-impl NewShow {
+impl NewPodcast {
     #[allow(dead_code)]
     pub(crate) fn source_id(&self) -> i32 {
         self.source_id
@@ -160,14 +160,14 @@ mod tests {
     use rss::Channel;
 
     use database::truncate_db;
-    use models::NewShowBuilder;
+    use models::{NewPodcastBuilder, Save};
 
     use std::fs::File;
     use std::io::BufReader;
 
-    // Pre-built expected NewShow structs.
+    // Pre-built expected NewPodcast structs.
     lazy_static! {
-        static ref EXPECTED_INTERCEPTED: NewShow = {
+        static ref EXPECTED_INTERCEPTED: NewPodcast = {
             let descr = "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 \
@@ -175,7 +175,7 @@ mod tests {
                          artists, thinkers, and newsmakers who challenge our preconceptions about \
                          the world we live in.";
 
-            NewShowBuilder::default()
+            NewPodcastBuilder::default()
                 .title("Intercepted with Jeremy Scahill")
                 .link("https://theintercept.com/podcasts")
                 .description(descr)
@@ -188,12 +188,12 @@ mod tests {
                 .build()
                 .unwrap()
         };
-        static ref EXPECTED_LUP: NewShow = {
+        static ref EXPECTED_LUP: NewPodcast = {
             let descr = "An open show powered by community LINUX Unplugged takes the best \
                          attributes of open collaboration and focuses them into a weekly \
                          lifestyle show about Linux.";
 
-            NewShowBuilder::default()
+            NewPodcastBuilder::default()
                 .title("LINUX Unplugged Podcast")
                 .link("http://www.jupiterbroadcasting.com/")
                 .description(descr)
@@ -204,7 +204,7 @@ mod tests {
                 .build()
                 .unwrap()
         };
-        static ref EXPECTED_TIPOFF: NewShow = {
+        static ref EXPECTED_TIPOFF: NewPodcast = {
             let desc = "<p>Welcome to The Tip Off- the podcast where we take you behind the \
                         scenes of some of the best investigative journalism from recent years. \
                         Each episode we’ll be digging into an investigative scoop- hearing from \
@@ -215,7 +215,7 @@ mod tests {
                         complicated detective work that goes into doing great investigative \
                         journalism- then this is the podcast for you.</p>";
 
-            NewShowBuilder::default()
+            NewPodcastBuilder::default()
                 .title("The Tip Off")
                 .link("http://www.acast.com/thetipoff")
                 .description(desc)
@@ -227,7 +227,7 @@ mod tests {
                 .build()
                 .unwrap()
         };
-        static ref EXPECTED_STARS: NewShow = {
+        static ref EXPECTED_STARS: NewPodcast = {
             let descr = "<p>The first audio drama from Tor Labs and Gideon Media, Steal the Stars \
                          is a gripping noir science fiction thriller in 14 episodes: Forbidden \
                          love, a crashed UFO, an alien body, and an impossible heist unlike any \
@@ -237,7 +237,7 @@ mod tests {
                        b183-7311d2e436c3/b3a4aa57a576bb662191f2a6bc2a436c8c4ae256ecffaff5c4c54fd42e\
                        923914941c264d01efb1833234b52c9530e67d28a8cebbe3d11a4bc0fbbdf13ecdf1c3.jpeg";
 
-            NewShowBuilder::default()
+            NewPodcastBuilder::default()
                 .title("Steal the Stars")
                 .link("http://tor-labs.com/")
                 .description(descr)
@@ -246,12 +246,12 @@ mod tests {
                 .build()
                 .unwrap()
         };
-        static ref EXPECTED_CODE: NewShow = {
+        static ref EXPECTED_CODE: NewPodcast = {
             let descr = "A podcast about humans and technology. Panelists: Coraline Ada Ehmke, \
                          David Brady, Jessica Kerr, Jay Bobo, Astrid Countee and Sam \
                          Livingston-Gray. Brought to you by @therubyrep.";
 
-            NewShowBuilder::default()
+            NewPodcastBuilder::default()
                 .title("Greater Than Code")
                 .link("https://www.greaterthancode.com/")
                 .description(descr)
@@ -262,8 +262,8 @@ mod tests {
                 .build()
                 .unwrap()
         };
-        static ref EXPECTED_ELLINOFRENEIA: NewShow = {
-            NewShowBuilder::default()
+        static ref EXPECTED_ELLINOFRENEIA: NewPodcast = {
+            NewPodcastBuilder::default()
                 .title("Ελληνοφρένεια")
                 .link("https://ellinofreneia.sealabs.net/feed.rss")
                 .description("Ανεπίσημο feed της Ελληνοφρένειας")
@@ -272,8 +272,8 @@ mod tests {
                 .build()
                 .unwrap()
         };
-        static ref UPDATED_DESC_INTERCEPTED: NewShow = {
-            NewShowBuilder::default()
+        static ref UPDATED_DESC_INTERCEPTED: NewPodcast = {
+            NewPodcastBuilder::default()
                 .title("Intercepted with Jeremy Scahill")
                 .link("https://theintercept.com/podcasts")
                 .description("New Description")
@@ -293,7 +293,7 @@ mod tests {
         let file = File::open("tests/feeds/2018-01-20-Intercepted.xml").unwrap();
         let channel = Channel::read_from(BufReader::new(file)).unwrap();
 
-        let pd = NewShow::new(&channel, 42);
+        let pd = NewPodcast::new(&channel, 42);
         assert_eq!(*EXPECTED_INTERCEPTED, pd);
     }
 
@@ -302,7 +302,7 @@ mod tests {
         let file = File::open("tests/feeds/2018-01-20-LinuxUnplugged.xml").unwrap();
         let channel = Channel::read_from(BufReader::new(file)).unwrap();
 
-        let pd = NewShow::new(&channel, 42);
+        let pd = NewPodcast::new(&channel, 42);
         assert_eq!(*EXPECTED_LUP, pd);
     }
 
@@ -311,7 +311,7 @@ mod tests {
         let file = File::open("tests/feeds/2018-01-20-TheTipOff.xml").unwrap();
         let channel = Channel::read_from(BufReader::new(file)).unwrap();
 
-        let pd = NewShow::new(&channel, 42);
+        let pd = NewPodcast::new(&channel, 42);
         assert_eq!(*EXPECTED_TIPOFF, pd);
     }
 
@@ -320,7 +320,7 @@ mod tests {
         let file = File::open("tests/feeds/2018-01-20-StealTheStars.xml").unwrap();
         let channel = Channel::read_from(BufReader::new(file)).unwrap();
 
-        let pd = NewShow::new(&channel, 42);
+        let pd = NewPodcast::new(&channel, 42);
         assert_eq!(*EXPECTED_STARS, pd);
     }
 
@@ -329,7 +329,7 @@ mod tests {
         let file = File::open("tests/feeds/2018-01-20-GreaterThanCode.xml").unwrap();
         let channel = Channel::read_from(BufReader::new(file)).unwrap();
 
-        let pd = NewShow::new(&channel, 42);
+        let pd = NewPodcast::new(&channel, 42);
         assert_eq!(*EXPECTED_CODE, pd);
     }
 
@@ -338,7 +338,7 @@ mod tests {
         let file = File::open("tests/feeds/2018-03-28-Ellinofreneia.xml").unwrap();
         let channel = Channel::read_from(BufReader::new(file)).unwrap();
 
-        let pd = NewShow::new(&channel, 42);
+        let pd = NewPodcast::new(&channel, 42);
         assert_eq!(*EXPECTED_ELLINOFRENEIA, pd);
     }
 
@@ -349,7 +349,7 @@ mod tests {
         let file = File::open("tests/feeds/2018-01-20-Intercepted.xml").unwrap();
         let channel = Channel::read_from(BufReader::new(file)).unwrap();
 
-        let npd = NewShow::new(&channel, 42);
+        let npd = NewPodcast::new(&channel, 42);
         npd.insert().unwrap();
         let pd = dbqueries::get_podcast_from_source_id(42).unwrap();
 
@@ -369,13 +369,20 @@ mod tests {
 
         let updated = &*UPDATED_DESC_INTERCEPTED;
         updated.update(old.id()).unwrap();
-        let new = dbqueries::get_podcast_from_source_id(42).unwrap();
+        let mut new = dbqueries::get_podcast_from_source_id(42).unwrap();
 
         assert_ne!(old, new);
         assert_eq!(old.id(), new.id());
         assert_eq!(old.source_id(), new.source_id());
         assert_eq!(updated, &new);
         assert_ne!(updated, &old);
+
+        // Chech that the update does not override user preferences.
+        new.set_archive(true);
+        new.save().unwrap();
+
+        let new2 = dbqueries::get_podcast_from_source_id(42).unwrap();
+        assert_eq!(true, new2.archive());
     }
 
     #[test]
@@ -388,14 +395,14 @@ mod tests {
         assert!(EXPECTED_INTERCEPTED.index().is_ok());
         // Get the podcast
         let old = dbqueries::get_podcast_from_source_id(42).unwrap();
-        // Assert that NewShow is equal to the Indexed one
+        // Assert that NewPodcast is equal to the Indexed one
         assert_eq!(&*EXPECTED_INTERCEPTED, &old);
 
         let updated = &*UPDATED_DESC_INTERCEPTED;
 
         // Update the podcast
         assert!(updated.index().is_ok());
-        // Get the new Show
+        // Get the new Podcast
         let new = dbqueries::get_podcast_from_source_id(42).unwrap();
         // Assert it's diff from the old one.
         assert_ne!(new, old);
@@ -417,7 +424,16 @@ mod tests {
         let pd = EXPECTED_INTERCEPTED.to_podcast().unwrap();
         // This should error as a unique constrain violation
         assert!(EXPECTED_INTERCEPTED.insert().is_err());
+        let mut old = dbqueries::get_podcast_from_source_id(42).unwrap();
+        assert_eq!(old, pd);
+
+        old.set_archive(true);
+        old.save().unwrap();
+
+        // Assert that it does not mess with user preferences
+        let pd = UPDATED_DESC_INTERCEPTED.to_podcast().unwrap();
         let old = dbqueries::get_podcast_from_source_id(42).unwrap();
         assert_eq!(old, pd);
+        assert_eq!(old.archive(), true);
     }
 }

hammond-data/src/models/podcast.rs

@@ -3,37 +3,42 @@ use diesel::SaveChangesDsl;
 use database::connection;
 use errors::DataError;
 use models::{Save, Source};
-use schema::shows;
+use schema::podcast;
+
+use std::sync::Arc;
 
 #[derive(Queryable, Identifiable, AsChangeset, Associations, PartialEq)]
 #[belongs_to(Source, foreign_key = "source_id")]
 #[changeset_options(treat_none_as_null = "true")]
-#[table_name = "shows"]
+#[table_name = "podcast"]
 #[derive(Debug, Clone)]
-/// Diesel Model of the shows table.
-pub struct Show {
+/// Diesel Model of the podcast table.
+pub struct Podcast {
     id: i32,
     title: String,
     link: String,
     description: String,
     image_uri: Option<String>,
+    favorite: bool,
+    archive: bool,
+    always_dl: bool,
     source_id: i32,
 }
 
-impl Save<Show> for Show {
+impl Save<Podcast> for Podcast {
     type Error = DataError;
 
     /// Helper method to easily save/"sync" current state of self to the
     /// Database.
-    fn save(&self) -> Result<Show, Self::Error> {
+    fn save(&self) -> Result<Podcast, Self::Error> {
         let db = connection();
         let tempdb = db.get()?;
 
-        self.save_changes::<Show>(&*tempdb).map_err(From::from)
+        self.save_changes::<Podcast>(&*tempdb).map_err(From::from)
     }
 }
 
-impl Show {
+impl Podcast {
     /// Get the Feed `id`.
     pub fn id(&self) -> i32 {
         self.id
@@ -51,7 +56,7 @@ impl Show {
         &self.link
     }
 
-    /// Set the Show/Feed `link`.
+    /// Set the Podcast/Feed `link`.
     pub fn set_link(&mut self, value: &str) {
         self.link = value.to_string();
     }
@@ -78,6 +83,41 @@ impl Show {
         self.image_uri = value.map(|x| x.to_string());
     }
 
+    /// Represents the archiving policy for the episode.
+    pub fn archive(&self) -> bool {
+        self.archive
+    }
+
+    /// Set the `archive` policy.
+    pub fn set_archive(&mut self, b: bool) {
+        self.archive = b
+    }
+
+    /// Get the `favorite` status of the `Podcast` Feed.
+    pub fn favorite(&self) -> bool {
+        self.favorite
+    }
+
+    /// Set `favorite` status.
+    pub fn set_favorite(&mut self, b: bool) {
+        self.favorite = b
+    }
+
+    /// Represents the download policy for the `Podcast` Feed.
+    ///
+    /// Reserved for the use with a Download manager, yet to be implemented.
+    ///
+    /// If true Podcast Episode should be downloaded automaticly/skipping
+    /// the selection queue.
+    pub fn always_download(&self) -> bool {
+        self.always_dl
+    }
+
+    /// Set the download policy.
+    pub fn set_always_download(&mut self, b: bool) {
+        self.always_dl = b
+    }
+
     /// `Source` table foreign key.
     pub fn source_id(&self) -> i32 {
         self.source_id
@@ -85,17 +125,17 @@ impl Show {
 }
 
 #[derive(Queryable, Debug, Clone)]
-/// Diesel Model of the Show cover query.
-/// Used for fetching information about a Show's cover.
-pub struct ShowCoverModel {
+/// Diesel Model of the podcast cover query.
+/// Used for fetching information about a Podcast's cover.
+pub struct PodcastCoverQuery {
     id: i32,
     title: String,
     image_uri: Option<String>,
 }
 
-impl From<Show> for ShowCoverModel {
-    fn from(p: Show) -> ShowCoverModel {
-        ShowCoverModel {
+impl From<Podcast> for PodcastCoverQuery {
+    fn from(p: Podcast) -> PodcastCoverQuery {
+        PodcastCoverQuery {
             id: p.id(),
             title: p.title,
             image_uri: p.image_uri,
@@ -103,7 +143,17 @@ impl From<Show> for ShowCoverModel {
     }
 }
 
-impl ShowCoverModel {
+impl From<Arc<Podcast>> for PodcastCoverQuery {
+    fn from(p: Arc<Podcast>) -> PodcastCoverQuery {
+        PodcastCoverQuery {
+            id: p.id(),
+            title: p.title.clone(),
+            image_uri: p.image_uri.clone(),
+        }
+    }
+}
+
+impl PodcastCoverQuery {
     /// Get the Feed `id`.
     pub fn id(&self) -> i32 {
         self.id

hammond-data/src/schema.patch

@@ -1,29 +0,0 @@
-diff --git a/hammond-data/src/schema.rs b/hammond-data/src/schema.rs
-index 03cbed0..88f1622 100644
---- a/hammond-data/src/schema.rs
-+++ b/hammond-data/src/schema.rs
-@@ -1,8 +1,11 @@
-+#![allow(warnings)]
-+
- table! {
-     episodes (title, show_id) {
-+        rowid -> Integer,
-         title -> Text,
-         uri -> Nullable<Text>,
-         local_uri -> Nullable<Text>,
-         description -> Nullable<Text>,
-         epoch -> Integer,
-         length -> Nullable<Integer>,
-@@ -30,11 +33,7 @@ table! {
-         uri -> Text,
-         last_modified -> Nullable<Text>,
-         http_etag -> Nullable<Text>,
-     }
- }
- 
--allow_tables_to_appear_in_same_query!(
--    episodes,
--    shows,
--    source,
--);
-+allow_tables_to_appear_in_same_query!(episodes, shows, source);

hammond-data/src/schema.rs

@@ -1,7 +1,5 @@
-#![allow(warnings)]
-
 table! {
-    episodes (title, show_id) {
+    episode (title, podcast_id) {
         rowid -> Integer,
         title -> Text,
         uri -> Nullable<Text>,
@@ -12,17 +10,22 @@ table! {
         duration -> Nullable<Integer>,
         guid -> Nullable<Text>,
         played -> Nullable<Integer>,
-        show_id -> Integer,
+        favorite -> Bool,
+        archive -> Bool,
+        podcast_id -> Integer,
     }
 }
 
 table! {
-    shows (id) {
+    podcast (id) {
         id -> Integer,
         title -> Text,
         link -> Text,
         description -> Text,
         image_uri -> Nullable<Text>,
+        favorite -> Bool,
+        archive -> Bool,
+        always_dl -> Bool,
         source_id -> Integer,
     }
 }
@@ -36,4 +39,4 @@ table! {
     }
 }
 
-allow_tables_to_appear_in_same_query!(episodes, shows, source);
+allow_tables_to_appear_in_same_query!(episode, podcast, source,);

hammond-data/src/utils.rs

@@ -7,7 +7,7 @@ use url::{Position, Url};
 
 use dbqueries;
 use errors::DataError;
-use models::{EpisodeCleanerModel, Save, Show};
+use models::{EpisodeCleanerQuery, Podcast, Save};
 use xdg_dirs::DL_DIR;
 
 use std::fs;
@@ -59,7 +59,7 @@ fn played_cleaner(cleanup_date: DateTime<Utc>) -> Result<(), DataError> {
 }
 
 /// Check `ep.local_uri` field and delete the file it points to.
-fn delete_local_content(ep: &mut EpisodeCleanerModel) -> Result<(), DataError> {
+fn delete_local_content(ep: &mut EpisodeCleanerQuery) -> Result<(), DataError> {
     if ep.local_uri().is_some() {
         let uri = ep.local_uri().unwrap().to_owned();
         if Path::new(&uri).exists() {
@@ -108,9 +108,9 @@ pub fn url_cleaner(s: &str) -> String {
     }
 }
 
-/// Returns the URI of a Show Downloads given it's title.
+/// Returns the URI of a Podcast Downloads given it's title.
 pub fn get_download_folder(pd_title: &str) -> Result<String, DataError> {
-    // It might be better to make it a hash of the title or the Show rowid
+    // It might be better to make it a hash of the title or the podcast rowid
     let download_fold = format!("{}/{}", DL_DIR.to_str().unwrap(), pd_title);
 
     // Create the folder
@@ -123,7 +123,7 @@ pub fn get_download_folder(pd_title: &str) -> Result<String, DataError> {
 /// Removes all the entries associated with the given show from the database,
 /// and deletes all of the downloaded content.
 // TODO: Write Tests
-pub fn delete_show(pd: &Show) -> Result<(), DataError> {
+pub fn delete_show(pd: &Podcast) -> Result<(), DataError> {
     dbqueries::remove_feed(pd)?;
     info!("{} was removed succesfully.", pd.title());
 
@@ -183,7 +183,7 @@ mod tests {
         // Setup episodes
         let n1 = NewEpisodeBuilder::default()
             .title("foo_bar".to_string())
-            .show_id(0)
+            .podcast_id(0)
             .build()
             .unwrap()
             .to_episode()
@@ -191,14 +191,14 @@ mod tests {
 
         let n2 = NewEpisodeBuilder::default()
             .title("bar_baz".to_string())
-            .show_id(1)
+            .podcast_id(1)
             .build()
             .unwrap()
             .to_episode()
             .unwrap();
 
-        let mut ep1 = dbqueries::get_episode_from_pk(n1.title(), n1.show_id()).unwrap();
-        let mut ep2 = dbqueries::get_episode_from_pk(n2.title(), n2.show_id()).unwrap();
+        let mut ep1 = dbqueries::get_episode_from_pk(n1.title(), n1.podcast_id()).unwrap();
+        let mut ep2 = dbqueries::get_episode_from_pk(n2.title(), n2.podcast_id()).unwrap();
         ep1.set_local_uri(Some(valid_path.to_str().unwrap()));
         ep2.set_local_uri(Some(bad_path.to_str().unwrap()));
 
@@ -230,7 +230,7 @@ mod tests {
     #[test]
     fn test_download_cleaner() {
         let _tmp_dir = helper_db();
-        let mut episode: EpisodeCleanerModel =
+        let mut episode: EpisodeCleanerQuery =
             dbqueries::get_episode_from_pk("foo_bar", 0).unwrap().into();
 
         let valid_path = episode.local_uri().unwrap().to_owned();

hammond-downloader/Cargo.toml

@@ -5,11 +5,11 @@ version = "0.1.0"
 workspace = "../"
 
 [dependencies]
-error-chain = "0.12.0"
+error-chain = "0.11.0"
 hyper = "0.11.27"
-log = "0.4.2"
+log = "0.4.1"
 mime_guess = "1.8.4"
-reqwest = "0.8.6"
+reqwest = "0.8.5"
 tempdir = "0.3.7"
 glob = "0.2.11"
 failure = "0.1.1"

hammond-downloader/src/downloader.rs

@@ -12,7 +12,7 @@ use std::path::Path;
 use std::sync::{Arc, Mutex};
 
 use hammond_data::xdg_dirs::HAMMOND_CACHE;
-use hammond_data::{EpisodeWidgetModel, Save, ShowCoverModel};
+use hammond_data::{EpisodeWidgetQuery, PodcastCoverQuery, Save};
 
 // use failure::Error;
 use errors::DownloadError;
@@ -127,7 +127,7 @@ fn save_io(
     info!("Downloading into: {}", file);
     let chunk_size = match content_lenght {
         Some(x) => x as usize / 99,
-        None => 1024, // default chunk size
+        None => 1024 as usize, // default chunk size
     };
 
     let mut writer = BufWriter::new(File::create(&file)?);
@@ -161,7 +161,7 @@ fn save_io(
 
 // TODO: Refactor
 pub fn get_episode(
-    ep: &mut EpisodeWidgetModel,
+    ep: &mut EpisodeWidgetQuery,
     download_folder: &str,
     progress: Option<Arc<Mutex<DownloadProgress>>>,
 ) -> Result<(), DownloadError> {
@@ -196,7 +196,7 @@ pub fn get_episode(
     Ok(())
 }
 
-pub fn cache_image(pd: &ShowCoverModel) -> Result<String, DownloadError> {
+pub fn cache_image(pd: &PodcastCoverQuery) -> Result<String, DownloadError> {
     let url = pd
         .image_uri()
         .ok_or_else(|| DownloadError::NoImageLocation)?

hammond-downloader/src/lib.rs

@@ -1,15 +1,7 @@
 #![recursion_limit = "1024"]
+#![warn(unused_extern_crates, unused)]
 #![allow(unknown_lints)]
 #![cfg_attr(feature = "cargo-clippy", allow(blacklisted_name, option_map_unit_fn))]
-// Enable lint group collections
-#![warn(nonstandard_style, edition_2018, rust_2018_idioms, bad_style, unused)]
-// standalone lints
-#![warn(
-    const_err, improper_ctypes, non_shorthand_field_patterns, no_mangle_generic_items,
-    overflowing_literals, plugin_as_library, private_no_mangle_fns, private_no_mangle_statics,
-    unconditional_recursion, unions_with_drop_fields, while_true, missing_debug_implementations,
-    trivial_casts, trivial_numeric_casts, elided_lifetime_in_paths, missing_copy_implementations
-)]
 #![deny(warnings)]
 
 extern crate failure;

hammond-gtk/Cargo.toml

@@ -6,16 +6,14 @@ version = "0.1.0"
 workspace = "../"
 
 [dependencies]
-chrono = "0.4.4"
-crossbeam-channel = "0.2.1"
+chrono = "0.4.2"
+crossbeam-channel = "0.1.2"
 gdk = "0.8.0"
 gdk-pixbuf = "0.4.0"
 glib = "0.5.0"
-gstreamer = "0.11.3"
-gstreamer-player = "0.11.3"
 humansize = "1.1.0"
-lazy_static = "1.0.1"
-log = "0.4.2"
+lazy_static = "1.0.0"
+log = "0.4.1"
 loggerv = "0.7.1"
 open = "1.2.1"
 rayon = "1.0.1"
@@ -23,10 +21,10 @@ send-cell = "0.1.3"
 url = "1.7.0"
 failure = "0.1.1"
 failure_derive = "0.1.1"
-regex = "1.0.1"
-reqwest = "0.8.6"
-serde_json = "1.0.22"
-html2text = "0.1.7"
+regex = "1.0.0"
+reqwest = "0.8.5"
+serde_json = "1.0.17"
+html2pango = { git = "https://gitlab.gnome.org/World/html2pango" }
 
 [dependencies.gtk]
 features = ["v3_22"]
@@ -34,7 +32,7 @@ version = "0.4.1"
 
 [dependencies.gio]
 features = ["v2_50"]
-version = "0.4.1"
+version = "0.4.0"
 
 [dependencies.hammond-data]
 path = "../hammond-data"

hammond-gtk/build.rs

@@ -1,10 +1,6 @@
 use std::process::Command;
 
 fn main() {
-    // Rerun the build script when files in the resources folder are changed.
-    println!("cargo:rerun-if-changed=resources");
-    println!("cargo:rerun-if-changed=resources/*");
-
     Command::new("glib-compile-resources")
         .args(&["--generate", "resources.xml"])
         .current_dir("resources")

hammond-gtk/resources/gtk/episode_widget.ui

@@ -207,41 +207,24 @@ Tobias Bernard
             <property name="can_focus">False</property>
             <property name="layout_style">center</property>
             <child>
-              <object class="GtkButton" id="cancel_button">
-                <property name="label" translatable="yes">Cancel</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="pack_type">end</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="download_button">
+              <object class="GtkButton" id="desc_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">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>
                   <object class="GtkImage">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="icon_name">document-save-symbolic</property>
+                    <property name="icon_name">view-paged-symbolic</property>
                   </object>
                 </child>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
                 <property name="non_homogeneous">True</property>
               </packing>
             </child>
@@ -268,6 +251,45 @@ Tobias Bernard
                 <property name="non_homogeneous">True</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkButton" id="download_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">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>
+                  <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="icon_name">document-save-symbolic</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">3</property>
+                <property name="non_homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="cancel_button">
+                <property name="label" translatable="yes">Cancel</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="halign">center</property>
+                <property name="valign">center</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="pack_type">end</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>

hammond-gtk/resources/gtk/headerbar.ui

@@ -151,10 +151,9 @@ Tobias Bernard
       <object class="GtkMenuButton" id="add_toggle">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
+        <property name="receives_default">False</property>
         <property name="tooltip_text" translatable="yes">Add a new feed</property>
         <property name="valign">center</property>
-        <property name="popover">add_popover</property>
         <child>
           <object class="GtkImage" id="add-button-image2">
             <property name="visible">True</property>
@@ -263,6 +262,7 @@ Tobias Bernard
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
         <property name="valign">center</property>
+        <property name="use_popover">True</property>
         <child>
           <object class="GtkImage">
             <property name="visible">True</property>
@@ -281,4 +281,4 @@ Tobias Bernard
       </packing>
     </child>
   </object>
-</interface>
+</interface>

hammond-gtk/resources/gtk/menus.ui

@@ -5,22 +5,22 @@
     <section>
       <item>
         <attribute name="label" translatable="yes">_Check for new episodes</attribute>
-        <attribute name="action">win.refresh</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">win.import</attribute>
+        <attribute name="action">app.import</attribute>
       </item>
       <item>
         <attribute name="label" translatable="yes">_Export Shows</attribute>
-        <attribute name="action">win.export</attribute>
+        <attribute name="action">app.export</attribute>
       </item>
     </section>
     <section>
       <item>
         <attribute name="label" translatable="yes">_Preferences</attribute>
-        <attribute name="action">win.preferences</attribute>
+        <attribute name="action">app.preferences</attribute>
       </item>
     </section>
     <section>
@@ -30,11 +30,11 @@
       </item>
       <item>
         <attribute name="label" translatable="yes">_Help</attribute>
-        <attribute name="action">win.help</attribute>
+        <attribute name="action">app.help</attribute>
       </item>
       <item>
         <attribute name="label" translatable="yes">_About</attribute>
-        <attribute name="action">win.about</attribute>
+        <attribute name="action">app.about</attribute>
       </item>
     </section>
   </menu>

hammond-gtk/resources/gtk/player_toolbar.ui

@@ -1,372 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.0 -->
-<interface>
-  <requires lib="gtk+" version="3.20"/>
-  <object class="GtkImage" id="ff_image">
-    <property name="visible">True</property>
-    <property name="sensitive">False</property>
-    <property name="can_focus">False</property>
-    <property name="margin_top">1</property>
-    <property name="icon_name">media-seek-forward-symbolic</property>
-    <property name="icon_size">1</property>
-  </object>
-  <object class="GtkImage" id="pause_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="margin_top">1</property>
-    <property name="icon_name">media-playback-pause-symbolic</property>
-    <property name="icon_size">1</property>
-  </object>
-  <object class="GtkImage" id="play_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="margin_top">1</property>
-    <property name="icon_name">media-playback-start-symbolic</property>
-    <property name="icon_size">1</property>
-  </object>
-  <object class="GtkImage" id="previous_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="margin_top">1</property>
-    <property name="icon_name">media-seek-backward-symbolic</property>
-    <property name="icon_size">1</property>
-  </object>
-  <object class="GtkActionBar" id="action_bar">
-    <property name="can_focus">False</property>
-    <property name="no_show_all">True</property>
-    <property name="valign">center</property>
-    <child>
-      <object class="GtkBox" id="buttons">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="valign">center</property>
-        <child>
-          <object class="GtkButton" id="rewind_button">
-            <property name="width_request">42</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="tooltip_text" translatable="yes">Previous</property>
-            <property name="image">previous_image</property>
-            <property name="always_show_image">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkButton" id="play_button">
-            <property name="width_request">60</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="tooltip_text" translatable="yes">Play</property>
-            <property name="image">play_image</property>
-            <property name="always_show_image">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkButton" id="pause_button">
-            <property name="width_request">60</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="tooltip_text" translatable="yes">Play</property>
-            <property name="image">pause_image</property>
-            <property name="always_show_image">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkButton" id="ff_button">
-            <property name="width_request">42</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="tooltip_text" translatable="yes">Next</property>
-            <property name="image">ff_image</property>
-            <property name="always_show_image">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">3</property>
-          </packing>
-        </child>
-        <style>
-          <class name="linked"/>
-        </style>
-      </object>
-      <packing>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkBox" id="info">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="spacing">6</property>
-        <child>
-          <object class="GtkImage" id="show_cover">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="valign">center</property>
-            <property name="pixel_size">34</property>
-            <property name="icon_name">image-x-generic-symbolic</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="receives_default">True</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <property name="orientation">vertical</property>
-            <child>
-              <object class="GtkLabel" id="show_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">start</property>
-                <property name="label" translatable="yes">Show Title</property>
-                <property name="wrap">True</property>
-                <property name="ellipsize">end</property>
-                <property name="max_width_chars">20</property>
-                <style>
-                  <class name="player-show-label"/>
-                </style>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="episode_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">start</property>
-                <property name="label" translatable="yes">Episode Title</property>
-                <property name="wrap">True</property>
-                <property name="ellipsize">end</property>
-                <property name="max_width_chars">20</property>
-                <style>
-                  <class name="player-episode-label"/>
-                </style>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="position">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkScale" id="seek">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="hexpand">True</property>
-        <property name="round_digits">1</property>
-        <property name="draw_value">False</property>
-      </object>
-      <packing>
-        <property name="position">2</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkBox" id="timer">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="halign">start</property>
-        <property name="valign">center</property>
-        <property name="spacing">6</property>
-        <child>
-          <object class="GtkLabel" id="progress_time_label">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="halign">start</property>
-            <property name="valign">center</property>
-            <property name="label">0:00</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="separator">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="halign">start</property>
-            <property name="valign">center</property>
-            <property name="label">/</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="total_duration_label">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="halign">start</property>
-            <property name="valign">center</property>
-            <property name="label">0:00</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="position">3</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkMenuButton" id="rate_button">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">True</property>
-        <property name="halign">center</property>
-        <property name="valign">center</property>
-        <property name="margin_left">6</property>
-        <property name="direction">up</property>
-        <property name="popover">rate_popover</property>
-        <child>
-          <object class="GtkBox">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="spacing">6</property>
-            <child>
-              <object class="GtkLabel" id="rate_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">1.00x</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkImage">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="icon_name">go-down-symbolic</property>
-                <property name="icon_size">1</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="position">4</property>
-      </packing>
-    </child>
-  </object>
-  <object class="GtkPopover" id="rate_popover">
-    <property name="can_focus">False</property>
-    <property name="relative_to">rate_button</property>
-    <child>
-      <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_left">6</property>
-        <property name="margin_right">6</property>
-        <property name="margin_top">6</property>
-        <property name="margin_bottom">6</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">3</property>
-        <child>
-          <object class="GtkRadioButton" id="rate_1_50">
-            <property name="label" translatable="yes">1.50x</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <property name="draw_indicator">True</property>
-            <property name="group">normal_rate</property>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkRadioButton" id="rate_1_25">
-            <property name="label" translatable="yes">1.25x</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <property name="draw_indicator">True</property>
-            <property name="group">normal_rate</property>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkRadioButton" id="normal_rate">
-            <property name="label" translatable="yes">1.00x</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <property name="active">True</property>
-            <property name="draw_indicator">True</property>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

hammond-gtk/resources/gtk/style.css

@@ -9,12 +9,3 @@ row:last-child {
 list, border {
   border-radius: 4px;
 }
-
-.player-episode-label {
-    font-weight: bold;
-    font-size: smaller;
-}
-
-.player-show-label {
-    font-size: smaller;
-}

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

@@ -5,10 +5,10 @@
   <project_license>GPL-3.0</project_license>
   <metadata_license>CC0-1.0</metadata_license>
   <developer_name>Jordan Petridis</developer_name>
-  <summary>Modern Podcast application for the GNOME desktop</summary>
+  <summary>Modern Podcast Client for the GNOME desktop</summary>
   <description xml:lang="en">
     <p>
-      Hammond is a modern, reliable, and fast Podcast application for the GNOME
+      Hammond is a modern, reliable, and fast Podcast Client for the GNOME
       desktop written in Rust.
     </p>
   </description>
@@ -28,7 +28,7 @@
     </screenshot>
   </screenshots>
   <releases>
-    <release version="0.4.0" date="2018-07-04"/>
+    <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

@@ -13,7 +13,6 @@
       <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" preprocess="xml-stripblanks">gtk/player_toolbar.ui</file>
       <file compressed="true">gtk/style.css</file>
   </gresource>
 </gresources>

hammond-gtk/src/app.rs

@@ -1,7 +1,7 @@
 #![allow(new_without_default)]
 
 use gio::{
-    self, ActionMapExt, ApplicationExt, ApplicationExtManual, ApplicationFlags, SettingsExt,
+    ActionMapExt, ApplicationExt, ApplicationExtManual, ApplicationFlags, Settings, SettingsExt,
     SimpleAction, SimpleActionExt,
 };
 use glib;
@@ -9,15 +9,14 @@ use gtk;
 use gtk::prelude::*;
 use gtk::SettingsExt as GtkSettingsExt;
 
-use crossbeam_channel::{unbounded, Receiver, Sender};
-use hammond_data::Show;
+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::appnotif::{InAppNotification, UndoState};
-use widgets::player;
 use widgets::{about_dialog, mark_all_notif, remove_show_notif};
 
 use std::rc::Rc;
@@ -43,7 +42,7 @@ pub enum Action {
     RefreshEpisodesView,
     RefreshEpisodesViewBGR,
     RefreshShowsView,
-    ReplaceWidget(Arc<Show>),
+    ReplaceWidget(Arc<Podcast>),
     RefreshWidgetIfSame(i32),
     ShowWidgetAnimated,
     ShowShowsAnimated,
@@ -51,110 +50,175 @@ pub enum Action {
     HeaderBarNormal,
     HeaderBarShowUpdateIndicator,
     HeaderBarHideUpdateIndicator,
-    MarkAllPlayerNotification(Arc<Show>),
-    RemoveShow(Arc<Show>),
+    MarkAllPlayerNotification(Arc<Podcast>),
+    RemoveShow(Arc<Podcast>),
     ErrorNotification(String),
-    InitEpisode(i32),
+    AboutWidget(i32),
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug)]
 pub struct App {
-    instance: gtk::Application,
-    window: gtk::ApplicationWindow,
-    overlay: gtk::Overlay,
-    settings: gio::Settings,
-    content: Rc<Content>,
-    headerbar: Rc<Header>,
-    player: Rc<player::PlayerWidget>,
-    sender: Sender<Action>,
-    receiver: Receiver<Action>,
+    app_instance: gtk::Application,
+    settings: Settings,
 }
 
 impl App {
-    pub fn new(application: &gtk::Application) -> Rc<Self> {
-        let settings = gio::Settings::new("org.gnome.Hammond");
+    pub fn new() -> App {
+        let settings = Settings::new("org.gnome.Hammond");
+        let application = gtk::Application::new("org.gnome.Hammond", ApplicationFlags::empty())
+            .expect("Application Initialization failed...");
 
-        let (sender, receiver) = unbounded();
+        // Weird magic I copy-pasted that sets the Application Name in the Shell.
+        glib::set_application_name("Hammond");
+        glib::set_prgname(Some("Hammond"));
 
-        let window = gtk::ApplicationWindow::new(application);
-        window.set_title("Hammond");
-        window.connect_delete_event(clone!(application, settings => move |window, _| {
-            WindowGeometry::from_window(&window).write(&settings);
-            application.quit();
-            Inhibit(false)
-        }));
-
-        // Create a content instance
-        let content = Content::new(&sender).expect("Content Initialization failed.");
-
-        // Create the headerbar
-        let header = Header::new(&content, &sender);
-        // Add the Headerbar to the window.
-        window.set_titlebar(&header.container);
-
-        // Add the content main stack to the overlay.
-        let overlay = gtk::Overlay::new();
-        overlay.add(&content.get_stack());
-
-        let wrap = gtk::Box::new(gtk::Orientation::Vertical, 0);
-        // Add the overlay to the main Box
-        wrap.add(&overlay);
-
-        let player = player::PlayerWidget::new(&sender);
-        // Add the player to the main Box
-        wrap.add(&player.action_bar);
-
-        window.add(&wrap);
-
-        let app = App {
-            instance: application.clone(),
-            window,
-            settings,
-            overlay,
-            headerbar: header,
-            content,
-            player,
-            sender,
-            receiver,
-        };
-
-        Rc::new(app)
-    }
-
-    fn init(app: &Rc<Self>) {
-        let cleanup_date = settings::get_cleanup_date(&app.settings);
-        // Garbage collect watched episodes from the disk
+        let cleanup_date = settings::get_cleanup_date(&settings);
         utils::cleanup(cleanup_date);
 
-        app.setup_gactions();
-        app.setup_timed_callbacks();
+        application.connect_startup(clone!(settings => move |app| {
+            let (sender, receiver) = unbounded();
 
-        app.instance.connect_activate(move |_| ());
+            App::setup_gactions(&app, &sender);
 
-        // Retrieve the previous window position and size.
-        WindowGeometry::from_settings(&app.settings).apply(&app.window);
+            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");
 
-        // Setup the Action channel
-        gtk::timeout_add(25, clone!(app => move || app.setup_action_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 the headerbar
+                    let header = Rc::new(Header::new(&content, &window, &sender));
+
+                    action!(window, "menu", clone!(header => move |_, _| {
+                        header.open_menu();
+                    }));
+
+                    // 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,
+            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) {
+    fn setup_dark_theme(settings: &Settings) {
         let gtk_settings = gtk::Settings::get_default().unwrap();
-        let enabled = self.settings.get_boolean("dark-theme");
+        let enabled = settings.get_boolean("dark-theme");
 
         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.
-        let sender = self.sender.clone();
-        if self.settings.get_boolean("refresh-on-startup") {
+        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
@@ -167,11 +231,12 @@ impl App {
         }
     }
 
-    fn setup_auto_refresh(&self) {
-        let refresh_interval = settings::get_refresh_interval(&self.settings).num_seconds() as u32;
+    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 = self.sender.clone();
+        let sender = sender.clone();
         gtk::timeout_add_seconds(refresh_interval, move || {
             let s: Option<Vec<_>> = None;
             utils::refresh(s, sender.clone());
@@ -183,117 +248,52 @@ impl App {
     /// Define the `GAction`s.
     ///
     /// Used in menus and the keyboard shortcuts dialog.
-    #[cfg_attr(rustfmt, rustfmt_skip)]
-    fn setup_gactions(&self) {
-        let sender = &self.sender;
-        let win = &self.window;
-        let instance = &self.instance;
-        let header = &self.headerbar;
-
+    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!(win, "refresh", clone!(sender => move |_, _| {
+        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)
             }));
-        }));
-        self.instance.set_accels_for_action("win.refresh", &["<primary>r"]);
+        })
+        );
+        app.set_accels_for_action("app.refresh", &["<primary>r"]);
 
         // Create the `OPML` import action
-        action!(win, "import", clone!(sender, win => move |_, _| {
-            utils::on_import_clicked(&win, &sender)
-        }));
+        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!(win, "about", clone!(win => move |_, _| about_dialog(&win)));
+        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!(win, "quit", clone!(instance => move |_, _| instance.quit()));
-        self.instance.set_accels_for_action("win.quit", &["<primary>q"]);
+        action!(app, "quit", clone!(app => move |_, _| app.quit()));
+        app.set_accels_for_action("app.quit", &["<primary>q"]);
 
-        // Create the menu action
-        action!(win, "menu",clone!(header => move |_, _| header.open_menu()));
         // Bind the hamburger menu button to `F10`
-        self.instance.set_accels_for_action("win.menu", &["F10"]);
+        app.set_accels_for_action("win.menu", &["F10"]);
     }
 
-    fn setup_action_channel(&self) -> glib::Continue {
-        if let Some(action) = self.receiver.try_recv() {
-            trace!("Incoming channel action: {:?}", action);
-            match action {
-                Action::RefreshAllViews => self.content.update(),
-                Action::RefreshShowsView => self.content.update_shows_view(),
-                Action::RefreshWidgetIfSame(id) => self.content.update_widget_if_same(id),
-                Action::RefreshEpisodesView => self.content.update_home(),
-                Action::RefreshEpisodesViewBGR => self.content.update_home_if_background(),
-                Action::ReplaceWidget(pd) => {
-                    let shows = self.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();
-                }
-                Action::ShowWidgetAnimated => {
-                    let shows = self.content.get_shows();
-                    let mut pop = shows.borrow().populated();
-                    pop.borrow_mut().switch_visible(
-                        PopulatedState::Widget,
-                        gtk::StackTransitionType::SlideLeft,
-                    );
-                }
-                Action::ShowShowsAnimated => {
-                    let shows = self.content.get_shows();
-                    let mut pop = shows.borrow().populated();
-                    pop.borrow_mut()
-                        .switch_visible(PopulatedState::View, gtk::StackTransitionType::SlideRight);
-                }
-                Action::HeaderBarShowTile(title) => self.headerbar.switch_to_back(&title),
-                Action::HeaderBarNormal => self.headerbar.switch_to_normal(),
-                Action::HeaderBarShowUpdateIndicator => self.headerbar.show_update_notification(),
-                Action::HeaderBarHideUpdateIndicator => self.headerbar.hide_update_notification(),
-                Action::MarkAllPlayerNotification(pd) => {
-                    let notif = mark_all_notif(pd, &self.sender);
-                    notif.show(&self.overlay);
-                }
-                Action::RemoveShow(pd) => {
-                    let notif = remove_show_notif(pd, self.sender.clone());
-                    notif.show(&self.overlay);
-                }
-                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(&self.overlay);
-                }
-                Action::InitEpisode(rowid) => self.player.initialize_episode(rowid).unwrap(),
-            }
-        }
-
-        glib::Continue(true)
-    }
-
-    pub fn run() {
-        let application = gtk::Application::new("org.gnome.Hammond", ApplicationFlags::empty())
-            .expect("Application Initialization failed...");
-
-        application.connect_startup(clone!(application => move |_| {
-            info!("CONNECT STARTUP RUN");
-            let app = Self::new(&application);
-            Self::init(&app);
-            app.window.show_all();
-            app.window.activate();
-        }));
-
-        // Weird magic I copy-pasted that sets the Application Name in the Shell.
-        glib::set_application_name("Hammond");
-        glib::set_prgname(Some("Hammond"));
-        // We need out own org.gnome.Hammon icon
-        gtk::Window::set_default_icon_name("multimedia-player");
-        ApplicationExtManual::run(&application, &[]);
+    pub fn run(self) {
+        ApplicationExtManual::run(&self.app_instance, &[]);
     }
 }

hammond-gtk/src/headerbar.rs

@@ -1,134 +1,32 @@
 use gio::MenuModel;
+use glib;
 use gtk;
 use gtk::prelude::*;
 
-use crossbeam_channel::Sender;
 use failure::Error;
-use rayon;
+use failure::ResultExt;
 use url::Url;
 
+use crossbeam_channel::Sender;
 use hammond_data::{dbqueries, Source};
 
 use app::Action;
 use stacks::Content;
 use utils::{itunes_to_rss, refresh};
 
-use std::rc::Rc;
-
 #[derive(Debug, Clone)]
-// TODO: Factor out the hamburger menu
-// TODO: Make a proper state machine for the headerbar states
+// TODO: split this into smaller
 pub struct Header {
-    pub container: gtk::HeaderBar,
+    container: gtk::HeaderBar,
+    add_toggle: gtk::MenuButton,
     switch: gtk::StackSwitcher,
     back: gtk::Button,
     show_title: gtk::Label,
+    update_box: gtk::Box,
+    update_label: gtk::Label,
+    update_spinner: gtk::Spinner,
     menu_button: gtk::MenuButton,
     app_menu: MenuModel,
-    updater: UpdateIndicator,
-    add: AddPopover,
-}
-
-#[derive(Debug, Clone)]
-struct UpdateIndicator {
-    container: gtk::Box,
-    text: gtk::Label,
-    spinner: gtk::Spinner,
-}
-
-impl UpdateIndicator {
-    fn show(&self) {
-        self.spinner.start();
-        self.spinner.show();
-        self.container.show();
-        self.text.show();
-    }
-
-    fn hide(&self) {
-        self.spinner.stop();
-        self.spinner.hide();
-        self.container.hide();
-        self.text.hide();
-    }
-}
-
-#[derive(Debug, Clone)]
-struct AddPopover {
-    container: gtk::Popover,
-    result: gtk::Label,
-    entry: gtk::Entry,
-    add: gtk::Button,
-    toggle: gtk::MenuButton,
-}
-
-impl AddPopover {
-    // FIXME: THIS ALSO SUCKS!
-    fn on_add_clicked(&self, sender: &Sender<Action>) -> Result<(), Error> {
-        let url = self
-            .entry
-            .get_text()
-            .ok_or_else(|| format_err!("GtkEntry blew up somehow."))?;
-
-        debug!("Url: {}", url);
-        let url = if url.contains("itunes.com") || url.contains("apple.com") {
-            info!("Detected itunes url.");
-            let foo = itunes_to_rss(&url)?;
-            info!("Resolved to {}", foo);
-            foo
-        } else {
-            url.to_owned()
-        };
-
-        self.entry.set_text("");
-
-        rayon::spawn(clone!(sender => move || {
-            if let Ok(source) = Source::from_url(&url) {
-                refresh(Some(vec![source]), sender.clone());
-            } else {
-                error!("Failed to convert, url: {}, to a source entry", url);
-            }
-        }));
-
-        self.container.hide();
-        Ok(())
-    }
-
-    // FIXME: THIS SUCKS! REFACTOR ME.
-    fn on_entry_changed(&self) -> Result<(), Error> {
-        let uri = self
-            .entry
-            .get_text()
-            .ok_or_else(|| format_err!("GtkEntry blew up somehow."))?;
-        debug!("Url: {}", uri);
-
-        let url = Url::parse(&uri);
-        // TODO: refactor to avoid duplication
-        match url {
-            Ok(u) => {
-                if !dbqueries::source_exists(u.as_str())? {
-                    self.add.set_sensitive(true);
-                    self.result.hide();
-                    self.result.set_label("");
-                } else {
-                    self.add.set_sensitive(false);
-                    self.result.set_label("Show already exists.");
-                    self.result.show();
-                }
-                Ok(())
-            }
-            Err(err) => {
-                self.add.set_sensitive(false);
-                if !uri.is_empty() {
-                    self.result.set_label("Invalid url.");
-                    self.result.show();
-                    error!("Error: {}", err);
-                } else {
-                    self.result.hide();
-                }
-                Ok(())
-            }
-        }
-    }
 }
 
 impl Default for Header {
@@ -137,107 +35,106 @@ impl Default for Header {
         let menus = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/menus.ui");
 
         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 menu_button = builder.get_object("menu_button").unwrap();
-        let app_menu = menus.get_object("menu").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 updater = UpdateIndicator {
-            container: update_box,
-            text: update_label,
-            spinner: update_spinner,
-        };
-
-        let add_toggle = builder.get_object("add_toggle").unwrap();
-        let add_popover = builder.get_object("add_popover").unwrap();
-        let new_url = builder.get_object("new_url").unwrap();
-        let add_button = builder.get_object("add_button").unwrap();
-        let result = builder.get_object("result_label").unwrap();
-        let add = AddPopover {
-            container: add_popover,
-            entry: new_url,
-            toggle: add_toggle,
-            add: add_button,
-            result,
-        };
+        let menu_button = builder.get_object("menu_button").unwrap();
+        let app_menu = menus.get_object("menu").unwrap();
 
         Header {
             container: header,
+            add_toggle,
             switch,
             back,
             show_title,
+            update_box,
+            update_label,
+            update_spinner,
             menu_button,
             app_menu,
-            updater,
-            add,
         }
     }
 }
 
-// TODO: Factor out the hamburger menu
-// TODO: Make a proper state machine for the headerbar states
+// TODO: Refactor components into smaller state machines
 impl Header {
-    pub fn new(content: &Content, sender: &Sender<Action>) -> Rc<Self> {
-        let h = Rc::new(Header::default());
-        Self::init(&h, content, &sender);
+    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(s: &Rc<Self>, content: &Content, sender: &Sender<Action>) {
-        let weak = Rc::downgrade(s);
+    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");
 
-        s.switch.set_stack(&content.get_stack());
+        let add_popover: gtk::Popover = builder.get_object("add_popover").unwrap();
+        let new_url: gtk::Entry = builder.get_object("new_url").unwrap();
+        let add_button: gtk::Button = builder.get_object("add_button").unwrap();
+        let result_label: gtk::Label = builder.get_object("result_label").unwrap();
+        self.switch.set_stack(&content.get_stack());
 
-        s.add.entry.connect_changed(clone!(weak => move |_| {
-            weak.upgrade().map(|h| {
-                h.add.on_entry_changed()
-                    .map_err(|err| error!("Error: {}", err))
-                    .ok();
-            });
+        new_url.connect_changed(clone!(add_button => move |url| {
+            on_url_change(url, &result_label, &add_button)
+                .map_err(|err| error!("Error: {}", err))
+                .ok();
         }));
 
-        s.add.add.connect_clicked(clone!(weak, sender => move |_| {
-            weak.upgrade().map(|h| h.add.on_add_clicked(&sender));
+        add_button.connect_clicked(clone!(add_popover, new_url, sender => move |_| {
+            on_add_bttn_clicked(&new_url, sender.clone())
+                .map_err(|err| error!("Error: {}", err))
+                .ok();
+            add_popover.hide();
         }));
 
-        let switch = &s.switch;
-        let add_toggle = &s.add.toggle;
-        let show_title = &s.show_title;
-        let menu = &s.menu_button;
-        s.back.connect_clicked(
-            clone!(switch, add_toggle, show_title, sender, menu => move |back| {
+        self.add_toggle.set_popover(&add_popover);
+
+        // 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.connect_clicked(
+            clone!(switch, add_toggle, show_title, sender => move |back| {
                 switch.show();
                 add_toggle.show();
                 back.hide();
                 show_title.hide();
-                menu.show();
-                sender.send(Action::ShowShowsAnimated);
+                sender.send(Action::ShowShowsAnimated)
+                    .map_err(|err| error!("Action Sender: {}", err))
+                    .ok();
             }),
         );
 
-        s.menu_button.set_menu_model(Some(&s.app_menu));
+        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.add_toggle.hide();
         self.back.show();
         self.set_show_title(title);
         self.show_title.show();
-        self.menu_button.hide();
     }
 
     pub fn switch_to_normal(&self) {
         self.switch.show();
-        self.add.toggle.show();
+        self.add_toggle.show();
         self.back.hide();
         self.show_title.hide();
-        self.menu_button.show();
     }
 
     pub fn set_show_title(&self, title: &str) {
@@ -245,14 +142,82 @@ impl Header {
     }
 
     pub fn show_update_notification(&self) {
-        self.updater.show();
+        self.update_spinner.start();
+        self.update_box.show();
+        self.update_spinner.show();
+        self.update_label.show();
     }
 
     pub fn hide_update_notification(&self) {
-        self.updater.hide();
+        self.update_spinner.stop();
+        self.update_box.hide();
+        self.update_spinner.hide();
+        self.update_label.hide();
     }
 
     pub fn open_menu(&self) {
         self.menu_button.clicked();
     }
 }
+
+// FIXME: THIS ALSO SUCKS!
+fn on_add_bttn_clicked(entry: &gtk::Entry, sender: Sender<Action>) -> Result<(), Error> {
+    let url = entry.get_text().unwrap_or_default();
+    let url = if url.contains("itunes.com") || url.contains("apple.com") {
+        info!("Detected itunes url.");
+        let foo = itunes_to_rss(&url)?;
+        info!("Resolved to {}", foo);
+        foo
+    } else {
+        url.to_owned()
+    };
+
+    let source = Source::from_url(&url).context("Failed to convert url to a Source entry.")?;
+    entry.set_text("");
+
+    gtk::idle_add(move || {
+        refresh(Some(vec![source.clone()]), sender.clone());
+        glib::Continue(false)
+    });
+    Ok(())
+}
+
+// FIXME: THIS SUCKS!
+fn on_url_change(
+    entry: &gtk::Entry,
+    result: &gtk::Label,
+    add_button: &gtk::Button,
+) -> Result<(), Error> {
+    let uri = entry
+        .get_text()
+        .ok_or_else(|| format_err!("GtkEntry blew up somehow."))?;
+    debug!("Url: {}", uri);
+
+    let url = Url::parse(&uri);
+    // TODO: refactor to avoid duplication
+    match url {
+        Ok(u) => {
+            if !dbqueries::source_exists(u.as_str())? {
+                add_button.set_sensitive(true);
+                result.hide();
+                result.set_label("");
+            } else {
+                add_button.set_sensitive(false);
+                result.set_label("Show already exists.");
+                result.show();
+            }
+            Ok(())
+        }
+        Err(err) => {
+            add_button.set_sensitive(false);
+            if !uri.is_empty() {
+                result.set_label("Invalid url.");
+                result.show();
+                error!("Error: {}", err);
+            } else {
+                result.hide();
+            }
+            Ok(())
+        }
+    }
+}

hammond-gtk/src/main.rs

@@ -3,23 +3,13 @@
     allow(clone_on_ref_ptr, blacklisted_name, match_same_arms, option_map_unit_fn)
 )]
 #![allow(unknown_lints)]
-// Enable lint group collections
-#![warn(nonstandard_style, edition_2018, rust_2018_idioms, bad_style, unused)]
-// standalone lints
-#![warn(
-    const_err, improper_ctypes, non_shorthand_field_patterns, no_mangle_generic_items,
-    overflowing_literals, plugin_as_library, private_no_mangle_fns, private_no_mangle_statics,
-    unconditional_recursion, unions_with_drop_fields, while_true, missing_debug_implementations,
-    trivial_casts, trivial_numeric_casts, elided_lifetime_in_paths, missing_copy_implementations
-)]
+#![warn(unused_extern_crates, unused)]
 #![deny(warnings)]
 
 extern crate gdk;
 extern crate gdk_pixbuf;
 extern crate gio;
 extern crate glib;
-extern crate gstreamer as gst;
-extern crate gstreamer_player as gst_player;
 extern crate gtk;
 
 #[macro_use]
@@ -39,7 +29,7 @@ extern crate chrono;
 extern crate crossbeam_channel;
 extern crate hammond_data;
 extern crate hammond_downloader;
-extern crate html2text;
+extern crate html2pango;
 extern crate humansize;
 extern crate loggerv;
 extern crate open;
@@ -90,7 +80,6 @@ fn main() {
     // TODO: make the the logger a cli -vv option
     loggerv::init_with_level(Level::Info).expect("Error initializing loggerv.");
     gtk::init().expect("Error initializing gtk.");
-    gst::init().expect("Error initializing gstreamer");
     static_resource::init().expect("Something went wrong with the resource file initialization.");
 
     // Add custom style
@@ -102,5 +91,5 @@ fn main() {
         600,
     );
 
-    App::run();
+    App::new().run();
 }

hammond-gtk/src/stacks/content.rs

@@ -19,21 +19,20 @@ pub struct Content {
 }
 
 impl Content {
-    pub fn new(sender: &Sender<Action>) -> Result<Rc<Content>, Error> {
+    pub fn new(sender: Sender<Action>) -> Result<Content, Error> {
         let stack = gtk::Stack::new();
         let home = Rc::new(RefCell::new(HomeStack::new(sender.clone())?));
         let shows = Rc::new(RefCell::new(ShowStack::new(sender.clone())?));
 
-        stack.add_titled(&home.borrow().get_stack(), "home", "New");
+        stack.add_titled(&home.borrow().get_stack(), "home", "Recent");
         stack.add_titled(&shows.borrow().get_stack(), "shows", "Shows");
 
-        let con = Content {
+        Ok(Content {
             stack,
             shows,
             home,
-            sender: sender.clone(),
-        };
-        Ok(Rc::new(con))
+            sender,
+        })
     }
 
     pub fn update(&self) {
@@ -86,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/populated.rs

@@ -6,7 +6,7 @@ use crossbeam_channel::Sender;
 use failure::Error;
 
 use hammond_data::dbqueries;
-use hammond_data::Show;
+use hammond_data::Podcast;
 
 use app::Action;
 use widgets::{ShowWidget, ShowsView};
@@ -89,11 +89,13 @@ impl PopulatedStack {
         Ok(())
     }
 
-    pub fn replace_widget(&mut self, pd: Arc<Show>) -> Result<(), Error> {
+    pub fn replace_widget(&mut self, pd: Arc<Podcast>) -> Result<(), Error> {
         let old = self.show.container.clone();
 
         // save the ShowWidget vertical scrollabar alignment
-        self.show.show_id().map(|id| self.show.save_vadjustment(id));
+        self.show
+            .podcast_id()
+            .map(|id| self.show.save_vadjustment(id));
 
         let new = ShowWidget::new(pd, self.sender.clone());
         self.show = new;
@@ -111,7 +113,7 @@ impl PopulatedStack {
 
     pub fn update_widget(&mut self) -> Result<(), Error> {
         let old = self.show.container.clone();
-        let id = self.show.show_id();
+        let id = self.show.podcast_id();
         if id.is_none() {
             return Ok(());
         }
@@ -129,9 +131,9 @@ impl PopulatedStack {
         Ok(())
     }
 
-    // Only update widget if its show_id is equal to pid.
+    // Only update widget if its podcast_id is equal to pid.
     pub fn update_widget_if_same(&mut self, pid: i32) -> Result<(), Error> {
-        if self.show.show_id() != Some(pid) {
+        if self.show.podcast_id() != Some(pid) {
             debug!("Different widget. Early return");
             return Ok(());
         }

hammond-gtk/src/utils.rs

@@ -8,7 +8,7 @@ use gtk::prelude::*;
 use gtk::{IsA, Widget};
 
 use chrono::prelude::*;
-use crossbeam_channel::{unbounded, Sender};
+use crossbeam_channel::Sender;
 use failure::Error;
 use rayon;
 use regex::Regex;
@@ -25,6 +25,7 @@ use hammond_data::Source;
 use hammond_downloader::downloader;
 
 use std::collections::{HashMap, HashSet};
+use std::sync::mpsc::channel;
 use std::sync::{Arc, Mutex, RwLock};
 
 use app::Action;
@@ -188,7 +189,10 @@ fn refresh_feed<S>(source: Option<S>, sender: Sender<Action>) -> Result<(), Erro
 where
     S: IntoIterator<Item = Source> + Send + 'static,
 {
-    sender.send(Action::HeaderBarShowUpdateIndicator);
+    sender
+        .send(Action::HeaderBarShowUpdateIndicator)
+        .map_err(|err| error!("Action Sender: {}", err))
+        .ok();
 
     rayon::spawn(move || {
         if let Some(s) = source {
@@ -206,8 +210,14 @@ where
                 .ok();
         };
 
-        sender.send(Action::HeaderBarHideUpdateIndicator);
-        sender.send(Action::RefreshAllViews);
+        sender
+            .send(Action::HeaderBarHideUpdateIndicator)
+            .map_err(|err| error!("Action Sender: {}", err))
+            .ok();
+        sender
+            .send(Action::RefreshAllViews)
+            .map_err(|err| error!("Action Sender: {}", err))
+            .ok();
     });
     Ok(())
 }
@@ -226,15 +236,15 @@ 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?
-pub fn set_image_from_path(image: &gtk::Image, show_id: i32, size: u32) -> Result<(), Error> {
+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.
     // If the download succedes, there should be a quick return from the pixbuf cache_image
     // If it fails another download will be scheduled.
     if let Ok(guard) = COVER_DL_REGISTRY.read() {
-        if guard.contains(&show_id) {
+        if guard.contains(&podcast_id) {
             let callback = clone!(image => move || {
-                 let _ = set_image_from_path(&image, show_id, size);
+                 let _ = set_image_from_path(&image, podcast_id, size);
                  glib::Continue(false)
             });
             gtk::timeout_add(250, callback);
@@ -245,7 +255,7 @@ pub fn set_image_from_path(image: &gtk::Image, show_id: i32, size: u32) -> Resul
     if let Ok(hashmap) = CACHED_PIXBUFS.read() {
         // Check if the requested (cover + size) is already in the chache
         // and if so do an early return after that.
-        if let Some(guard) = hashmap.get(&(show_id, size)) {
+        if let Some(guard) = hashmap.get(&(podcast_id, size)) {
             guard
                 .lock()
                 .map_err(|err| format_err!("SendCell Mutex: {}", err))
@@ -260,25 +270,32 @@ pub fn set_image_from_path(image: &gtk::Image, show_id: i32, size: u32) -> Resul
         }
     }
 
-    let (sender, receiver) = unbounded();
+    let (sender, receiver) = channel();
     THREADPOOL.spawn(move || {
         if let Ok(mut guard) = COVER_DL_REGISTRY.write() {
-            guard.insert(show_id);
-            if let Ok(pd) = dbqueries::get_podcast_cover_from_id(show_id) {
-                sender.send(downloader::cache_image(&pd));
-            }
-            guard.remove(&show_id);
+            guard.insert(podcast_id);
+        }
+
+        if let Ok(pd) = dbqueries::get_podcast_cover_from_id(podcast_id) {
+            sender
+                .send(downloader::cache_image(&pd))
+                .map_err(|err| error!("Action Sender: {}", err))
+                .ok();
+        }
+
+        if let Ok(mut guard) = COVER_DL_REGISTRY.write() {
+            guard.remove(&podcast_id);
         }
     });
 
     let image = image.clone();
     let s = size as i32;
     gtk::timeout_add(25, move || {
-        if let Some(path) = receiver.try_recv() {
+        if let Ok(path) = receiver.try_recv() {
             if let Ok(path) = path {
                 if let Ok(px) = Pixbuf::new_from_file_at_scale(&path, s, s, true) {
                     if let Ok(mut hashmap) = CACHED_PIXBUFS.write() {
-                        hashmap.insert((show_id, size), Mutex::new(SendCell::new(px.clone())));
+                        hashmap.insert((podcast_id, size), Mutex::new(SendCell::new(px.clone())));
                         image.set_from_pixbuf(&px);
                     }
                 }
@@ -317,7 +334,7 @@ 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::ApplicationWindow, sender: &Sender<Action>) {
+pub fn on_import_clicked(window: &gtk::Window, sender: &Sender<Action>) {
     use glib::translate::ToGlib;
     use gtk::{FileChooserAction, FileChooserNative, FileFilter, ResponseType};
 
@@ -356,12 +373,16 @@ pub fn on_import_clicked(window: &gtk::ApplicationWindow, sender: &Sender<Action
                         refresh(Some(sources), sender)
                     } else {
                         let text = String::from("Failed to parse the Imported file");
-                        sender.send(Action::ErrorNotification(text));
+                        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));
+                sender.send(Action::ErrorNotification(text))
+                    .map_err(|err| error!("Action Sender: {}", err))
+                    .ok();
             }
         }
 

hammond-gtk/src/widgets/aboutdialog.rs

@@ -4,7 +4,7 @@ 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::ApplicationWindow) {
+pub fn about_dialog(window: &gtk::Window) {
     // Feel free to add yourself if you contribured.
     let authors = &[
         "Constantin Nickel",
@@ -26,7 +26,7 @@ pub fn about_dialog(window: &gtk::ApplicationWindow) {
     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.4.0");
+    dialog.set_version("0.3.4");
     dialog.set_program_name("Hammond");
     // TODO: Need a wiki page first.
     // dialog.set_website("https://wiki.gnome.org/Design/Apps/Potential/Podcasts");

hammond-gtk/src/widgets/episode.rs

@@ -7,16 +7,16 @@ use chrono::prelude::*;
 use crossbeam_channel::Sender;
 use failure::Error;
 use humansize::{file_size_opts as size_opts, FileSize};
-#[allow(unused_imports)]
 use open;
 
 use hammond_data::dbqueries;
 use hammond_data::utils::get_download_folder;
-use hammond_data::EpisodeWidgetModel;
+use hammond_data::EpisodeWidgetQuery;
 
 use app::Action;
 use manager;
 
+use std::path::Path;
 use std::rc::Rc;
 use std::sync::{Arc, Mutex, TryLockError};
 
@@ -65,10 +65,11 @@ struct Buttons {
     play: gtk::Button,
     download: gtk::Button,
     cancel: gtk::Button,
+    desc: gtk::Button,
 }
 
 impl InfoLabels {
-    fn init(&self, episode: &EpisodeWidgetModel) {
+    fn init(&self, episode: &EpisodeWidgetQuery) {
         // Set the title label state.
         self.set_title(episode);
 
@@ -82,7 +83,7 @@ impl InfoLabels {
         self.set_size(episode.length())
     }
 
-    fn set_title(&self, episode: &EpisodeWidgetModel) {
+    fn set_title(&self, episode: &EpisodeWidgetQuery) {
         self.title.set_text(episode.title());
 
         if episode.played().is_some() {
@@ -168,6 +169,7 @@ impl Default for EpisodeWidget {
         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 info_container = builder.get_object("info_container").unwrap();
         let title = builder.get_object("title_label").unwrap();
@@ -198,6 +200,7 @@ impl Default for EpisodeWidget {
                 play,
                 download,
                 cancel,
+                desc: desc_button,
             },
             progressbar,
             container,
@@ -206,13 +209,39 @@ impl Default for EpisodeWidget {
 }
 
 impl EpisodeWidget {
-    pub fn new(episode: &EpisodeWidgetModel, sender: &Sender<Action>) -> Rc<Self> {
+    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
+    }
+
+    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(())
+        }
     }
 
     // fn init(widget: Rc<Self>, sender: &Sender<Action>) {}
@@ -297,7 +326,7 @@ impl EpisodeWidget {
     /// -------------------
     fn determine_buttons_state(
         widget: &Rc<Self>,
-        episode: &EpisodeWidgetModel,
+        episode: &EpisodeWidgetQuery,
         sender: &Sender<Action>,
     ) -> Result<(), Error> {
         // Reset the buttons state no matter the glade file.
@@ -428,32 +457,44 @@ impl EpisodeWidget {
     }
 }
 
-fn on_download_clicked(ep: &EpisodeWidgetModel, sender: &Sender<Action>) -> Result<(), Error> {
-    let pd = dbqueries::get_podcast_from_id(ep.show_id())?;
+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())?;
 
     // Start a new download.
     manager::add(ep.rowid(), download_fold)?;
 
     // Update Views
-    sender.send(Action::RefreshEpisodesViewBGR);
-    Ok(())
+    sender
+        .send(Action::RefreshEpisodesViewBGR)
+        .map_err(From::from)
 }
 
 fn on_play_bttn_clicked(
     widget: &Rc<EpisodeWidget>,
-    episode: &mut EpisodeWidgetModel,
+    episode: &mut EpisodeWidgetQuery,
     sender: &Sender<Action>,
 ) -> Result<(), Error> {
-    // Mark played
+    open_uri(episode.rowid())?;
     episode.set_played_now()?;
-    // Grey out the title
-    widget.info.set_title(&episode);
 
-    // Play the episode
-    sender.send(Action::InitEpisode(episode.rowid()));
-    // Refresh background views to match the normal/greyout title state
-    sender.send(Action::RefreshEpisodesViewBGR);
+    widget.info.set_title(&episode);
+    sender
+        .send(Action::RefreshEpisodesViewBGR)
+        .map_err(From::from)
+}
+
+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."))?;
+
+    if Path::new(&uri).exists() {
+        info!("Opening {}", uri);
+        open::that(&uri)?;
+    } else {
+        bail!("File \"{}\" does not exist.", uri);
+    }
+
     Ok(())
 }
 

hammond-gtk/src/widgets/home_view.rs

@@ -6,7 +6,7 @@ use gtk::prelude::*;
 
 use crossbeam_channel::Sender;
 use hammond_data::dbqueries;
-use hammond_data::EpisodeWidgetModel;
+use hammond_data::EpisodeWidgetQuery;
 use send_cell::SendCell;
 
 use app::Action;
@@ -93,7 +93,7 @@ impl HomeView {
         let now_utc = Utc::now();
 
         let view_ = view.clone();
-        let func = move |ep: EpisodeWidgetModel| {
+        let func = move |ep: EpisodeWidgetQuery| {
             let epoch = ep.epoch();
             let widget = HomeEpisode::new(&ep, &sender);
 
@@ -197,12 +197,12 @@ impl Default for HomeEpisode {
 }
 
 impl HomeEpisode {
-    fn new(episode: &EpisodeWidgetModel, sender: &Sender<Action>) -> HomeEpisode {
+    fn new(episode: &EpisodeWidgetQuery, sender: &Sender<Action>) -> HomeEpisode {
         let builder =
             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.show_id();
+        let pid = episode.podcast_id();
         let ep = EpisodeWidget::new(episode, sender);
 
         let view = HomeEpisode {
@@ -215,15 +215,15 @@ impl HomeEpisode {
         view
     }
 
-    fn init(&self, show_id: i32) {
-        self.set_cover(show_id)
+    fn init(&self, podcast_id: i32) {
+        self.set_cover(podcast_id)
             .map_err(|err| error!("Failed to set a cover: {}", err))
             .ok();
 
         self.container.pack_start(&self.episode, true, true, 6);
     }
 
-    fn set_cover(&self, show_id: i32) -> Result<(), Error> {
-        utils::set_image_from_path(&self.image, show_id, 64)
+    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

@@ -3,7 +3,6 @@ pub mod appnotif;
 mod empty;
 mod episode;
 mod home_view;
-pub mod player;
 mod show;
 mod shows_view;
 

hammond-gtk/src/widgets/player.rs

@@ -1,460 +0,0 @@
-use gst::prelude::*;
-use gst::ClockTime;
-use gst_player;
-
-use gtk;
-use gtk::prelude::*;
-
-use gio::{File, FileExt};
-use glib::SignalHandlerId;
-
-use chrono::NaiveTime;
-use crossbeam_channel::Sender;
-use failure::Error;
-use send_cell::SendCell;
-
-use hammond_data::{dbqueries, USER_AGENT};
-use hammond_data::{EpisodeWidgetModel, ShowCoverModel};
-
-use app::Action;
-use utils::set_image_from_path;
-
-use std::ops::Deref;
-use std::path::Path;
-use std::rc::Rc;
-
-#[derive(Debug, Clone, Copy)]
-enum SeekDirection {
-    Backwards,
-    Forward,
-}
-
-trait PlayerExt {
-    fn play(&self);
-    fn pause(&self);
-    fn stop(&self);
-    fn seek(&self, offset: ClockTime, direction: SeekDirection);
-    fn fast_forward(&self);
-    fn rewind(&self);
-    fn set_playback_rate(&self, f64);
-}
-
-#[derive(Debug, Clone)]
-struct PlayerInfo {
-    container: gtk::Box,
-    show: gtk::Label,
-    episode: gtk::Label,
-    cover: gtk::Image,
-}
-
-impl PlayerInfo {
-    // FIXME: create a Diesel Model of the joined episode and podcast query instead
-    fn init(&self, episode: &EpisodeWidgetModel, podcast: &ShowCoverModel) {
-        self.set_cover_image(podcast);
-        self.set_show_title(podcast);
-        self.set_episode_title(episode);
-    }
-
-    fn set_episode_title(&self, episode: &EpisodeWidgetModel) {
-        self.episode.set_text(episode.title());
-        self.episode.set_tooltip_text(episode.title());
-    }
-
-    fn set_show_title(&self, show: &ShowCoverModel) {
-        self.show.set_text(show.title());
-        self.show.set_tooltip_text(show.title());
-    }
-
-    fn set_cover_image(&self, show: &ShowCoverModel) {
-        set_image_from_path(&self.cover, show.id(), 34)
-            .map_err(|err| error!("Player Cover: {}", err))
-            .ok();
-    }
-}
-
-#[derive(Debug, Clone)]
-struct PlayerTimes {
-    container: gtk::Box,
-    progressed: gtk::Label,
-    duration: gtk::Label,
-    separator: gtk::Label,
-    slider: gtk::Scale,
-    slider_update: Rc<SignalHandlerId>,
-}
-
-#[derive(Debug, Clone, Copy)]
-struct Duration(ClockTime);
-
-impl Deref for Duration {
-    type Target = ClockTime;
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-#[derive(Debug, Clone, Copy)]
-struct Position(ClockTime);
-
-impl Deref for Position {
-    type Target = ClockTime;
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl PlayerTimes {
-    /// Update the duration `gtk::Label` and the max range of the `gtk::SclaeBar`.
-    pub fn on_duration_changed(&self, duration: Duration) {
-        let seconds = duration.seconds().map(|v| v as f64).unwrap_or(0.0);
-
-        self.slider.block_signal(&self.slider_update);
-        self.slider.set_range(0.0, seconds);
-        self.slider.unblock_signal(&self.slider_update);
-
-        self.duration.set_text(&format_duration(seconds as u32));
-    }
-
-    /// Update the `gtk::SclaeBar` when the pipeline position is changed.
-    pub fn on_position_updated(&self, position: Position) {
-        let seconds = position.seconds().map(|v| v as f64).unwrap_or(0.0);
-
-        self.slider.block_signal(&self.slider_update);
-        self.slider.set_value(seconds);
-        self.slider.unblock_signal(&self.slider_update);
-
-        self.progressed.set_text(&format_duration(seconds as u32));
-    }
-}
-
-fn format_duration(seconds: u32) -> String {
-    let time = NaiveTime::from_num_seconds_from_midnight(seconds, 0);
-
-    if seconds >= 3600 {
-        time.format("%T").to_string()
-    } else {
-        time.format("%M:%S").to_string()
-    }
-}
-
-#[derive(Debug, Clone)]
-struct PlayerRate {
-    radio150: gtk::RadioButton,
-    radio125: gtk::RadioButton,
-    radio_normal: gtk::RadioButton,
-    popover: gtk::Popover,
-    btn: gtk::MenuButton,
-    label: gtk::Label,
-}
-
-#[derive(Debug, Clone)]
-struct PlayerControls {
-    container: gtk::Box,
-    play: gtk::Button,
-    pause: gtk::Button,
-    forward: gtk::Button,
-    rewind: gtk::Button,
-}
-
-#[derive(Debug, Clone)]
-pub struct PlayerWidget {
-    pub action_bar: gtk::ActionBar,
-    player: gst_player::Player,
-    controls: PlayerControls,
-    timer: PlayerTimes,
-    info: PlayerInfo,
-    rate: PlayerRate,
-}
-
-impl Default for PlayerWidget {
-    fn default() -> Self {
-        let dispatcher = gst_player::PlayerGMainContextSignalDispatcher::new(None);
-        let player = gst_player::Player::new(
-            None,
-            // Use the gtk main thread
-            Some(&dispatcher.upcast::<gst_player::PlayerSignalDispatcher>()),
-        );
-
-        let mut config = player.get_config();
-        config.set_user_agent(USER_AGENT);
-        config.set_position_update_interval(250);
-        player.set_config(config).unwrap();
-
-        let builder = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/player_toolbar.ui");
-        let action_bar = builder.get_object("action_bar").unwrap();
-
-        let buttons = builder.get_object("buttons").unwrap();
-        let play = builder.get_object("play_button").unwrap();
-        let pause = builder.get_object("pause_button").unwrap();
-        let forward = builder.get_object("ff_button").unwrap();
-        let rewind = builder.get_object("rewind_button").unwrap();
-
-        let controls = PlayerControls {
-            container: buttons,
-            play,
-            pause,
-            forward,
-            rewind,
-        };
-
-        let timer_container = builder.get_object("timer").unwrap();
-        let progressed = builder.get_object("progress_time_label").unwrap();
-        let duration = builder.get_object("total_duration_label").unwrap();
-        let separator = builder.get_object("separator").unwrap();
-        let slider: gtk::Scale = builder.get_object("seek").unwrap();
-        slider.set_range(0.0, 1.0);
-        let slider_update = Rc::new(Self::connect_update_slider(&slider, &player));
-        let timer = PlayerTimes {
-            container: timer_container,
-            progressed,
-            duration,
-            separator,
-            slider,
-            slider_update,
-        };
-
-        let labels = builder.get_object("info").unwrap();
-        let show = builder.get_object("show_label").unwrap();
-        let episode = builder.get_object("episode_label").unwrap();
-        let cover = builder.get_object("show_cover").unwrap();
-        let info = PlayerInfo {
-            container: labels,
-            show,
-            episode,
-            cover,
-        };
-
-        let radio150 = builder.get_object("rate_1_50").unwrap();
-        let radio125 = builder.get_object("rate_1_25").unwrap();
-        let radio_normal = builder.get_object("normal_rate").unwrap();
-        let popover = builder.get_object("rate_popover").unwrap();
-        let btn = builder.get_object("rate_button").unwrap();
-        let label = builder.get_object("rate_label").unwrap();
-        let rate = PlayerRate {
-            radio150,
-            radio125,
-            radio_normal,
-            popover,
-            label,
-            btn,
-        };
-
-        PlayerWidget {
-            player,
-            action_bar,
-            controls,
-            timer,
-            info,
-            rate,
-        }
-    }
-}
-
-impl PlayerWidget {
-    pub fn new(sender: &Sender<Action>) -> Rc<Self> {
-        let w = Rc::new(Self::default());
-        Self::init(&w, sender);
-        w
-    }
-
-    fn init(s: &Rc<Self>, sender: &Sender<Action>) {
-        Self::connect_control_buttons(s);
-        Self::connect_rate_buttons(s);
-        Self::connect_gst_signals(s, sender);
-    }
-
-    /// Connect the `PlayerControls` buttons to the `PlayerExt` methods.
-    fn connect_control_buttons(s: &Rc<Self>) {
-        let weak = Rc::downgrade(s);
-
-        // Connect the play button to the gst Player.
-        s.controls.play.connect_clicked(clone!(weak => move |_| {
-             weak.upgrade().map(|p| p.play());
-        }));
-
-        // Connect the pause button to the gst Player.
-        s.controls.pause.connect_clicked(clone!(weak => move |_| {
-            weak.upgrade().map(|p| p.pause());
-        }));
-
-        // Connect the rewind button to the gst Player.
-        s.controls.rewind.connect_clicked(clone!(weak => move |_| {
-            weak.upgrade().map(|p| p.rewind());
-        }));
-
-        // Connect the fast-forward button to the gst Player.
-        s.controls.forward.connect_clicked(clone!(weak => move |_| {
-            weak.upgrade().map(|p| p.fast_forward());
-        }));
-    }
-
-    #[cfg_attr(rustfmt, rustfmt_skip)]
-    fn connect_gst_signals(s: &Rc<Self>, sender: &Sender<Action>) {
-        // Log gst warnings.
-        s.player.connect_warning(move |_, warn| warn!("gst warning: {}", warn));
-
-        // Log gst errors.
-        s.player.connect_error(clone!(sender => move |_, error| {
-            // FIXME: should never occur and should not be user facing.
-            sender.send(Action::ErrorNotification(format!("Player Error: {}", error)));
-        }));
-
-        // The followign callbacks require `Send` but are handled by the gtk main loop
-        let weak = SendCell::new(Rc::downgrade(s));
-
-        // Update the duration label and the slider
-        s.player.connect_duration_changed(clone!(weak => move |_, clock| {
-            weak.borrow()
-                .upgrade()
-                .map(|p| p.timer.on_duration_changed(Duration(clock)));
-        }));
-
-        // Update the position label and the slider
-        s.player.connect_position_updated(clone!(weak => move |_, clock| {
-            weak.borrow()
-                .upgrade()
-                .map(|p| p.timer.on_position_updated(Position(clock)));
-        }));
-
-        // Reset the slider to 0 and show a play button
-        s.player.connect_end_of_stream(clone!(weak => move |_| {
-             weak.borrow()
-                 .upgrade()
-                 .map(|p| p.stop());
-        }));
-    }
-
-    #[cfg_attr(rustfmt, rustfmt_skip)]
-    fn connect_rate_buttons(s: &Rc<Self>) {
-        let weak = Rc::downgrade(s);
-
-        s.rate
-            .radio_normal
-            .connect_toggled(clone!(weak => move |_| {
-                weak.upgrade().map(|p| p.on_rate_changed(1.00));
-            }));
-
-        s.rate
-            .radio125
-            .connect_toggled(clone!(weak => move |_| {
-                weak.upgrade().map(|p| p.on_rate_changed(1.25));
-            }));
-
-        s.rate
-            .radio150
-            .connect_toggled(clone!(weak => move |_| {
-                weak.upgrade().map(|p| p.on_rate_changed(1.50));
-            }));
-    }
-
-    fn on_rate_changed(&self, rate: f64) {
-        self.set_playback_rate(rate);
-        self.rate.label.set_text(&format!("{:.2}x", rate));
-    }
-
-    fn reveal(&self) {
-        self.action_bar.show();
-    }
-
-    pub fn initialize_episode(&self, rowid: i32) -> Result<(), Error> {
-        let ep = dbqueries::get_episode_widget_from_rowid(rowid)?;
-        let pd = dbqueries::get_podcast_cover_from_id(ep.show_id())?;
-
-        self.info.init(&ep, &pd);
-        // Currently that will always be the case since the play button is
-        // only shown if the file is downloaded
-        if let Some(ref path) = ep.local_uri() {
-            if Path::new(path).exists() {
-                // path is an absolute fs path ex. "foo/bar/baz".
-                // Convert it so it will have a "file:///"
-                // FIXME: convert it properly
-                if let Some(uri) = File::new_for_path(path).get_uri() {
-                    // play the file
-                    self.player.set_uri(&uri);
-                    self.play();
-                    return Ok(());
-                }
-            }
-            // TODO: log an error
-        }
-
-        // FIXME: Stream stuff
-        // unimplemented!()
-        Ok(())
-    }
-
-    fn connect_update_slider(slider: &gtk::Scale, player: &gst_player::Player) -> SignalHandlerId {
-        slider.connect_value_changed(clone!(player => move |slider| {
-            let value = slider.get_value() as u64;
-            player.seek(ClockTime::from_seconds(value));
-        }))
-    }
-}
-
-impl PlayerExt for PlayerWidget {
-    fn play(&self) {
-        self.reveal();
-
-        self.controls.pause.show();
-        self.controls.play.hide();
-
-        self.player.play();
-    }
-
-    fn pause(&self) {
-        self.controls.pause.hide();
-        self.controls.play.show();
-
-        self.player.pause();
-
-        // Only rewind on pause if the stream position is passed a certain point.
-        if let Some(sec) = self.player.get_position().seconds() {
-            if sec >= 90 {
-                self.seek(ClockTime::from_seconds(5), SeekDirection::Backwards);
-            }
-        }
-    }
-
-    #[cfg_attr(rustfmt, rustfmt_skip)]
-    fn stop(&self) {
-        self.controls.pause.hide();
-        self.controls.play.show();
-
-        self.player.stop();
-
-        // Reset the slider bar to the start
-        self.timer.on_position_updated(Position(ClockTime::from_seconds(0)));
-    }
-
-    // Adapted from https://github.com/philn/glide/blob/b52a65d99daeab0b487f79a0e1ccfad0cd433e22/src/player_context.rs#L219-L245
-    fn seek(&self, offset: ClockTime, direction: SeekDirection) {
-        let position = self.player.get_position();
-        if position.is_none() || offset.is_none() {
-            return;
-        }
-
-        let duration = self.player.get_duration();
-        let destination = match direction {
-            SeekDirection::Backwards if position >= offset => Some(position - offset),
-            SeekDirection::Forward if !duration.is_none() && position + offset <= duration => {
-                Some(position + offset)
-            }
-            _ => None,
-        };
-
-        destination.map(|d| self.player.seek(d));
-    }
-
-    // FIXME: make the interval a GSetting
-    fn rewind(&self) {
-        self.seek(ClockTime::from_seconds(10), SeekDirection::Backwards)
-    }
-
-    // FIXME: make the interval a GSetting
-    fn fast_forward(&self) {
-        self.seek(ClockTime::from_seconds(10), SeekDirection::Forward)
-    }
-
-    fn set_playback_rate(&self, rate: f64) {
-        self.player.set_rate(rate);
-    }
-}

hammond-gtk/src/widgets/show.rs

@@ -2,16 +2,16 @@ use glib;
 use gtk;
 use gtk::prelude::*;
 
-use crossbeam_channel::Sender;
+use crossbeam_channel::{SendError, Sender};
 use failure::Error;
-use html2text;
+use html2pango::markup_from_raw;
 use open;
 use rayon;
 use send_cell::SendCell;
 
 use hammond_data::dbqueries;
 use hammond_data::utils::delete_show;
-use hammond_data::Show;
+use hammond_data::Podcast;
 
 use app::Action;
 use utils::{self, lazy_load};
@@ -36,7 +36,7 @@ pub struct ShowWidget {
     settings: gtk::MenuButton,
     unsub: gtk::Button,
     episodes: gtk::ListBox,
-    show_id: Option<i32>,
+    podcast_id: Option<i32>,
 }
 
 impl Default for ShowWidget {
@@ -61,13 +61,13 @@ impl Default for ShowWidget {
             link,
             settings,
             episodes,
-            show_id: None,
+            podcast_id: None,
         }
     }
 }
 
 impl ShowWidget {
-    pub fn new(pd: Arc<Show>, sender: Sender<Action>) -> Rc<ShowWidget> {
+    pub fn new(pd: Arc<Podcast>, sender: Sender<Action>) -> Rc<ShowWidget> {
         let mut pdw = ShowWidget::default();
         pdw.init(&pd, &sender);
         let pdw = Rc::new(pdw);
@@ -78,7 +78,7 @@ impl ShowWidget {
         pdw
     }
 
-    pub fn init(&mut self, pd: &Arc<Show>, sender: &Sender<Action>) {
+    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");
 
         self.unsub
@@ -87,7 +87,7 @@ impl ShowWidget {
         }));
 
         self.set_description(pd.description());
-        self.show_id = Some(pd.id());
+        self.podcast_id = Some(pd.id());
 
         self.set_cover(&pd)
             .map_err(|err| error!("Failed to set a cover: {}", err))
@@ -118,14 +118,13 @@ impl ShowWidget {
     }
 
     /// Set the show cover.
-    fn set_cover(&self, pd: &Arc<Show>) -> Result<(), Error> {
+    fn set_cover(&self, pd: &Arc<Podcast>) -> Result<(), Error> {
         utils::set_image_from_path(&self.cover, pd.id(), 256)
     }
 
     /// Set the descripton text.
     fn set_description(&self, text: &str) {
-        self.description
-            .set_markup(&html2text::from_read(text.as_bytes(), 70));
+        self.description.set_markup(&markup_from_raw(text));
     }
 
     /// Save the scrollabar vajustment to the cache.
@@ -143,7 +142,7 @@ impl ShowWidget {
     }
 
     /// Set scrolled window vertical adjustment.
-    fn set_vadjustment(&self, pd: &Arc<Show>) -> Result<(), Error> {
+    fn set_vadjustment(&self, pd: &Arc<Podcast>) -> Result<(), Error> {
         let guard = SHOW_WIDGET_VALIGNMENT
             .lock()
             .map_err(|err| format_err!("Failed to lock widget align mutex: {}", err))?;
@@ -166,18 +165,19 @@ impl ShowWidget {
         Ok(())
     }
 
-    pub fn show_id(&self) -> Option<i32> {
-        self.show_id
+    pub fn podcast_id(&self) -> Option<i32> {
+        self.podcast_id
     }
 }
 
 /// Populate the listbox with the shows episodes.
 fn populate_listbox(
     show: &Rc<ShowWidget>,
-    pd: Arc<Show>,
+    pd: Arc<Podcast>,
     sender: Sender<Action>,
 ) -> Result<(), Error> {
     use crossbeam_channel::bounded;
+    use crossbeam_channel::TryRecvError::*;
 
     let count = dbqueries::get_pd_episodes_count(&pd)?;
 
@@ -186,7 +186,7 @@ fn populate_listbox(
         let episodes = dbqueries::get_pd_episodeswidgets(&pd).unwrap();
         // The receiver can be dropped if there's an early return
         // like on show without episodes for example.
-        sender_.send(episodes);
+        sender_.send(episodes).ok();
     }));
 
     if count == 0 {
@@ -199,8 +199,9 @@ fn populate_listbox(
     let show_ = show.clone();
     gtk::idle_add(move || {
         let episodes = match receiver.try_recv() {
-            Some(e) => e,
-            None => return glib::Continue(true),
+            Ok(e) => e,
+            Err(Empty) => return glib::Continue(true),
+            Err(Disconnected) => return glib::Continue(false),
         };
 
         let list = show_.episodes.clone();
@@ -223,41 +224,47 @@ fn populate_listbox(
     Ok(())
 }
 
-fn on_unsub_button_clicked(pd: Arc<Show>, unsub_button: &gtk::Button, sender: &Sender<Action>) {
+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.
     unsub_button.set_sensitive(false);
 
-    sender.send(Action::RemoveShow(pd));
+    let wrap = || -> Result<(), SendError<_>> {
+        sender.send(Action::RemoveShow(pd))?;
 
-    sender.send(Action::HeaderBarNormal);
-    sender.send(Action::ShowShowsAnimated);
-    // Queue a refresh after the switch to avoid blocking the db.
-    sender.send(Action::RefreshShowsView);
-    sender.send(Action::RefreshEpisodesView);
+        sender.send(Action::HeaderBarNormal)?;
+        sender.send(Action::ShowShowsAnimated)?;
+        // Queue a refresh after the switch to avoid blocking the db.
+        sender.send(Action::RefreshShowsView)?;
+        sender.send(Action::RefreshEpisodesView)?;
+        Ok(())
+    };
 
+    wrap().map_err(|err| error!("Action Sender: {}", err)).ok();
     unsub_button.set_sensitive(true);
 }
 
-fn on_played_button_clicked(pd: Arc<Show>, episodes: &gtk::ListBox, sender: &Sender<Action>) {
+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.");
         warn!("RUN WHILE YOU STILL CAN!");
     }
 
-    sender.send(Action::MarkAllPlayerNotification(pd))
+    sender
+        .send(Action::MarkAllPlayerNotification(pd))
+        .map_err(|err| error!("Action Sender: {}", err))
+        .ok();
 }
 
-fn mark_all_watched(pd: &Show, sender: &Sender<Action>) -> Result<(), Error> {
+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
     // So we will need to refresh again after it's done.
-    sender.send(Action::RefreshWidgetIfSame(pd.id()));
-    sender.send(Action::RefreshEpisodesView);
-    Ok(())
+    sender.send(Action::RefreshWidgetIfSame(pd.id()))?;
+    sender.send(Action::RefreshEpisodesView).map_err(From::from)
 }
 
-pub fn mark_all_notif(pd: Arc<Show>, sender: &Sender<Action>) -> InAppNotification {
+pub fn mark_all_notif(pd: Arc<Podcast>, sender: &Sender<Action>) -> InAppNotification {
     let id = pd.id();
     let callback = clone!(sender => move || {
         mark_all_watched(&pd, &sender)
@@ -266,12 +273,17 @@ pub fn mark_all_notif(pd: Arc<Show>, sender: &Sender<Action>) -> InAppNotificati
         glib::Continue(false)
     });
 
-    let undo_callback = clone!(sender => move || sender.send(Action::RefreshWidgetIfSame(id)));
+    let undo_callback = clone!(sender => move || {
+        sender.send(Action::RefreshWidgetIfSame(id))
+            .map_err(|err| error!("Action Sender: {}", err))
+            .ok();
+    });
+
     let text = "Marked all episodes as listened";
     InAppNotification::new(text, callback, undo_callback, UndoState::Shown)
 }
 
-pub fn remove_show_notif(pd: Arc<Show>, sender: Sender<Action>) -> InAppNotification {
+pub fn remove_show_notif(pd: Arc<Podcast>, sender: Sender<Action>) -> InAppNotification {
     let text = format!("Unsubscribed from {}", pd.title());
 
     utils::ignore_show(pd.id())
@@ -292,17 +304,20 @@ pub fn remove_show_notif(pd: Arc<Show>, sender: Sender<Action>) -> InAppNotifica
                 .map_err(|_| error!("Failed to delete {}", pd.title()))
                 .ok();
 
-            sender.send(Action::RefreshEpisodesView);
+            sender.send(Action::RefreshEpisodesView).ok();
         }));
         glib::Continue(false)
     });
 
+    let undo_wrap = move || -> Result<(), Error> {
+        utils::uningore_show(pd.id())?;
+        sender.send(Action::RefreshShowsView)?;
+        sender.send(Action::RefreshEpisodesView)?;
+        Ok(())
+    };
+
     let undo_callback = move || {
-        utils::uningore_show(pd.id())
-            .map_err(|err| error!("{}", err))
-            .ok();
-        sender.send(Action::RefreshShowsView);
-        sender.send(Action::RefreshEpisodesView);
+        undo_wrap().map_err(|err| error!("{}", err)).ok();
     };
 
     InAppNotification::new(&text, callback, undo_callback, UndoState::Shown)

hammond-gtk/src/widgets/shows_view.rs

@@ -6,7 +6,7 @@ use failure::Error;
 use send_cell::SendCell;
 
 use hammond_data::dbqueries;
-use hammond_data::Show;
+use hammond_data::Podcast;
 
 use app::Action;
 use utils::{self, get_ignored_shows, lazy_load, set_image_from_path};
@@ -45,7 +45,7 @@ impl ShowsView {
     pub fn new(sender: Sender<Action>) -> Result<Rc<Self>, Error> {
         let pop = Rc::new(ShowsView::default());
         pop.init(sender);
-        // Populate the flowbox with the Shows.
+        // Populate the flowbox with the Podcasts.
         populate_flowbox(&pop)?;
         Ok(pop)
     }
@@ -115,9 +115,9 @@ fn on_child_activate(child: &gtk::FlowBoxChild, sender: &Sender<Action>) -> Resu
         .parse::<i32>()?;
     let pd = Arc::new(dbqueries::get_podcast_from_id(id)?);
 
-    sender.send(Action::HeaderBarShowTile(pd.title().into()));
-    sender.send(Action::ReplaceWidget(pd));
-    sender.send(Action::ShowWidgetAnimated);
+    sender.send(Action::HeaderBarShowTile(pd.title().into()))?;
+    sender.send(Action::ReplaceWidget(pd))?;
+    sender.send(Action::ShowWidgetAnimated)?;
     Ok(())
 }
 
@@ -147,13 +147,13 @@ impl Default for ShowsChild {
 }
 
 impl ShowsChild {
-    pub fn new(pd: &Show) -> ShowsChild {
+    pub fn new(pd: &Podcast) -> ShowsChild {
         let child = ShowsChild::default();
         child.init(pd);
         child
     }
 
-    fn init(&self, pd: &Show) {
+    fn init(&self, pd: &Podcast) {
         self.container.set_tooltip_text(pd.title());
         WidgetExt::set_name(&self.child, &pd.id().to_string());
 
@@ -162,7 +162,7 @@ impl ShowsChild {
             .ok();
     }
 
-    fn set_cover(&self, show_id: i32) -> Result<(), Error> {
-        set_image_from_path(&self.cover, show_id, 256)
+    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.4.0',
+  version: '0.3.4',
   license: 'GPLv3',
 )
 

org.gnome.Hammond.json

@@ -20,7 +20,6 @@
         "--share=ipc",
         "--socket=x11",
         "--socket=wayland",
-        "--socket=pulseaudio",
         "--talk-name=org.freedesktop.Desktop"
     ],
     "build-options" : {

scripts/test.sh

@@ -1,26 +0,0 @@
-#!/usr/bin/sh
-
-file="/.flatpak-info"
-if [ -f "$file" ]
-then
-    # If you open a build terminal with gnome-builder
-    source /usr/lib/sdk/rust-stable/enable.sh
-    export CARGO_HOME=target/cargo-home/
-fi
-
-export RUSTFLAGS="--cfg rayon_unstable"
-export RUSTBACKTRACE="1"
-
-rustc --version
-cargo --version
-# cargo fmt --version
-
-cargo build --all && \
-cargo test -- --test-threads=1 && \
-cargo test -- --test-threads=1 --ignored
-
-# Rustfmt from the flatpak bundle tends to be outdated,
-# will probably get better when rustfmt stabilizes
-# cargo fmt --all -- --write-mode=diff
-
-# cargo bench large