AboutEpisode: Initial commit.

.gitignore

@@ -1,23 +1,9 @@
 target/
 **/*.rs.bk
+Cargo.lock
 .vscode
 *.ui~
 resources.gresource
-_build/
-build/
+_build
 vendor/
-.criterion/
-org.gnome.*.json~
-podcasts-gtk/po/gnome-podcasts.pot
-
-# scripts/test.sh
-target_*/
-
-# flatpak-builder stuff
-.flatpak-builder/
-app/
-repo/
-
-# Files configured by meson
-podcasts-gtk/src/config.rs
-podcasts-gtk/src/static_resource.rs
+.criterion

.gitlab-ci.yml

@@ -1,30 +1,144 @@
-include:
-  - project: 'gnome/citemplates'
-    file: 'flatpak/flatpak-ci-initiative-sdk-extensions.yml'
-    # ref: ''
+stages:
+  - test
+  - lint
+  - review
+
+variables:
+    BUNDLE: "hammond-dev.flatpak"
+
+.cargo_cache_template: &cargo_cache
+    cache:
+        # JOB_NAME - Each job will have it's own cache
+        # COMMIT_REF_SLUG = Lowercase name of the branch
+        # ^ Keep diffrerent caches for each branch
+        key: "$CI_JOB_NAME"
+        paths:
+            - target/
+            - .cargo_cache/
+
+.cargo_test_template: &cargo_test
+    stage: test
+
+    variables:
+        RUSTFLAGS: "--cfg rayon_unstable"
+        RUST_BACKTRACE: "FULL"
+
+    before_script:
+        - apt-get update -yqq
+        - 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
+        # Override the CARGO_HOME variable to force it location
+        - export CARGO_HOME="${PWD}/.cargo_cache"
+    script:
+        - rustc -Vv && cargo -Vv
+        # Force regeneration of gresources regardless of artifacts chage
+        - cd hammond-gtk/resources/ && glib-compile-resources --generate resources.xml && cd ../../
+
+        - cargo build
+        - cargo test -- --test-threads=1
+        - cargo test -- --test-threads=1 --ignored
+    <<: *cargo_cache
+
+rust:stable:
+    # https://hub.docker.com/_/rust/
+    image: "rust"
+    <<: *cargo_test
+
+rust:nightly:
+    # https://hub.docker.com/r/rustlang/rust/
+    image: "rustlang/rust:nightly"
+    <<: *cargo_test
+    only:
+        - schedule
+        - web
 
 flatpak:
-  image: 'registry.gitlab.gnome.org/gnome/gnome-runtime-images/rust_bundle:3.36'
-  variables:
-    MANIFEST_PATH: "org.gnome.Podcasts.Devel.json"
-    FLATPAK_MODULE: "gnome-podcasts"
-    MESON_ARGS: "-Dprofile=development"
-    APP_ID: "org.gnome.Podcasts.Devel"
-    RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo"
-    BUNDLE: "org.gnome.Podcasts.Devel.flatpak"
-  extends: '.flatpak'
+    image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/rust_bundle:3.28
+    stage: test
+    script:
+        - flatpak-builder --stop-at=hammond app org.gnome.Hammond.json
+        # https://gitlab.gnome.org/World/hammond/issues/55
+        # Force regeneration of gresources regardless of artifacts chage
+        - flatpak-builder --run app org.gnome.Hammond.json glib-compile-resources --sourcedir=hammond-gtk/resources/ hammond-gtk/resources/resources.xml
 
-# Configure and run rustfmt
+        # Build the flatpak repo
+        - flatpak-builder --run app org.gnome.Hammond.json meson --prefix=/app --libdir=/app/lib _build
+        - flatpak-builder --run app org.gnome.Hammond.json ninja -C _build install
+        - flatpak-builder --finish-only app org.gnome.Hammond.json
+        - flatpak build-export repo app
+
+        # Create a flatpak bundle
+        - flatpak build-bundle repo ${BUNDLE} org.gnome.Hammond
+        # Run the tests
+        # - flatpak-builder --run app org.gnome.Hammond.json cargo test -- --test-threads=1
+        # - flatpak-builder --run app org.gnome.Hammond.json cargo test -- --test-threads=1 --ignored
+
+    artifacts:
+        paths:
+            - $BUNDLE
+        expire_in: 30 days
+
+    cache:
+        # JOB_NAME - Each job will have it's own cache
+        # COMMIT_REF_SLUG = Lowercase name of the branch
+        # ^ Keep diffrerent caches for each branch
+        key: "$CI_JOB_NAME"
+        paths:
+          - .flatpak-builder/cache/
+          - target/
+
+review:
+    stage: review
+    dependencies:
+        - flatpak
+    script:
+        - echo "Generating flatpak deployment"
+    artifacts:
+        paths:
+            - $BUNDLE
+        expire_in: 30 days
+    environment:
+        name: review/$CI_COMMIT_REF_NAME
+        url: https://gitlab.gnome.org/$CI_PROJECT_PATH/-/jobs/$CI_JOB_ID/artifacts/raw/${BUNDLE}
+        on_stop: stop_review
+    except:
+        - master@World/hammond
+
+stop_review:
+    stage: review
+    script:
+        - echo "Stopping flatpak deployment"
+    when: manual
+    environment:
+        name: review/$CI_COMMIT_REF_NAME
+        action: stop
+    except:
+        - master@World/hammond
+
+# Configure and run rustfmt on nightly
 # Exits and builds fails if on bad format
 rustfmt:
-  image: "rust:slim"
-  stage: ".pre"
-  script:
-    - rustup component add rustfmt
-    # Create blank versions of our configured files
-    # so rustfmt does not yell about non-existent files or completely empty files
-    - echo -e "" >> podcasts-gtk/src/config.rs
-    - echo -e "" >> podcasts-gtk/src/static_resource.rs
-    - rustc -Vv && cargo -Vv
-    - cargo fmt --version
-    - cargo fmt --all -- --color=always --check
+    image: "registry.gitlab.com/alatiera/rustfmt-oci-image/rustfmt:nightly"
+    stage: lint
+    script:
+        - rustc -Vv && cargo -Vv
+        - cargo fmt --version
+        - cargo fmt --all -- --check
+
+# Configure and run clippy on nightly
+# Only fails on errors atm.
+clippy:
+    image: "registry.gitlab.gnome.org/alatiera/hammond-container-images/clippy:nightly"
+    stage: lint
+    variables:
+        RUSTFLAGS: "--cfg rayon_unstable"
+        CARGO_HOME: ".cargo_cache"
+    script:
+        - rustc --version && cargo --version
+        - cargo clippy --version
+        # Force regeneration of gresources regardless of artifacts chage
+        - cd hammond-gtk/resources/ && glib-compile-resources --generate resources.xml && cd ../../
+        - cargo clippy --all
+    <<: *cargo_cache

.gitlab/issue_templates/BrokenFeed.md

@@ -18,7 +18,7 @@ Some common cases might be:
 
 Steps to reproduce:
 
-1. Open GNOME Podcasts
+1. Open Hammond
 2. Do an action
 3. ...
 

.gitlab/issue_templates/Bug.md

@@ -1,40 +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, flatpak bundles can be found in the CI artifacts.
+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

.gitlab/merge_requests_templates/mr.md

@@ -1 +0,0 @@
-### Please attach a relevant issue to this MR, if this doesn't exist please create one.

CHANGELOG.md

@@ -5,189 +5,18 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
-
 ### Added:
+- Keyboard Shortcuts and a Shortcuts dialog were implemented. (ZanderBrown) [!33](https://gitlab.gnome.org/World/hammond/merge_requests/33)
 
 ### Changed:
-
-### Fixed:
-
-### Removed:
-
-## [0.4.7] - 2019-10-23
-
-### Added:
-- Improved appdata validation and meson tests World/podcasts!89
-- The ability to export show subscriptions to opml files World/podcasts!77
-- Support for feeds requiring authentication World/podcasts!120
-
-### Changed:
-
-- Episodes now have a checkmark to show whether or not they've been played World/podcasts!106
-- Changed to how errors are shown when adding podcasts World/podcasts!108 World/podcasts!109 World/podcasts!110
-- Improved integration of cargo and meson World/podcasts!94
-- Refactored some macros for error handling World/podcasts!82
-- Refactored the handling of styling changes World/podcasts!119
-- Updated the icon to better match the HIG guidlines World/podcasts#102
-- Made Podcasts use a GtkApplication subclass World/podcasts!113
-- Updated the MPRIS permissions in order to remove a sandbox hole World/podcasts!124
-- Bumped gtk and libhandy minimum versions
-
-### Fixed:
-
-- Rewind now works regardless if its the start or the end of the episode World/podcasts!83
-- Typos in the README and CONTRIBUTING docs World/podcast!97 World/podcast!98 World/podcast!99 World/podcasts!121
-- Show cover is reset properly now if there isn't an image World/podcasts#114
-- Query pairs are no longer stripped from URLs World/podcasts!111
-- Pause MPRIS button now works on KDE Plasma World/podcasts#115
-- The playback widget now properly reflects the playback state on episode change World/podcasts!116
-
-### Removed:
-
-- All preferences World/podcast!104
-
-## [0.4.6] - 2018-10-07
-
-### Added:
-- Felix, @haecker-felix, wrote an [mpris crate](https://crates.io/crates/mpris-player) and implemented MPRIS2 client side support! !74 #68
-
-### Changed:
-- Download Cancel button was changed to an Icon instead of a label !72
-- The applciation will no longer scale below 360p in width 1933c79f7a87d8261d91ca4e14eb51c1ddc66624
-- Update to the latest HIG 5050dda4d2f75b706842de8507d115dd5a1bd0a9
-- Chris, @brainblasted, upgraded hyper to 0.12, this brings openssl 1.1 support !75
-- Pipeline backend is now completly migrated to tokio-runtime 0887789f5e653dd92ad397fb39561df6dffcb45c
-- Resume playing an episode will attempt to rewind the track only if more than a minute has passed since the last pause !76
-
-### Fixed:
-- Fixed a regression where indexing feeds was blocking the `tokio reactor` #88 !70
-- Episodeds Listbox no longer resizes when a download starts #89 !72
-- The `total_size` label of the `EpisodeWidget` now behaves correctly if the request fails #90 !73
-- The Pipeline will no longer log things in stderr for Requests that returned 304 and are expected to be skipped da361d0cb93cd8edd076859b2c607509a96dac8d
-- A bug where the HomeView wold get into an invalid state if your only shows had no episodes 32bd2a89a34e8e940b3b260c6be76defe11835ed
-
-### Translations:
-
-**Added**
-- Brazilian Portuguese translation 586cf16f
-- Swedish translation 2e527250
-- Italian translation a23297e5
-- Friulian translation 60e09c0d
-- Hungarian translation 2751a828
-- Croatian translation 0476b67b
-- Latvian translation a681b2c9
-- Czech translation 3563a964
-- Catalan translation 6ea3fc91
-
-**Updated**
-- German translation
-- Finnish translation
-- Polish translation
-- Turkish translation
-- Croatian translation 
-- Indonesian translation
-- Spanish translation 
-
-
-## [0.4.5] - 2018-08-31
-
-### Added:
-- [OARS](https://hughsie.github.io/oars/) Tags where added for compatibility with Store clients b0c94dd9
-- Daniel added support for Translations !46
-- Svitozar Cherepii(@svito) created a [wiki page](https://wiki.gnome.org/Apps/Podcasts) 70e79e50
-- Libhandy was added as a dependancy #70
-- Development builds can now be installed in parallel with stable builds !64
-
-### Changed:
-- The update indication was moved to an In-App notification #72
-- The app icon's accent color was changed from orange to red 0dfb4859
-- The stack switcher in the Headerbar is now insesitive on Empty Views !63
-
-### Fixed:
-- Improved handling of HTTP redirections #64 !61 !62
-- Fixed a major performance regression when loading show covers !67
-- More refference cycles have been fixed !59
-- OPML import dialog now exits properly and no longer keeps the application from shuting down !65
-- Update action is disabled if there isn't something to update #71
-
-### Translations:
-- Added Finish 93696026
-- Added Polish 1bd6efc0
-- Added Turkish 73929f2d
-- Added Spanish !46
-- Added German 6b6c390c
-- Added Galician 0060a634
-- Added Indonesian ded0224f
-- Added Korean 36f16963
-
-
-## [0.4.4] - 2018-07-31
-
-### Changed:
-- `SendCell` crate was replaced with `Fragile`. (Jorda Petridis) 838320785ebbea94e009698b473495cfec076f54
-- Update dependancies (Jorda Petridis) 91bea8551998b16e44e5358fdd43c53422bcc6f3
-
-### Fixed:
-- Fix more refference cycles. (Jorda Petridis) 3496df24f8d8bfa8c8a53d8f00262d42ee39b41c
-- Actually fix cargo-vendor (Jorda Petridis)
-
-## [0.4.3] - 2018-07-27
-
-### Fixed:
-
-- Fix the cargo vendor config for the tarball releash script. (Jorda Petridis) a2440c19e11ca4dcdbcb67cd85259a41fe3754d6
-
-## [0.4.2] - 2018-07-27
-
-### Changed:
-
-- Minimum size requested by the Views. (Jorda Petridis) 7c96152f3f53f271247230dccf1c9cd5947b685f
-
-### Fixed:
-
-- Screenshot metadata in appstream data. (Jorda Petridis) a2440c19e11ca4dcdbcb67cd85259a41fe3754d6
-
-## [0.4.1] - 2018-07-26
-### Added:
-
-- Custom icons for the fast-forward and rewind actions in the Player were added. (Tobias Bernard) e77000076b3d78b8625f4c7ef367376d0130ece6
-- Hicolor and symbolic icons for the Application. (Tobias Bernard and Sam Hewitt) edae1b04801dba9d91d5d4145db79b287f0eec2c
-- Basic prefferences dialog (Zander Brown). [34](https://gitlab.gnome.org/World/podcasts/merge_requests/34)
-- Dbus service preperation. Not used till the MPRIS2 integration has landed. (Zander Brown) [42](https://gitlab.gnome.org/World/podcasts/merge_requests/42)
-- Episodes and Images will only get drawn when needed. Big Performance impact. (Jordan Petridis) [43](https://gitlab.gnome.org/World/podcasts/merge_requests/43)
-
-### Changed:
-
-- The `ShowWidget` control button were moved to a secondary menu in the Headerbar. (Jordan Petridis) 536805791e336a3e112799be554706bb804d2bef
-- EmptyView layout improvements. (Jorda Petridis) 3c3d6c1e7f15b88308a9054b15a6ca0d8fa233ce 518ea9c8b57885c44bda9c418b19fef26ae0e55d
-- Improved the `AddButton` behavior. (Jorda Petridis) 67ab54f8203f19aad198dc49e935127d25432b41
-
-### Fixed:
-
-- A couple reffence cycles where fixed. (Jorda Petridis)
-
-### Removed:
-
-- The delay between the application startup and the `update_on_startup` action. (Jorda Petridis) 7569465a612ee5ef84d0e58f4e1010c8d14080d4
-
-## [0.4.0] - 2018-07-04
-### Added:
-- Keyboard Shortcuts and a Shortcuts dialog were implemented. (ZanderBrown)
-[!33](https://gitlab.gnome.org/World/podcasts/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/podcasts/merge_requests/33)
-- The `EpisdeWidget` was refactored.
-[!38](https://gitlab.gnome.org/World/podcasts/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/podcasts/merge_requests/40)
-- Various Database changes.
-[!41](https://gitlab.gnome.org/World/podcasts/merge_requests/41)
 
 ### Fixed:
-- Fixed a bug whre the about dialog would be unclosable. (ZanderBrown) [!37](https://gitlab.gnome.org/World/podcasts/merge_requests/37)
+- 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:
@@ -213,9 +42,9 @@ not being able to access any file.
 
 ### Changed:
 - Downlaoding and loading images now is done asynchronously and is not blocking programs execution.
-[#7](https://gitlab.gnome.org/World/podcasts/issues/7)
+[#7](https://gitlab.gnome.org/World/hammond/issues/7)
 - Bold, italics links and some other `html` tags can now be rendered in the Show Description.
-[#25](https://gitlab.gnome.org/World/podcasts/issues/25)
+[#25](https://gitlab.gnome.org/World/hammond/issues/25)
 - `Rayon` Threadpools are now used instead of unlimited one-off threads.
 - `EpisdeWidget`s are now loaded asynchronously accross views.
 - `EpisodeWidget`s no longer trigger a `View` refresh for trivial stuff 03bd95184808ccab3e0ea0e3713a52ee6b7c9ab4
@@ -223,7 +52,7 @@ not being able to access any file.
 - `ShowWidget` Description is inside a scrolled window now
 
 ### Fixed:
-- `EpisodeWidget` Height now is consistent accros views [#57](https://gitlab.gnome.org/World/podcasts/issues/57)
+- `EpisodeWidget` Height now is consistent accros views [#57](https://gitlab.gnome.org/World/hammond/issues/57)
 - Implemented a tail-recursion loop to follow-up when a feed redirects to another url. c6a24e839a8ba77d09673f299cfc1e64ba7078f3
 
 ### Removed:
@@ -232,27 +61,27 @@ not being able to access any file.
 ## [0.3.1] - 2018-03-28
 ### Added:
 - Ability to mark all episodes of a Show as watched.
-[#47](https://gitlab.gnome.org/World/podcasts/issues/47)
+[#47](https://gitlab.gnome.org/World/hammond/issues/47)
 - Now you are able to subscribe to itunes™ podcasts by using the itunes link of the show.
-[#49](https://gitlab.gnome.org/World/podcasts/issues/49)
+[#49](https://gitlab.gnome.org/World/hammond/issues/49)
 - Hammond now remembers the window size and position. (Rowan Lewis)
-[#50](https://gitlab.gnome.org/World/podcasts/issues/50)
+[#50](https://gitlab.gnome.org/World/hammond/issues/50)
 - Implemnted the initial work for integrating with GSettings and storing preferences. (Rowan Lewis)
-[!22](https://gitlab.gnome.org/World/podcasts/merge_requests/22) [!23](https://gitlab.gnome.org/World/podcasts/merge_requests/23)
+[!22](https://gitlab.gnome.org/World/hammond/merge_requests/22) [!23](https://gitlab.gnome.org/World/hammond/merge_requests/23)
 - Shows without episodes now display an empty message similar to EmptyView.
-[#44](https://gitlab.gnome.org/World/podcasts/issues/44)
+[#44](https://gitlab.gnome.org/World/hammond/issues/44)
 
 ### Changed:
 - EpisdeWidget has been reimplemented as a compile time state machine.
-[!18](https://gitlab.gnome.org/World/podcasts/merge_requests/18)
+[!18](https://gitlab.gnome.org/World/hammond/merge_requests/18)
 - Content Views no longer scroll horizontally when shrunk bellow their minimum size.
-[#35](https://gitlab.gnome.org/World/podcasts/issues/35)
+[#35](https://gitlab.gnome.org/World/hammond/issues/35)
 - Some requests now use the Tor Browser's user agent. (Rowan Lewis)
-[#53](https://gitlab.gnome.org/World/podcasts/issues/53)
+[#53](https://gitlab.gnome.org/World/hammond/issues/53)
 
 ### Fixed:
 - Double border aroun the main window was fixed. (Rowan Lewis)
-[#52](https://gitlab.gnome.org/World/podcasts/issues/52)
+[#52](https://gitlab.gnome.org/World/hammond/issues/52)
 
 ## [0.3.0] - 2018-02-11
 - Tobias Bernard Redesigned the whole Gtk+ client.

CONTRIBUTING.md

@@ -1,18 +1,18 @@
-## Contributing to GNOME Podcasts
+## Contributing to Hammond
 
 Thank you for looking in this file!
 
-When contributing to the development of GNOME Podcasts, please first discuss the change you wish to make via issue, email, or any other method with the maintainers before making a change.
+When contributing to the development of Hammond, please first discuss the change you wish to make via issue, email, or any other method with the maintainers before making a change.
 
-If you have any questions regarding the use or development of GNOME Podcasts,
-want to discuss design or simply hang out, please join us in [#gnome-podcasts:matrix.org](https://matrix.to/#/#gnome-podcasts:matrix.org) or [#hammond on irc.gnome.org.](irc://irc.gnome.org/#hammond)
+If you have any questions regarding the use or development of Hammond,
+want to discuss design or simply hang out, please join us in [#hammond on irc.gnome.org.](irc://irc.gnome.org/#hammond)
 
-Please note we have a [code of conduct](/code-of-conduct.md), please follow it in all your interactions with the project.
+Please note we have a [code of conduct](https://wiki.gnome.org/Foundation/CodeOfConduc), please follow it in all your interactions with the project.
 
 ## Source repository
 
-GNOME Podcasts's main source repository is at gitlab.gnome.org.  You can view
-the web interface [here](https://gitlab.gnome.org/World/podcasts)
+Hammond's main source repository is at gitlab.gnome.org.  You can view
+the web interface [here](https://gitlab.gnome.org/World/hammond)
 
 Development happens in the master branch.
 
@@ -26,12 +26,9 @@ makes things easier for the maintainers.
 
 We use [rustfmt](https://github.com/rust-lang-nursery/rustfmt) for code formatting and we enforce it on the gitlab-CI server.
 
-***Installing rustfmt*** As of 2019/Jan, our continuous integration
-pipeline assumes the version of rustfmt that is distributed through the
-stable channel of [rustup](rustup.rs).  You can install it with
-
+Quick setup
 ```
-rustup component add rustfmt
+cargo install rustfmt-nightly
 cargo fmt --all
  ```
 
@@ -39,7 +36,7 @@ It is recommended to add a pre-commit hook to run cargo test and `cargo fmt`.
 Don't forget to `git add` again after `cargo fmt`.
 ```
 #!/bin/sh
-cargo test -- --test-threads=1 && cargo fmt --all -- --check
+cargo test -- --test-threads=1 && cargo fmt --all -- --write-mode=diff
 ```
 
 ## Running the test suite
@@ -47,14 +44,14 @@ cargo test -- --test-threads=1 && cargo fmt --all -- --check
 Running the tests requires an internet connection and it it will download some files from the [Internet Archive](archive.org)
 
 The test suite sets a temporary sqlite database in the `/tmp` folder.
-Due to that it's not possible to run them in parallel.
+Due to that it's not possible to run them in parrallel.
 
 In order to run the test suite use the following: `cargo test -- --test-threads=1`
 
 # Issues, issues and more issues!
 
-There are many ways you can contribute to GNOME Podcasts, and all of them involve creating issues
-in [GNOME Podcasts issue tracker](https://gitlab.gnome.org/World/podcasts/issues). This is the entry point for your contribution.
+There are many ways you can contribute to Hammond, and all of them involve creating issues
+in [Hammond issue tracker](https://gitlab.gnome.org/World/hammond/issues). This is the entry point for your contribution.
 
 To create an effective and high quality ticket, try to put the following information on your
 ticket:
@@ -77,7 +74,7 @@ If it's an issue, add the steps to reproduce like this:
 
 Steps to reproduce:
 
-1. Open GNOME Podcasts
+1. Open Hammond
 2. Do an Action
 3. ...
 
@@ -94,13 +91,13 @@ Steps to reproduce:
 * [ ]  qa (quality assurance) tasks
 ```
 
-## Merge Request Process
+## Pull Request Process
 
-1. Ensure your code compiles. Run `meson` & `ninja` before creating the merge request.
+1. Ensure your code compiles. Run `make` before creating the pull request.
 2. Ensure the test suit passes. Run `cargo test -- --test-threads=1`.
-3. Ensure your code is properly formatted. Run `cargo fmt --all`.
+3. Ensure your code is properly formated. Run `cargo fmt --all`.
 4. If you're adding new API, it must be properly documented.
-5. The commit message has to be formatted as follows:
+5. The commit message is formatted as follows:
    ```
    component: <summary>
 
@@ -110,8 +107,8 @@ Steps to reproduce:
 
    <link to the bug ticket>
    ```
-6. You may merge the merge request once you have the sign-off of the maintainers, or if you
+6. You may merge the pull request in once you have the sign-off of the maintainers, or if you
    do not have permission to do that, you may request the second reviewer to merge it for you.
 
 ## Code of Conduct
-We follow the [GNOME Foundation Code of Conduct](/code-of-conduct.md).
+We follow the Gnome [Code of Conduct.](https://wiki.gnome.org/Foundation/CodeOfConduct)

Cargo.toml

@@ -1,9 +1,9 @@
 [workspace]
 members = [
-    "podcasts-data",
-    "podcasts-downloader",
-    "podcasts-gtk"
+    "hammond-data",
+    "hammond-downloader",
+    "hammond-gtk"
 ]
 
 [profile.release]
-debug = true
+debug = false

LICENSE

@@ -631,7 +631,7 @@ to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-    GNOME Podcasts
+    Hammond
     Copyright (C) 2017  Jordan Petridis
 
     This program is free software: you can redistribute it and/or modify
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    GNOME Podcasts  Copyright (C) 2017  Jordan Petridis
+    Hammond  Copyright (C) 2017  Jordan Petridis
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

README.md

@@ -1,63 +1,66 @@
-# GNOME Podcasts
+# Hammond
 
-### A Podcast application for GNOME.
-Listen to your favorite podcasts, right from your desktop.
+### A Podcast Client for GNOME written in Rust.
 
-![episdes_view](./screenshots/home_view.png)
+![episdes_view](./screenshots/episodes_view.png)
 ![shows_view](./screenshots/shows_view.png)
 ![show_widget](./screenshots/show_widget.png)
 
-## Available on Flathub
-
-[![Get it from Flathub!](https://flathub.org/assets/badges/flathub-badge-en.svg)](https://flathub.org/apps/details/org.gnome.Podcasts)
-
 ## Quick start
 
-GNOME Podcasts can be built and run with [Gnome Builder][builder] >= 3.28.
-Just clone the repo and hit the run button!
+Hammond can be built and run with [Gnome Builder](https://wiki.gnome.org/Apps/Builder) >= 3.28.
 
-You can get Builder from [here][get_builder].
+Get Builder [here](https://wiki.gnome.org/Apps/Builder/Downloads)
 
 ## Broken Feeds
 
-Found a feed that does not work in GNOME Podcasts?
-Please [open an issue][new_issue] and choose the `BrokenFeed` template so we will know and fix it!
+Found a feed that does not work in Hammond?
+Please [open an issue](https://gitlab.gnome.org/World/hammond/issues/new) and choose the `BrokenFeed` template so we will know and fix it!
 
 ## Getting in Touch
 
-If you have any questions regarding the use or development of GNOME Podcasts,
-want to discuss design or simply hang out, please join us on our [irc][irc] or [matrix][matrix] channel.
+If you have any questions regarding the use or development of Hammond,
+want to discuss design or simply hang out, please join us in `#hammond` on
+[irc.gnome.org.][irc] or [matrix][matrix].
+
+Note:
+
+There isn't much documentation yet, so you will probably have question about parts of the Code.
 
 ## Building
 
 ### Flatpak
 
-Flatpak is the recommended way of building and installing GNOME Podcasts.
-Here are the dependencies you will need.
+Flatpak is the reccomended way of building and installing Hammond.
 
-```sh
-# Add flathub and the gnome-nightly repo
-flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
-flatpak remote-add --user --if-not-exists gnome-nightly https://nightly.gnome.org/gnome-nightly.flatpakrepo
+#### Building a Flatpak
 
-# Install the gnome-nightly Sdk and Platform runtime
-flatpak install --user gnome-nightly org.gnome.Sdk org.gnome.Platform
+Download the `org.gnome.Hammond.json` flatpak manifest from this repo.
 
+```bash
+# Add flathub repo
+flatpak --user remote-add flathub --if-not-exists https://dl.flathub.org/repo/flathub.flatpakrepo
+# Add the gnome-nightly repo
+flatpak --user remote-add gnome-nightly --if-not-exists https://sdk.gnome.org/gnome-nightly.flatpakrepo
+# Install the gnome-nightly Sdk and Platform runtim
+flatpak --user install gnome-nightly org.gnome.Sdk org.gnome.Platform
 # Install the required rust-stable extension from flathub
-flatpak install --user flathub org.freedesktop.Sdk.Extension.rust-stable//19.08
+flatpak --user install flathub org.freedesktop.Sdk.Extension.rust-stable
+flatpak-builder --user --repo=repo hammond org.gnome.Hammond.json --force-clean
 ```
 
 To install the resulting flatpak you can do:
 
 ```bash
-flatpak-builder --user --install --force-clean --repo=repo podcasts org.gnome.Podcasts.json
+flatpak build-bundle repo hammond.flatpak org.gnome.Hammond
+flatpak install --user --bundle hammond.flatpak
 ```
 
-### Building from source
+### Building from soure
 
 ```sh
-git clone https://gitlab.gnome.org/World/podcasts.git
-cd gnome-podcasts/
+git clone https://gitlab.gnome.org/World/hammond.git
+cd hammond/
 meson --prefix=/usr build
 ninja -C build
 sudo ninja -C build install
@@ -65,33 +68,41 @@ sudo ninja -C build install
 
 #### Dependencies
 
-* Rust stable 1.34 or later along with cargo.
-* Gtk+ 3.24.11 or later
-* Gstreamer 1.16 or later
-* libhandy 0.0.11 or later
+* Rust stable 1.26 or later along with cargo.
+* Gtk+ 3.22 or later
 * Meson
 * A network connection
 
 Offline build are possible too, but [`cargo-vendor`][vendor] would have to be setup first
 
+**Debian/Ubuntu**
+
+```sh
+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
+```
+
+If you happen to build it on other distributions please let me know the names 
+of the corresponding libraries. Feel free to open a MR or an Issue to note it.
+
 ## Contributing
 
-There are a lot of things yet to be done.
+There alot of thins yet to be done.
 
 If you want to contribute, please check the [Contributions Guidelines][contribution-guidelines].
 
-You can start by taking a look at [Issues][issues] or by opening a [New issue][new_issue].
+You can start by taking a look at [Issues](https://gitlab.gnome.org/World/hammond/issues) or by opening a [New issue](https://gitlab.gnome.org/World/hammond/issues/new?issue%5Bassignee_id%5D=&issue%5Bmilestone_id%5D=).
 
 There are also some minor tasks tagged with `TODO:` and `FIXME:` in the source code.
 
-[contribution-guidelines]: https://gitlab.gnome.org/World/podcasts/blob/master/CONTRIBUTING.md
-
-### Translations
-
-Translation of this project takes place on the GNOME translation platform,
-[Damned Lies](https://l10n.gnome.org/module/podcasts). For further
-information on how to join a language team, or even to create one, please see
-[GNOME Translation Project wiki page](https://wiki.gnome.org/TranslationProject).
+[contribution-guidelines]: https://gitlab.gnome.org/World/hammond/blob/master/CONTRIBUTING.md
 
 
 ## Overview
@@ -99,15 +110,15 @@ information on how to join a language team, or even to create one, please see
 ```sh
 $ tree -d
 ├── screenshots         # png's used in the README.md
-├── podcasts-data        # Storate related stuff, SQLite, XDG setup, RSS Parser.
+├── hammond-data        # Storate related stuff, SQLite, XDG setup, RSS Parser.
 │   ├── migrations      # Diesel SQL migrations.
 │   │   └── ...
 │   ├── src
 │   └── tests
 │       └── feeds       # Raw RSS Feeds used for tests.
-├── podcasts-downloader  # Really basic, Really crappy downloader.
+├── hammond-downloader  # Really basic, Really crappy downloader.
 │   └── src
-├── podcasts-gtk         # The Gtk+ Client
+├── hammond-gtk         # The Gtk+ Client
 │   ├── resources       # GResources folder
 │   │   └── gtk         # Contains the glade.ui files.
 │   └── src
@@ -117,27 +128,18 @@ $ tree -d
 
 ## A note about the project's name
 
-The project used to be called Hammond, after Allan Moore's character [Evey Hammond][hammond] from the graphic novel V for Vendetta.
-It was renamed to GNOME Podcasts on 2018/07/24 shortly before its first public release.
+The project was named after Allan Moore's character [Evey Hammond](https://en.wikipedia.org/wiki/Evey_Hammond) from the graphic novel V for Vendetta.
+
+It has nothing to do with the horrible headlines on the news.
 
 ## Acknowledgments
 
-GNOME Podcasts's design is heavily inspired by [GNOME Music][music] and [Vocal][vocal].
+Hammond's design is heavily insired by [GNOME Music](https://wiki.gnome.org/Design/Apps/Music) and [Vocal](http://vocalproject.net/).
 
-We also copied some elements from [GNOME News][news].
+We also copied some elements from [GNOME News](https://wiki.gnome.org/Design/Apps/Potential/News).
 
-And almost the entirety of the build system is copied from the [Fractal][fractal] project.
+And almost the entirety of the build system is copied from the [Fractal](https://gitlab.gnome.org/danigm/fractal) project.
 
 [vendor]: https://github.com/alexcrichton/cargo-vendor
 [irc]: irc://irc.gnome.org/#hammond
-[matrix]: https://matrix.to/#/#gnome-podcasts:matrix.org
-[flatpak_setup]: https://flatpak.org/setup/
-[music]: https://wiki.gnome.org/Design/Apps/Music
-[vocal]: http://vocalproject.net/
-[news]: https://wiki.gnome.org/Design/Apps/Potential/News
-[fractal]: https://gitlab.gnome.org/World/fractal
-[hammond]: https://en.wikipedia.org/wiki/Evey_Hammond
-[issues]: https://gitlab.gnome.org/World/podcasts/issues
-[new_issue]: https://gitlab.gnome.org/World/podcasts/issues/new
-[builder]: https://wiki.gnome.org/Apps/Builder
-[get_builder]: https://wiki.gnome.org/Apps/Builder/Downloads
+[matrix]: https://matrix.to/#/#hammond:matrix.org

code-of-conduct.md

@@ -1,126 +0,0 @@
-# GNOME Code of Conduct
-
-Thank you for being a part of the GNOME project. We value your participation and want everyone to have an enjoyable and fulfilling experience. Accordingly, all participants are expected to follow this Code of Conduct, and to show respect, understanding, and consideration to one another. Thank you for helping make this a welcoming, friendly community for everyone.
-
-## Scope
-
-This Code of Conduct applies to all online GNOME community spaces, including, but not limited to:
-
- * Issue tracking systems - bugzilla.gnome.org
- * Documentation and tutorials - developer.gnome.org
- * Code repositories - git.gnome.org and gitlab.gnome.org
- * Mailing lists - mail.gnome.org
- * Wikis - wiki.gnome.org
- * Chat and forums - irc.gnome.org, discourse.gnome.org, GNOME Telegram channels, and GNOME groups and channels on Matrix.org (including bridges to GNOME IRC channels)
- * Community spaces hosted on gnome.org infrastructure
- * Any other channels or groups which exist in order to discuss GNOME project activities
-
-Communication channels and private conversations that are normally out of scope may be considered in scope if a GNOME participant is being stalked or harassed. Social media conversations may be considered in-scope if the incident occurred under a GNOME event hashtag, or when an official GNOME account on social media is tagged, or within any other discussion about GNOME. The GNOME Foundation reserves the right to take actions against behaviors that happen in any context, if they are deemed to be relevant to the GNOME project and its participants.
-
-All participants in GNOME online community spaces are subject to the Code of Conduct. This includes GNOME Foundation board members, corporate sponsors, and paid employees. This also includes volunteers, maintainers, leaders, contributors, contribution reviewers, issue reporters, GNOME users, and anyone participating in discussion in GNOME online spaces.
-
-## Reporting an Incident
-
-If you believe that someone is violating the Code of Conduct, or have
-any other concerns, please [contact the Code of Conduct committee](https://wiki.gnome.org/Foundation/CodeOfConduct/ReporterGuide).
-
-## Our Standards
-
-The GNOME online community is dedicated to providing a positive experience for everyone, regardless of:
-
- * age
- * body size
- * caste
- * citizenship
- * disability
- * education
- * ethnicity
- * familial status
- * gender expression
- * gender identity
- * genetic information
- * immigration status
- * level of experience
- * nationality
- * personal appearance
- * pregnancy
- * race
- * religion
- * sex characteristics
- * sexual orientation
- * sexual identity
- * socio-economic status
- * tribe
- * veteran status
-
-### Community Guidelines
-
-Examples of behavior that contributes to creating a positive environment include:
-
- * **Be friendly.** Use welcoming and inclusive language.
- * **Be empathetic.** Be respectful of differing viewpoints and experiences.
- * **Be respectful.** When we disagree, we do so in a polite and constructive manner.
- * **Be considerate.** Remember that decisions are often a difficult choice between competing priorities. Focus on what is best for the community. Keep discussions around technology choices constructive and respectful.
- * **Be patient and generous.** If someone asks for help it is because they need it. When documentation is available that answers the question, politely point them to it. If the question is off-topic, suggest a more appropriate online space to seek help.
- * **Try to be concise.** Read the discussion before commenting in order to not repeat a point that has been made.
-
-### Inappropriate Behavior
-
-Community members asked to stop any inappropriate behavior are expected to comply immediately.
-
-We want all participants in the GNOME community have the best possible experience they can. In order to be clear what that means, we've provided a list of examples of behaviors that are inappropriate for GNOME community spaces:
-
- * **Deliberate intimidation, stalking, or following.**
- * **Sustained disruption of online discussion, talks, or other events.** Sustained disruption of events, online discussions, or meetings, including talks and presentations, will not be tolerated. This includes 'Talking over' or 'heckling' event speakers or influencing crowd actions that cause hostility in event sessions. Sustained disruption also includes drinking alcohol to excess or using recreational drugs to excess, or pushing others to do so.
- * **Harassment of people who don't drink alcohol.** We do not tolerate derogatory comments about those who abstain from alcohol or other substances. We do not tolerate pushing people to drink, talking about their abstinence or preferences to others, or pressuring them to drink - physically or through jeering.
- * **Sexist, racist, homophobic, transphobic, ableist language or otherwise exclusionary language.** This includes deliberately referring to someone by a gender that they do not identify with, and/or questioning the legitimacy of an individual's gender identity. If you're unsure if a word is derogatory, don't use it. This also includes repeated subtle and/or indirect discrimination.
- * **Unwelcome sexual attention or behavior that contributes to a sexualized environment.** This includes sexualized comments, jokes or imagery in interactions, communications or presentation materials, as well as inappropriate touching, groping, or sexual advances. Sponsors should not use sexualized images, activities, or other material. Meetup organizing staff and other volunteer organizers should not use sexualized clothing/uniforms/costumes, or otherwise create a sexualized environment.
- * **Unwelcome physical contact.** This includes touching a person without permission, including sensitive areas such as their hair, pregnant stomach, mobility device (wheelchair, scooter, etc) or tattoos. This also includes physically blocking or intimidating another person. Physical contact or simulated physical contact (such as emojis like "kiss") without affirmative consent is not acceptable. This includes sharing or distribution of sexualized images or text.
- * **Violence or threats of violence.** Violence and threats of violence are not acceptable - online or offline. This includes incitement of violence toward any individual, including encouraging a person to commit self-harm. This also includes posting or threatening to post other people's personally identifying information ("doxxing") online.
- * **Influencing or encouraging inappropriate behavior.** If you influence or encourage another person to violate the Code of Conduct, you may face the same consequences as if you had violated the Code of Conduct.
- * **Possession of an offensive weapon at a GNOME event.** This includes anything deemed to be a weapon by the event organizers.
-
-The GNOME community prioritizes marginalized people's safety over privileged people's comfort. The committee will not act on complaints regarding:
-
- * "Reverse"-isms, including "reverse racism," "reverse sexism," and "cisphobia"
- * Reasonable communication of boundaries, such as "leave me alone," "go away," or "I'm not discussing this with you."
- * Criticizing racist, sexist, cissexist, or otherwise oppressive behavior or assumptions
- * Communicating boundaries or criticizing oppressive behavior in a "tone" you don't find congenial
-
-The examples listed above are not against the Code of Conduct. If you have questions about the above statements, please [read this document](https://github.com/sagesharp/code-of-conduct-template/blob/master/code-of-conduct/example-reversisms.md#supporting-diversity).
-
-If a participant engages in behavior that violates this code of conduct, the GNOME Code of Conduct committee may take any action they deem appropriate. Examples of consequences are outlined in the [Committee Procedures Guide](https://wiki.gnome.org/Foundation/CodeOfConduct/CommitteeProcedures).
-
-## Procedure for Handling Incidents
-
- * [Reporter Guide](https://wiki.gnome.org/Foundation/CodeOfConduct/ReporterGuide)
-
- * [Moderator Procedures](https://wiki.gnome.org/Foundation/CodeOfConduct/ModeratorProcedures)
-
- * [Committee Procedures Guide](https://wiki.gnome.org/Foundation/CodeOfConduct/CommitteeProcedures)
-
-## License
-
-The GNOME Online Code of Conduct is licensed under a [Creative Commons Attribution Share-Alike 3.0 Unported License](http://creativecommons.org/licenses/by-sa/3.0/)
-
-![Creative Commons License](http://i.creativecommons.org/l/by-sa/3.0/88x31.png)
-
-## Attribution
-
-The GNOME Online Code of Conduct was forked from the example policy from the [Geek Feminism wiki, created by the Ada Initiative and other volunteers](http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Policy), which is under a Creative Commons Zero license.
-
-Additional language was incorporated and modified from the following Codes of Conduct:
-
- * [Citizen Code of Conduct](http://citizencodeofconduct.org/) is licensed [Creative Commons Attribution Share-Alike 3.0 Unported License](http://creativecommons.org/licenses/by-sa/3.0/).
- * [Code of Conduct template](https://github.com/sagesharp/code-of-conduct-template/) is licensed [Creative Commons Attribution Share-Alike 3.0 Unported License](http://creativecommons.org/licenses/by-sa/3.0/) by [Otter Tech](https://otter.technology/code-of-conduct-training)
- * [Contributor Covenant version 1.4](https://www.contributor-covenant.org/version/1/4/code-of-conduct) (licensed [CC BY 4.0](https://github.com/ContributorCovenant/contributor_covenant/blob/master/LICENSE.md))
- * [Data Carpentry Code of Conduct](https://docs.carpentries.org/topic_folders/policies/index_coc.html) is licensed [Creative Commons Attribution 4.0 License](https://creativecommons.org/licenses/by/4.0/)
- * [Django Project Code of Conduct](https://www.djangoproject.com/conduct/) is licensed under a [Creative Commons Attribution 3.0 Unported License](http://creativecommons.org/licenses/by/3.0/)
- * [Fedora Code of Conduct](http://fedoraproject.org/code-of-conduct)
- * [Geek Feminism Anti-harassment Policy](http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Policy) which is under a [Creative Commons Zero license](https://creativecommons.org/publicdomain/zero/1.0/)
- * [Previous GNOME Foundation Code of Conduct](https://wiki.gnome.org/action/recall/Foundation/CodeOfConduct/Old)
- * [LGBTQ in Technology Slack Code of Conduct](https://lgbtq.technology/coc.html) licensed [Creative Commons Zero](https://creativecommons.org/publicdomain/zero/1.0/)
- * [Mozilla Community Participation Guidelines](https://www.mozilla.org/en-US/about/governance/policies/participation/) is licensed [Creative Commons Attribution-ShareAlike 3.0 Unported License](https://creativecommons.org/licenses/by-sa/3.0/).
- * [Python Mentors Code of Conduct](http://pythonmentors.com/)
- * [Speak Up! Community Code of Conduct](http://web.archive.org/web/20141109123859/http://speakup.io/coc.html), licensed under a [Creative Commons Attribution 3.0 Unported License](http://creativecommons.org/licenses/by/3.0/)
-

hammond-data/Cargo.toml

@@ -0,0 +1,46 @@
+[package]
+authors = ["Jordan Petridis <jordanpetridis@protonmail.com>"]
+name = "hammond-data"
+version = "0.1.0"
+workspace = "../"
+
+[dependencies]
+ammonia = "1.1.0"
+chrono = "0.4.2"
+derive_builder = "0.5.1"
+lazy_static = "1.0.0"
+log = "0.4.1"
+rayon = "1.0.1"
+rayon-futures = "0.1.0"
+rfc822_sanitizer = "0.3.3"
+rss = "1.5.0"
+url = "1.7.0"
+xdg = "2.1.0"
+xml-rs = "0.8.0"
+futures = "0.1.21"
+hyper = "0.11.27"
+tokio-core = "0.1.17"
+hyper-tls = "0.1.3"
+native-tls = "0.1.5"
+num_cpus = "1.8.0"
+failure = "0.1.1"
+failure_derive = "0.1.1"
+
+[dependencies.diesel]
+features = ["sqlite", "r2d2"]
+version = "= 1.2.2"
+
+[dependencies.diesel_migrations]
+features = ["sqlite"]
+version = "= 1.2.0"
+
+[dev-dependencies]
+rand = "0.5.0"
+tempdir = "0.3.7"
+criterion = "0.2.3"
+pretty_assertions = "0.5.1"
+maplit = "1.0.1"
+
+[[bench]]
+name = "bench"
+harness = false

hammond-data/benches/bench.rs

@@ -0,0 +1,104 @@
+#![allow(unused)]
+
+#[macro_use]
+extern crate criterion;
+use criterion::Criterion;
+
+// extern crate futures;
+extern crate hammond_data;
+extern crate hyper;
+extern crate hyper_tls;
+extern crate rand;
+extern crate tokio_core;
+// extern crate rayon;
+extern crate rss;
+
+// use rayon::prelude::*;
+
+// use futures::future::*;
+use tokio_core::reactor::Core;
+
+use hammond_data::database::truncate_db;
+use hammond_data::pipeline;
+use hammond_data::FeedBuilder;
+use hammond_data::Source;
+// use hammond_data::errors::*;
+
+use std::io::BufReader;
+
+// RSS feeds
+const INTERCEPTED: &[u8] = include_bytes!("../tests/feeds/2018-01-20-Intercepted.xml");
+const INTERCEPTED_URL: &str = "https://web.archive.org/web/20180120083840if_/https://feeds.\
+                               feedburner.com/InterceptedWithJeremyScahill";
+
+const UNPLUGGED: &[u8] = include_bytes!("../tests/feeds/2018-01-20-LinuxUnplugged.xml");
+const UNPLUGGED_URL: &str =
+    "https://web.archive.org/web/20180120110314if_/https://feeds.feedburner.com/linuxunplugged";
+
+const TIPOFF: &[u8] = include_bytes!("../tests/feeds/2018-01-20-TheTipOff.xml");
+const TIPOFF_URL: &str =
+    "https://web.archive.org/web/20180120110727if_/https://rss.acast.com/thetipoff";
+
+// This feed has HUGE descripion and summary fields which can be very
+// very expensive to parse.
+const CODE: &[u8] = include_bytes!("../tests/feeds/2018-01-20-GreaterThanCode.xml");
+const CODE_URL: &str =
+    "https://web.archive.org/web/20180120104741if_/https://www.greaterthancode.com/feed/podcast";
+
+// Relative small feed
+const STARS: &[u8] = include_bytes!("../tests/feeds/2018-01-20-StealTheStars.xml");
+const STARS_URL: &str =
+    "https://web.archive.org/web/20180120104957if_/https://rss.art19.com/steal-the-stars";
+
+static FEEDS: &[(&[u8], &str)] = &[
+    (INTERCEPTED, INTERCEPTED_URL),
+    (UNPLUGGED, UNPLUGGED_URL),
+    (TIPOFF, TIPOFF_URL),
+    (CODE, CODE_URL),
+    (STARS, STARS_URL),
+];
+
+fn bench_index_large_feed(c: &mut Criterion) {
+    truncate_db().unwrap();
+    let url = "https://www.greaterthancode.com/feed/podcast";
+    let mut core = Core::new().unwrap();
+
+    c.bench_function("index_large_feed", move |b| {
+        b.iter(|| {
+            let s = Source::from_url(url).unwrap();
+            // parse it into a channel
+            let chan = rss::Channel::read_from(BufReader::new(CODE)).unwrap();
+            let feed = FeedBuilder::default()
+                .channel(chan)
+                .source_id(s.id())
+                .build()
+                .unwrap();
+            core.run(feed.index()).unwrap();
+        })
+    });
+    truncate_db().unwrap();
+}
+
+fn bench_index_small_feed(c: &mut Criterion) {
+    truncate_db().unwrap();
+    let url = "https://rss.art19.com/steal-the-stars";
+    let mut core = Core::new().unwrap();
+
+    c.bench_function("index_small_feed", move |b| {
+        b.iter(|| {
+            let s = Source::from_url(url).unwrap();
+            // parse it into a channel
+            let chan = rss::Channel::read_from(BufReader::new(STARS)).unwrap();
+            let feed = FeedBuilder::default()
+                .channel(chan)
+                .source_id(s.id())
+                .build()
+                .unwrap();
+            core.run(feed.index()).unwrap();
+        })
+    });
+    truncate_db().unwrap();
+}
+
+criterion_group!(benches, bench_index_large_feed, bench_index_small_feed);
+criterion_main!(benches);

hammond-data/src/database.rs

@@ -1,22 +1,3 @@
-// database.rs
-//
-// Copyright 2017 Jordan Petridis <jpetridis@gnome.org>
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 //! Database Setup. This is only public to help with some unit tests.
 // Diesel embed_migrations! triggers the lint
 #![allow(unused_imports)]
@@ -28,10 +9,10 @@ use diesel::r2d2::ConnectionManager;
 use std::io;
 use std::path::PathBuf;
 
-use crate::errors::DataError;
+use errors::DataError;
 
 #[cfg(not(test))]
-use crate::xdg_dirs;
+use xdg_dirs;
 
 type Pool = r2d2::Pool<ConnectionManager<SqliteConnection>>;
 
@@ -43,16 +24,16 @@ lazy_static! {
 
 #[cfg(not(test))]
 lazy_static! {
-    static ref DB_PATH: PathBuf = xdg_dirs::PODCASTS_XDG
-        .place_data_file("podcasts.db")
-        .unwrap();
+    static ref DB_PATH: PathBuf = xdg_dirs::HAMMOND_XDG.place_data_file("hammond.db").unwrap();
 }
 
+#[cfg(test)]
+extern crate tempdir;
+
 #[cfg(test)]
 lazy_static! {
-    pub(crate) static ref TEMPDIR: tempdir::TempDir =
-        { tempdir::TempDir::new("podcasts_unit_test").unwrap() };
-    static ref DB_PATH: PathBuf = TEMPDIR.path().join("podcasts.db");
+    static ref TEMPDIR: tempdir::TempDir = { tempdir::TempDir::new("hammond_unit_test").unwrap() };
+    static ref DB_PATH: PathBuf = TEMPDIR.path().join("hammond.db");
 }
 
 /// Get an r2d2 `SqliteConnection`.
@@ -83,12 +64,12 @@ fn run_migration_on(connection: &SqliteConnection) -> Result<(), DataError> {
 
 /// Reset the database into a clean state.
 // Test share a Temp file db.
-#[cfg(test)]
+#[allow(dead_code)]
 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

@@ -1,22 +1,3 @@
-// dbqueries.rs
-//
-// Copyright 2017 Jordan Petridis <jpetridis@gnome.org>
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 //! Random CRUD helper functions.
 
 use chrono::prelude::*;
@@ -24,14 +5,15 @@ use diesel::prelude::*;
 
 use diesel;
 use diesel::dsl::exists;
+use diesel::query_builder::AsQuery;
 use diesel::select;
 
-use crate::database::connection;
-use crate::errors::DataError;
-use crate::models::*;
+use database::connection;
+use errors::DataError;
+use models::*;
 
 pub fn get_sources() -> Result<Vec<Source>, DataError> {
-    use crate::schema::source::dsl::*;
+    use schema::source::dsl::*;
     let db = connection();
     let con = db.get()?;
 
@@ -41,157 +23,169 @@ pub fn get_sources() -> Result<Vec<Source>, DataError> {
         .map_err(From::from)
 }
 
-pub fn get_podcasts() -> Result<Vec<Show>, DataError> {
-    use crate::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 crate::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 crate::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 crate::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 crate::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 crate::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 crate::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 crate::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 crate::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 crate::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 crate::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 crate::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()?;
 
@@ -201,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()?;
 
@@ -211,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 crate::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 crate::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()?;
 
@@ -239,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()?;
@@ -253,7 +247,7 @@ pub fn get_pd_unplayed_episodes(parent: &Show) -> Result<Vec<Episode>, DataError
 // }
 
 pub fn get_source_from_uri(uri_: &str) -> Result<Source, DataError> {
-    use crate::schema::source::dsl::*;
+    use schema::source::dsl::*;
     let db = connection();
     let con = db.get()?;
 
@@ -264,7 +258,7 @@ pub fn get_source_from_uri(uri_: &str) -> Result<Source, DataError> {
 }
 
 pub fn get_source_from_id(id_: i32) -> Result<Source, DataError> {
-    use crate::schema::source::dsl::*;
+    use schema::source::dsl::*;
     let db = connection();
     let con = db.get()?;
 
@@ -274,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 crate::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 crate::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)
 }
@@ -301,36 +295,19 @@ pub(crate) fn get_episode_minimal_from_pk(
     title_: &str,
     pid: i32,
 ) -> Result<EpisodeMinimal, DataError> {
-    use crate::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)
 }
 
-#[cfg(test)]
-pub(crate) fn get_episode_cleaner_from_pk(
-    title_: &str,
-    pid: i32,
-) -> Result<EpisodeCleanerModel, DataError> {
-    use crate::schema::episodes::dsl::*;
-    let db = connection();
-    let con = db.get()?;
-
-    episodes
-        .select((rowid, local_uri, played))
-        .filter(title.eq(title_))
-        .filter(show_id.eq(pid))
-        .get_result::<EpisodeCleanerModel>(&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()?;
 
@@ -344,25 +321,25 @@ pub(crate) fn remove_feed(pd: &Show) -> Result<(), DataError> {
 }
 
 fn delete_source(con: &SqliteConnection, source_id: i32) -> QueryResult<usize> {
-    use crate::schema::source::dsl::*;
+    use schema::source::dsl::*;
 
     diesel::delete(source.filter(id.eq(source_id))).execute(con)
 }
 
-fn delete_podcast(con: &SqliteConnection, show_id: i32) -> QueryResult<usize> {
-    use crate::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 crate::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> {
-    use crate::schema::source::dsl::*;
+    use schema::source::dsl::*;
 
     let db = connection();
     let con = db.get()?;
@@ -373,84 +350,81 @@ pub fn source_exists(url: &str) -> Result<bool, DataError> {
 }
 
 pub(crate) fn podcast_exists(source_id_: i32) -> Result<bool, DataError> {
-    use crate::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 crate::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
-///
-/// Return true if `episodes` table is populated.
-pub fn is_episodes_populated(filter_show_ids: &[i32]) -> Result<bool, DataError> {
-    use crate::schema::episodes::dsl::*;
+pub fn episode_had_description(rowid_: i32) -> Result<bool, DataError> {
+    use schema::episode::dsl::*;
 
     let db = connection();
     let con = db.get()?;
 
-    select(exists(episodes.filter(show_id.ne_all(filter_show_ids))))
+    select(exists(episode.filter(rowid.eq(rowid_))))
         .get_result(&con)
         .map_err(From::from)
 }
 
-/// Check if the `shows` table contains any rows
+/// Check if the `episode` table contains any rows
 ///
-/// Return true if `shows` table is populated.
+/// Return true if `episode` table is populated.
+pub fn is_episodes_populated() -> Result<bool, DataError> {
+    use schema::episode::dsl::*;
+
+    let db = connection();
+    let con = db.get()?;
+
+    select(exists(episode.as_query()))
+        .get_result(&con)
+        .map_err(From::from)
+}
+
+/// Check if the `podcast` table contains any rows
+///
+/// Return true if `podcast table is populated.
 pub fn is_podcasts_populated(filter_ids: &[i32]) -> Result<bool, DataError> {
-    use crate::schema::shows::dsl::*;
+    use schema::podcast::dsl::*;
 
     let db = connection();
     let con = db.get()?;
 
-    select(exists(shows.filter(id.ne_all(filter_ids))))
-        .get_result(&con)
-        .map_err(From::from)
-}
-
-/// Check if the `source` table contains any rows
-///
-/// Return true if `source` table is populated.
-pub fn is_source_populated(filter_ids: &[i32]) -> Result<bool, DataError> {
-    use crate::schema::source::dsl::*;
-
-    let db = connection();
-    let con = db.get()?;
-
-    select(exists(source.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 crate::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 crate::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()?;
 
@@ -466,27 +440,25 @@ pub fn update_none_to_played_now(parent: &Show) -> Result<usize, DataError> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::database::*;
-    use crate::pipeline;
-    use failure::Error;
+    use database::*;
+    use pipeline;
 
     #[test]
-    fn test_update_none_to_played_now() -> Result<(), Error> {
-        truncate_db()?;
+    fn test_update_none_to_played_now() {
+        truncate_db().unwrap();
 
         let url = "https://web.archive.org/web/20180120083840if_/https://feeds.feedburner.\
                    com/InterceptedWithJeremyScahill";
-        let source = Source::from_url(url)?;
+        let source = Source::from_url(url).unwrap();
         let id = source.id();
-        pipeline::run(vec![source])?;
-        let pd = get_podcast_from_source_id(id)?;
+        pipeline::run(vec![source], true).unwrap();
+        let pd = get_podcast_from_source_id(id).unwrap();
 
-        let eps_num = get_pd_unplayed_episodes(&pd)?.len();
+        let eps_num = get_pd_unplayed_episodes(&pd).unwrap().len();
         assert_ne!(eps_num, 0);
 
-        update_none_to_played_now(&pd)?;
-        let eps_num2 = get_pd_unplayed_episodes(&pd)?.len();
+        update_none_to_played_now(&pd).unwrap();
+        let eps_num2 = get_pd_unplayed_episodes(&pd).unwrap().len();
         assert_eq!(eps_num2, 0);
-        Ok(())
     }
 }

hammond-data/src/errors.rs

@@ -0,0 +1,131 @@
+use diesel;
+use diesel::r2d2;
+use diesel_migrations::RunMigrationsError;
+use hyper;
+use native_tls;
+use rss;
+use url;
+use xml;
+
+use std::io;
+
+use models::Source;
+
+#[fail(display = "Request to {} returned {}. Context: {}", url, status_code, context)]
+#[derive(Fail, Debug)]
+pub struct HttpStatusError {
+    url: String,
+    status_code: hyper::StatusCode,
+    context: String,
+}
+
+impl HttpStatusError {
+    pub fn new(url: String, code: hyper::StatusCode, context: String) -> Self {
+        HttpStatusError {
+            url,
+            status_code: code,
+            context,
+        }
+    }
+}
+
+#[derive(Fail, Debug)]
+pub enum DataError {
+    #[fail(display = "SQL Query failed: {}", _0)]
+    DieselResultError(#[cause] diesel::result::Error),
+    #[fail(display = "Database Migration error: {}", _0)]
+    DieselMigrationError(#[cause] RunMigrationsError),
+    #[fail(display = "R2D2 error: {}", _0)]
+    R2D2Error(#[cause] r2d2::Error),
+    #[fail(display = "R2D2 Pool error: {}", _0)]
+    R2D2PoolError(#[cause] r2d2::PoolError),
+    #[fail(display = "Hyper Error: {}", _0)]
+    HyperError(#[cause] hyper::Error),
+    #[fail(display = "Failed to parse a url: {}", _0)]
+    // TODO: print the url too
+    UrlError(#[cause] url::ParseError),
+    #[fail(display = "TLS Error: {}", _0)]
+    TLSError(#[cause] native_tls::Error),
+    #[fail(display = "IO Error: {}", _0)]
+    IOError(#[cause] io::Error),
+    #[fail(display = "RSS Error: {}", _0)]
+    RssError(#[cause] rss::Error),
+    #[fail(display = "XML Reader Error: {}", _0)]
+    XmlReaderError(#[cause] xml::reader::Error),
+    #[fail(display = "Error: {}", _0)]
+    Bail(String),
+    #[fail(display = "{}", _0)]
+    HttpStatusGeneral(HttpStatusError),
+    #[fail(display = "FIXME: This should be better")]
+    F301(Source),
+    #[fail(display = "Error occured while Parsing an Episode. Reason: {}", reason)]
+    ParseEpisodeError { reason: String, parent_id: i32 },
+    #[fail(display = "Episode was not changed and thus skipped.")]
+    EpisodeNotChanged,
+}
+
+impl From<RunMigrationsError> for DataError {
+    fn from(err: RunMigrationsError) -> Self {
+        DataError::DieselMigrationError(err)
+    }
+}
+
+impl From<diesel::result::Error> for DataError {
+    fn from(err: diesel::result::Error) -> Self {
+        DataError::DieselResultError(err)
+    }
+}
+
+impl From<r2d2::Error> for DataError {
+    fn from(err: r2d2::Error) -> Self {
+        DataError::R2D2Error(err)
+    }
+}
+
+impl From<r2d2::PoolError> for DataError {
+    fn from(err: r2d2::PoolError) -> Self {
+        DataError::R2D2PoolError(err)
+    }
+}
+
+impl From<hyper::Error> for DataError {
+    fn from(err: hyper::Error) -> Self {
+        DataError::HyperError(err)
+    }
+}
+
+impl From<url::ParseError> for DataError {
+    fn from(err: url::ParseError) -> Self {
+        DataError::UrlError(err)
+    }
+}
+
+impl From<native_tls::Error> for DataError {
+    fn from(err: native_tls::Error) -> Self {
+        DataError::TLSError(err)
+    }
+}
+
+impl From<io::Error> for DataError {
+    fn from(err: io::Error) -> Self {
+        DataError::IOError(err)
+    }
+}
+
+impl From<rss::Error> for DataError {
+    fn from(err: rss::Error) -> Self {
+        DataError::RssError(err)
+    }
+}
+
+impl From<xml::reader::Error> for DataError {
+    fn from(err: xml::reader::Error) -> Self {
+        DataError::XmlReaderError(err)
+    }
+}
+
+impl From<String> for DataError {
+    fn from(err: String) -> Self {
+        DataError::Bail(err)
+    }
+}

hammond-data/src/feed.rs

@@ -1,24 +1,4 @@
-// feed.rs
-//
-// Copyright 2017 Jordan Petridis <jpetridis@gnome.org>
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-
-#![allow(clippy::unit_arg)]
+#![cfg_attr(feature = "cargo-clippy", allow(unit_arg))]
 //! Index Feeds.
 
 use futures::future::*;
@@ -26,10 +6,10 @@ use futures::prelude::*;
 use futures::stream;
 use rss;
 
-use crate::dbqueries;
-use crate::errors::DataError;
-use crate::models::{Index, IndexState, Update};
-use crate::models::{NewEpisode, NewEpisodeMinimal, NewShow, Show};
+use dbqueries;
+use errors::DataError;
+use models::{Index, IndexState, Update};
+use models::{NewEpisode, NewEpisodeMinimal, NewPodcast, Podcast};
 
 /// Wrapper struct that hold a `Source` id and the `rss::Channel`
 /// that corresponds to the `Source.uri` field.
@@ -46,22 +26,25 @@ pub struct Feed {
 impl Feed {
     /// Index the contents of the RSS `Feed` into the database.
     pub fn index(self) -> impl Future<Item = (), Error = DataError> + Send {
-        ok(self.parse_podcast())
+        self.parse_podcast_async()
             .and_then(|pd| pd.to_podcast())
             .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 index_channel_items(self, pd: Show) -> impl Future<Item = (), 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: Podcast) -> impl Future<Item = (), Error = DataError> + Send {
         let stream = stream::iter_ok::<_, DataError>(self.channel.into_items());
 
         // Parse the episodes
         let episodes = stream.filter_map(move |item| {
-            NewEpisodeMinimal::new(&item, pd.id())
-                .and_then(move |ep| determine_ep_state(ep, &item))
+            glue(&item, pd.id())
                 .map_err(|err| error!("Failed to parse an episode: {}", err))
                 .ok()
         });
@@ -73,17 +56,21 @@ impl Feed {
     }
 }
 
+fn glue(item: &rss::Item, id: i32) -> Result<IndexState<NewEpisode>, DataError> {
+    NewEpisodeMinimal::new(item, id).and_then(move |ep| determine_ep_state(ep, item))
+}
+
 fn determine_ep_state(
     ep: NewEpisodeMinimal,
     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 {
@@ -100,22 +87,21 @@ fn filter_episodes<'a, S>(
 where
     S: Stream<Item = IndexState<NewEpisode>, Error = DataError> + Send + 'a,
 {
-    stream
-        .filter_map(|state| match state {
-            IndexState::NotChanged => None,
-            // Update individual rows, and filter them
-            IndexState::Update((ref ep, rowid)) => {
-                ep.update(rowid)
-                    .map_err(|err| error!("{}", err))
-                    .map_err(|_| error!("Failed to index episode: {:?}.", ep.title()))
-                    .ok();
+    stream.filter_map(|state| match state {
+        IndexState::NotChanged => None,
+        // Update individual rows, and filter them
+        IndexState::Update((ref ep, rowid)) => {
+            ep.update(rowid)
+                .map_err(|err| error!("{}", err))
+                .map_err(|_| error!("Failed to index episode: {:?}.", ep.title()))
+                .ok();
 
-                None
-            }
-            IndexState::Index(s) => Some(s),
-        })
-        // only Index is left, collect them for batch index
-        .collect()
+            None
+        },
+        IndexState::Index(s) => Some(s),
+    })
+    // only Index is left, collect them for batch index
+    .collect()
 }
 
 fn batch_insert_episodes(episodes: &[NewEpisode]) {
@@ -141,14 +127,13 @@ fn batch_insert_episodes(episodes: &[NewEpisode]) {
 
 #[cfg(test)]
 mod tests {
-    use failure::Error;
     use rss::Channel;
-    use tokio::{self, prelude::*};
+    use tokio_core::reactor::Core;
 
-    use crate::database::truncate_db;
-    use crate::dbqueries;
-    use crate::utils::get_feed;
-    use crate::Source;
+    use database::truncate_db;
+    use dbqueries;
+    use utils::get_feed;
+    use Source;
 
     use std::fs;
     use std::io::BufReader;
@@ -186,8 +171,8 @@ mod tests {
     };
 
     #[test]
-    fn test_complete_index() -> Result<(), Error> {
-        truncate_db()?;
+    fn test_complete_index() {
+        truncate_db().unwrap();
 
         let feeds: Vec<_> = URLS
             .iter()
@@ -198,43 +183,41 @@ mod tests {
             })
             .collect();
 
+        let mut core = Core::new().unwrap();
         // Index the channels
-        let stream_ = stream::iter_ok(feeds).for_each(|x| x.index());
-        tokio::run(stream_.map_err(|_| ()));
+        let list: Vec<_> = feeds.into_iter().map(|x| x.index()).collect();
+        let _foo = core.run(join_all(list));
 
         // Assert the index rows equal the controlled results
-        assert_eq!(dbqueries::get_sources()?.len(), 5);
-        assert_eq!(dbqueries::get_podcasts()?.len(), 5);
-        assert_eq!(dbqueries::get_episodes()?.len(), 354);
-        Ok(())
+        assert_eq!(dbqueries::get_sources().unwrap().len(), 5);
+        assert_eq!(dbqueries::get_podcasts().unwrap().len(), 5);
+        assert_eq!(dbqueries::get_episodes().unwrap().len(), 354);
     }
 
     #[test]
-    fn test_feed_parse_podcast() -> Result<(), Error> {
-        truncate_db()?;
+    fn test_feed_parse_podcast() {
+        truncate_db().unwrap();
 
         let path = "tests/feeds/2018-01-20-Intercepted.xml";
         let feed = get_feed(path, 42);
 
-        let file = fs::File::open(path)?;
-        let channel = Channel::read_from(BufReader::new(file))?;
+        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);
-        Ok(())
     }
 
     #[test]
-    fn test_feed_index_channel_items() -> Result<(), Error> {
-        truncate_db()?;
+    fn test_feed_index_channel_items() {
+        truncate_db().unwrap();
 
         let path = "tests/feeds/2018-01-20-Intercepted.xml";
         let feed = get_feed(path, 42);
-        let pd = feed.parse_podcast().to_podcast()?;
+        let pd = feed.parse_podcast().to_podcast().unwrap();
 
-        feed.index_channel_items(pd).wait()?;
-        assert_eq!(dbqueries::get_podcasts()?.len(), 1);
-        assert_eq!(dbqueries::get_episodes()?.len(), 43);
-        Ok(())
+        feed.index_channel_items(pd).wait().unwrap();
+        assert_eq!(dbqueries::get_podcasts().unwrap().len(), 1);
+        assert_eq!(dbqueries::get_episodes().unwrap().len(), 43);
     }
 }

hammond-data/src/lib.rs

@@ -0,0 +1,117 @@
+#![recursion_limit = "1024"]
+#![allow(unknown_lints)]
+#![cfg_attr(all(test, feature = "clippy"), allow(option_unwrap_used, result_unwrap_used))]
+#![cfg_attr(feature = "cargo-clippy", allow(option_map_unit_fn))]
+#![cfg_attr(
+    feature = "clippy",
+    warn(
+        option_unwrap_used, result_unwrap_used, print_stdout, wrong_pub_self_convention, mut_mut,
+        non_ascii_literal, similar_names, unicode_not_nfc, enum_glob_use, if_not_else,
+        items_after_statements, used_underscore_binding
+    )
+)]
+#![warn(
+    bad_style, const_err, dead_code, improper_ctypes, legacy_directory_ownership,
+    non_shorthand_field_patterns, no_mangle_generic_items, overflowing_literals, path_statements,
+    patterns_in_fns_without_body, plugin_as_library, private_in_public, private_no_mangle_fns,
+    private_no_mangle_statics, safe_extern_statics, unconditional_recursion,
+    unions_with_drop_fields, unused_allocation, unused_comparisons, unused_parens, while_true,
+    missing_debug_implementations, missing_docs, trivial_casts, trivial_numeric_casts,
+    unused_extern_crates, unused
+)]
+#![deny(warnings)]
+
+//! FIXME: Docs
+
+#[cfg(test)]
+#[macro_use]
+extern crate pretty_assertions;
+
+#[cfg(test)]
+#[macro_use]
+extern crate maplit;
+
+#[macro_use]
+extern crate derive_builder;
+#[macro_use]
+extern crate diesel;
+#[macro_use]
+extern crate diesel_migrations;
+// #[macro_use]
+extern crate failure;
+#[macro_use]
+extern crate failure_derive;
+#[macro_use]
+extern crate lazy_static;
+#[macro_use]
+extern crate log;
+
+extern crate ammonia;
+extern crate chrono;
+extern crate futures;
+extern crate hyper;
+extern crate hyper_tls;
+extern crate native_tls;
+extern crate num_cpus;
+extern crate rayon;
+extern crate rayon_futures;
+extern crate rfc822_sanitizer;
+extern crate rss;
+extern crate tokio_core;
+extern crate url;
+extern crate xdg;
+extern crate xml;
+
+pub mod database;
+#[allow(missing_docs)]
+pub mod dbqueries;
+#[allow(missing_docs)]
+pub mod errors;
+mod feed;
+pub(crate) mod models;
+pub mod opml;
+mod parser;
+pub mod pipeline;
+mod schema;
+pub mod utils;
+
+pub use feed::{Feed, FeedBuilder};
+pub use models::Save;
+pub use models::{Episode, EpisodeWidgetQuery, Podcast, PodcastCoverQuery, Source};
+
+// Set the user agent, See #53 for more
+// Keep this in sync with Tor-browser releases
+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)]
+pub mod xdg_dirs {
+    use std::path::PathBuf;
+    use xdg;
+
+    lazy_static!{
+        pub(crate) static ref HAMMOND_XDG: xdg::BaseDirectories = {
+            xdg::BaseDirectories::with_prefix("hammond").unwrap()
+        };
+
+        /// XDG_DATA Directory `Pathbuf`.
+        pub static ref HAMMOND_DATA: PathBuf = {
+            HAMMOND_XDG.create_data_directory(HAMMOND_XDG.get_data_home()).unwrap()
+        };
+
+        /// XDG_CONFIG Directory `Pathbuf`.
+        pub static ref HAMMOND_CONFIG: PathBuf = {
+            HAMMOND_XDG.create_config_directory(HAMMOND_XDG.get_config_home()).unwrap()
+        };
+
+        /// XDG_CACHE Directory `Pathbuf`.
+        pub static ref HAMMOND_CACHE: PathBuf = {
+            HAMMOND_XDG.create_cache_directory(HAMMOND_XDG.get_cache_home()).unwrap()
+        };
+
+        /// Hammond Download Direcotry `PathBuf`.
+        pub static ref DL_DIR: PathBuf = {
+            HAMMOND_XDG.create_data_directory("Downloads").unwrap()
+        };
+    }
+}

hammond-data/src/models/episode.rs

@@ -1,37 +1,18 @@
-// episode.rs
-//
-// Copyright 2017 Jordan Petridis <jpetridis@gnome.org>
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 use chrono::prelude::*;
 use diesel;
 use diesel::prelude::*;
 use diesel::SaveChangesDsl;
 
-use crate::database::connection;
-use crate::errors::DataError;
-use crate::models::{Save, Show};
-use crate::schema::episodes;
+use database::connection;
+use errors::DataError;
+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 {
@@ -45,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 {
@@ -72,6 +55,11 @@ impl Episode {
         &self.title
     }
 
+    /// Set the `title`.
+    pub fn set_title(&mut self, value: &str) {
+        self.title = value.to_string();
+    }
+
     /// Get the value of the `uri`.
     ///
     /// Represents the url(usually) that the media file will be located at.
@@ -79,6 +67,11 @@ impl Episode {
         self.uri.as_ref().map(|s| s.as_str())
     }
 
+    /// Set the `uri`.
+    pub fn set_uri(&mut self, value: Option<&str>) {
+        self.uri = value.map(|x| x.to_string());
+    }
+
     /// Get the value of the `local_uri`.
     ///
     /// Represents the local uri,usually filesystem path,
@@ -87,16 +80,31 @@ impl Episode {
         self.local_uri.as_ref().map(|s| s.as_str())
     }
 
+    /// Set the `local_uri`.
+    pub fn set_local_uri(&mut self, value: Option<&str>) {
+        self.local_uri = value.map(|x| x.to_string());
+    }
+
     /// Get the `description`.
     pub fn description(&self) -> Option<&str> {
         self.description.as_ref().map(|s| s.as_str())
     }
 
+    /// Set the `description`.
+    pub fn set_description(&mut self, value: Option<&str>) {
+        self.description = value.map(|x| x.to_string());
+    }
+
     /// Get the Episode's `guid`.
     pub fn guid(&self) -> Option<&str> {
         self.guid.as_ref().map(|s| s.as_str())
     }
 
+    /// Set the `guid`.
+    pub fn set_guid(&mut self, value: Option<&str>) {
+        self.guid = value.map(|x| x.to_string());
+    }
+
     /// Get the `epoch` value.
     ///
     /// Retrieved from the rss Item publish date.
@@ -105,6 +113,11 @@ impl Episode {
         self.epoch
     }
 
+    /// Set the `epoch`.
+    pub fn set_epoch(&mut self, value: i32) {
+        self.epoch = value;
+    }
+
     /// Get the `length`.
     ///
     /// The number represents the size of the file in bytes.
@@ -112,6 +125,11 @@ impl Episode {
         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.
@@ -119,6 +137,11 @@ impl Episode {
         self.duration
     }
 
+    /// Set the `duration`.
+    pub fn set_duration(&mut self, value: Option<i32>) {
+        self.duration = value;
+    }
+
     /// Epoch representation of the last time the episode was played.
     ///
     /// None/Null for unplayed.
@@ -126,19 +149,54 @@ impl Episode {
         self.played
     }
 
-    /// `Show` table foreign key.
-    pub fn show_id(&self) -> i32 {
-        self.show_id
+    /// Set the `played` value.
+    pub fn set_played(&mut self, value: Option<i32>) {
+        self.played = value;
+    }
+
+    /// 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.
+    pub fn set_played_now(&mut self) -> Result<(), DataError> {
+        let epoch = Utc::now().timestamp() as i32;
+        self.set_played(Some(epoch));
+        self.save().map(|_| ())
     }
 }
 
 #[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>,
@@ -147,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,
@@ -161,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 crate::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
@@ -242,6 +302,11 @@ impl EpisodeWidgetModel {
         self.duration
     }
 
+    /// Set the `duration`.
+    pub fn set_duration(&mut self, value: Option<i32>) {
+        self.duration = value;
+    }
+
     /// Epoch representation of the last time the episode was played.
     ///
     /// None/Null for unplayed.
@@ -250,13 +315,36 @@ impl EpisodeWidgetModel {
     }
 
     /// Set the `played` value.
-    fn set_played(&mut self, value: Option<i32>) {
+    pub fn set_played(&mut self, value: Option<i32>) {
         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.
@@ -268,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 crate::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,
@@ -307,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
@@ -340,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 {
@@ -350,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 {
@@ -362,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,
         }
     }
 }
@@ -402,13 +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
-    }
-
     /// Get the `duration` value.
     ///
     /// The number represents the duration of the item/episode in seconds.
@@ -416,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

@@ -0,0 +1,59 @@
+mod new_episode;
+mod new_podcast;
+mod new_source;
+
+mod episode;
+mod podcast;
+mod source;
+
+// use futures::prelude::*;
+// use futures::future::*;
+
+pub(crate) use self::episode::EpisodeCleanerQuery;
+pub(crate) use self::new_episode::{NewEpisode, NewEpisodeMinimal};
+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_podcast::NewPodcastBuilder;
+
+pub use self::episode::{Episode, EpisodeMinimal, EpisodeWidgetQuery};
+pub use self::podcast::{Podcast, PodcastCoverQuery};
+pub use self::source::Source;
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum IndexState<T> {
+    Index(T),
+    Update((T, i32)),
+    NotChanged,
+}
+
+pub trait Insert<T> {
+    type Error;
+
+    fn insert(&self) -> Result<T, Self::Error>;
+}
+
+pub trait Update<T> {
+    type Error;
+
+    fn update(&self, i32) -> Result<T, Self::Error>;
+}
+
+// This might need to change in the future
+pub trait Index<T>: Insert<T> + Update<T> {
+    type Error;
+
+    fn index(&self) -> Result<T, <Self as Index<T>>::Error>;
+}
+
+/// FIXME: DOCS
+pub trait Save<T> {
+    /// The Error type to be returned.
+    type Error;
+    /// Helper method to easily save/"sync" current state of a diesel model to
+    /// the Database.
+    fn save(&self) -> Result<T, Self::Error>;
+}

hammond-data/src/models/new_episode.rs

@@ -1,38 +1,19 @@
-// new_episode.rs
-//
-// Copyright 2017 Jordan Petridis <jpetridis@gnome.org>
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 use ammonia;
 use diesel;
 use diesel::prelude::*;
 use rfc822_sanitizer::parse_from_rfc2822_with_fallback as parse_rfc822;
 use rss;
 
-use crate::database::connection;
-use crate::dbqueries;
-use crate::errors::DataError;
-use crate::models::{Episode, EpisodeMinimal, Index, Insert, Update};
-use crate::parser;
-use crate::schema::episodes;
-use crate::utils::url_cleaner;
+use database::connection;
+use dbqueries;
+use errors::DataError;
+use models::{Episode, EpisodeMinimal, Index, Insert, Update};
+use parser;
+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))]
@@ -45,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 {
@@ -55,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()
@@ -66,12 +47,12 @@ impl Insert<()> for NewEpisode {
     type Error = DataError;
 
     fn insert(&self) -> Result<(), DataError> {
-        use crate::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)
@@ -83,12 +64,12 @@ impl Update<()> for NewEpisode {
     type Error = DataError;
 
     fn update(&self, episode_id: i32) -> Result<(), DataError> {
-        use crate::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)
@@ -102,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())
@@ -125,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())
     }
 }
 
@@ -136,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())
     }
@@ -145,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)
     }
 }
 
@@ -186,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 {
@@ -213,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())
     }
 }
 
@@ -231,20 +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
+        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 {
@@ -255,7 +227,7 @@ impl NewEpisodeMinimal {
             return Err(err);
         };
 
-        // Default to rfc2822 representation of epoch 0.
+        // Default to rfc2822 represantation of epoch 0.
         let date = parse_rfc822(item.pub_date().unwrap_or("Thu, 1 Jan 1970 00:00:00 +0000"));
         // Should treat information from the rss feeds as invalid by default.
         // Case: "Thu, 05 Aug 2016 06:00:00 -0400" <-- Actually that was friday.
@@ -266,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
@@ -292,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()
@@ -323,18 +294,16 @@ 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 crate::database::truncate_db;
-    use crate::dbqueries;
-    use crate::models::new_episode::{NewEpisodeMinimal, NewEpisodeMinimalBuilder};
-    use crate::models::*;
-    use failure::Error;
+    use database::truncate_db;
+    use dbqueries;
+    use models::new_episode::{NewEpisodeMinimal, NewEpisodeMinimalBuilder};
+    use models::*;
 
     use rss::Channel;
 
@@ -342,7 +311,7 @@ mod tests {
     use std::io::BufReader;
 
     // TODO: Add tests for other feeds too.
-    // Especially if you find an *interesting* generated feed.
+    // Especially if you find an *intresting* generated feed.
 
     // Known prebuilt expected objects.
     lazy_static! {
@@ -354,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()
         };
@@ -368,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()
         };
@@ -391,7 +358,7 @@ mod tests {
                 .length(Some(66738886))
                 .epoch(1505296800)
                 .duration(Some(4171))
-                .show_id(42)
+                .podcast_id(42)
                 .build()
                 .unwrap()
         };
@@ -415,7 +382,7 @@ mod tests {
                 .length(Some(67527575))
                 .epoch(1502272800)
                 .duration(Some(4415))
-                .show_id(42)
+                .podcast_id(42)
                 .build()
                 .unwrap()
         };
@@ -430,7 +397,7 @@ mod tests {
                 .length(Some(66738886))
                 .epoch(1505296800)
                 .duration(Some(424242))
-                .show_id(42)
+                .podcast_id(42)
                 .build()
                 .unwrap()
         };
@@ -441,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()
         };
@@ -456,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()
         };
@@ -478,7 +443,7 @@ mod tests {
                 .length(Some(46479789))
                 .epoch(1505280282)
                 .duration(Some(5733))
-                .show_id(42)
+                .podcast_id(42)
                 .build()
                 .unwrap()
         };
@@ -500,88 +465,80 @@ mod tests {
                 .length(Some(36544272))
                 .epoch(1504670247)
                 .duration(Some(4491))
-                .show_id(42)
+                .podcast_id(42)
                 .build()
                 .unwrap()
         };
     }
 
     #[test]
-    fn test_new_episode_minimal_intercepted() -> Result<(), Error> {
-        let file = File::open("tests/feeds/2018-01-20-Intercepted.xml")?;
-        let channel = Channel::read_from(BufReader::new(file))?;
+    fn test_new_episode_minimal_intercepted() {
+        let file = File::open("tests/feeds/2018-01-20-Intercepted.xml").unwrap();
+        let channel = Channel::read_from(BufReader::new(file)).unwrap();
 
         let episode = channel.items().iter().nth(14).unwrap();
-        let ep = NewEpisodeMinimal::new(&episode, 42)?;
+        let ep = NewEpisodeMinimal::new(&episode, 42).unwrap();
         assert_eq!(ep, *EXPECTED_MINIMAL_INTERCEPTED_1);
 
         let episode = channel.items().iter().nth(15).unwrap();
-        let ep = NewEpisodeMinimal::new(&episode, 42)?;
+        let ep = NewEpisodeMinimal::new(&episode, 42).unwrap();
         assert_eq!(ep, *EXPECTED_MINIMAL_INTERCEPTED_2);
-        Ok(())
     }
 
     #[test]
-    fn test_new_episode_intercepted() -> Result<(), Error> {
-        let file = File::open("tests/feeds/2018-01-20-Intercepted.xml")?;
-        let channel = Channel::read_from(BufReader::new(file))?;
+    fn test_new_episode_intercepted() {
+        let file = File::open("tests/feeds/2018-01-20-Intercepted.xml").unwrap();
+        let channel = Channel::read_from(BufReader::new(file)).unwrap();
 
         let episode = channel.items().iter().nth(14).unwrap();
-        let ep = NewEpisode::new(&episode, 42)?;
+        let ep = NewEpisode::new(&episode, 42).unwrap();
         assert_eq!(ep, *EXPECTED_INTERCEPTED_1);
 
         let episode = channel.items().iter().nth(15).unwrap();
-        let ep = NewEpisode::new(&episode, 42)?;
+        let ep = NewEpisode::new(&episode, 42).unwrap();
 
         assert_eq!(ep, *EXPECTED_INTERCEPTED_2);
-        Ok(())
     }
 
     #[test]
-    fn test_new_episode_minimal_lup() -> Result<(), Error> {
-        let file = File::open("tests/feeds/2018-01-20-LinuxUnplugged.xml")?;
-        let channel = Channel::read_from(BufReader::new(file))?;
+    fn test_new_episode_minimal_lup() {
+        let file = File::open("tests/feeds/2018-01-20-LinuxUnplugged.xml").unwrap();
+        let channel = Channel::read_from(BufReader::new(file)).unwrap();
 
         let episode = channel.items().iter().nth(18).unwrap();
-        let ep = NewEpisodeMinimal::new(&episode, 42)?;
+        let ep = NewEpisodeMinimal::new(&episode, 42).unwrap();
         assert_eq!(ep, *EXPECTED_MINIMAL_LUP_1);
 
         let episode = channel.items().iter().nth(19).unwrap();
-        let ep = NewEpisodeMinimal::new(&episode, 42)?;
+        let ep = NewEpisodeMinimal::new(&episode, 42).unwrap();
         assert_eq!(ep, *EXPECTED_MINIMAL_LUP_2);
-        Ok(())
     }
 
     #[test]
-    fn test_new_episode_lup() -> Result<(), Error> {
-        let file = File::open("tests/feeds/2018-01-20-LinuxUnplugged.xml")?;
-        let channel = Channel::read_from(BufReader::new(file))?;
+    fn test_new_episode_lup() {
+        let file = File::open("tests/feeds/2018-01-20-LinuxUnplugged.xml").unwrap();
+        let channel = Channel::read_from(BufReader::new(file)).unwrap();
 
         let episode = channel.items().iter().nth(18).unwrap();
-        let ep = NewEpisode::new(&episode, 42)?;
+        let ep = NewEpisode::new(&episode, 42).unwrap();
         assert_eq!(ep, *EXPECTED_LUP_1);
 
         let episode = channel.items().iter().nth(19).unwrap();
-        let ep = NewEpisode::new(&episode, 42)?;
+        let ep = NewEpisode::new(&episode, 42).unwrap();
         assert_eq!(ep, *EXPECTED_LUP_2);
-        Ok(())
     }
 
     #[test]
-    fn test_minimal_into_new_episode() -> Result<(), Error> {
-        truncate_db()?;
+    fn test_minimal_into_new_episode() {
+        truncate_db().unwrap();
 
-        let file = File::open("tests/feeds/2018-01-20-Intercepted.xml")?;
-        let channel = Channel::read_from(BufReader::new(file))?;
+        let file = File::open("tests/feeds/2018-01-20-Intercepted.xml").unwrap();
+        let channel = Channel::read_from(BufReader::new(file)).unwrap();
 
         let item = channel.items().iter().nth(14).unwrap();
         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();
@@ -589,58 +546,61 @@ mod tests {
             .clone()
             .into_new_episode(&item);
         assert_eq!(ep, *EXPECTED_INTERCEPTED_2);
-        Ok(())
     }
 
     #[test]
-    fn test_new_episode_insert() -> Result<(), Error> {
-        truncate_db()?;
+    fn test_new_episode_insert() {
+        truncate_db().unwrap();
 
-        let file = File::open("tests/feeds/2018-01-20-Intercepted.xml")?;
-        let channel = Channel::read_from(BufReader::new(file))?;
+        let file = File::open("tests/feeds/2018-01-20-Intercepted.xml").unwrap();
+        let channel = Channel::read_from(BufReader::new(file)).unwrap();
 
         let episode = channel.items().iter().nth(14).unwrap();
-        let new_ep = NewEpisode::new(&episode, 42)?;
-        new_ep.insert()?;
-        let ep = dbqueries::get_episode_from_pk(new_ep.title(), new_ep.show_id())?;
+        let new_ep = NewEpisode::new(&episode, 42).unwrap();
+        new_ep.insert().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);
         assert_eq!(&*EXPECTED_INTERCEPTED_1, &ep);
 
         let episode = channel.items().iter().nth(15).unwrap();
-        let new_ep = NewEpisode::new(&episode, 42)?;
-        new_ep.insert()?;
-        let ep = dbqueries::get_episode_from_pk(new_ep.title(), new_ep.show_id())?;
+        let new_ep = NewEpisode::new(&episode, 42).unwrap();
+        new_ep.insert().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);
         assert_eq!(&*EXPECTED_INTERCEPTED_2, &ep);
-        Ok(())
     }
 
     #[test]
-    fn test_new_episode_update() -> Result<(), Error> {
-        truncate_db()?;
-        let old = EXPECTED_INTERCEPTED_1.clone().to_episode()?;
+    fn test_new_episode_update() {
+        truncate_db().unwrap();
+        let old = EXPECTED_INTERCEPTED_1.clone().to_episode().unwrap();
 
         let updated = &*UPDATED_DURATION_INTERCEPTED_1;
-        updated.update(old.rowid())?;
-        let new = dbqueries::get_episode_from_pk(old.title(), old.show_id())?;
+        updated.update(old.rowid()).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);
-        Ok(())
+
+        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]
-    fn test_new_episode_index() -> Result<(), Error> {
-        truncate_db()?;
+    fn test_new_episode_index() {
+        truncate_db().unwrap();
         let expected = &*EXPECTED_INTERCEPTED_1;
 
         // First insert
@@ -648,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())?;
+        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);
 
@@ -657,33 +617,42 @@ 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())?;
+        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());
-        Ok(())
+        assert_eq!(new.podcast_id(), old.podcast_id());
     }
 
     #[test]
-    fn test_new_episode_to_episode() -> Result<(), Error> {
+    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()?;
-        expected.insert()?;
-        let old = dbqueries::get_episode_from_pk(expected.title(), expected.show_id())?;
-        let ep = expected.to_episode()?;
+        truncate_db().unwrap();
+        expected.insert().unwrap();
+        let old = dbqueries::get_episode_from_pk(expected.title(), expected.podcast_id()).unwrap();
+        let ep = expected.to_episode().unwrap();
         assert_eq!(old, ep);
 
         // Same as above, diff order
-        truncate_db()?;
-        let ep = expected.to_episode()?;
+        truncate_db().unwrap();
+        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())?;
+        let mut old =
+            dbqueries::get_episode_from_pk(expected.title(), expected.podcast_id()).unwrap();
         assert_eq!(old, ep);
-        Ok(())
+
+        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

@@ -1,43 +1,24 @@
-// new_show.rs
-//
-// Copyright 2017 Jordan Petridis <jpetridis@gnome.org>
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 use ammonia;
 use diesel;
 use diesel::prelude::*;
 use rss;
 
-use crate::errors::DataError;
-use crate::models::Show;
-use crate::models::{Index, Insert, Update};
-use crate::schema::shows;
+use errors::DataError;
+use models::Podcast;
+use models::{Index, Insert, Update};
+use schema::podcast;
 
-use crate::database::connection;
-use crate::dbqueries;
-use crate::utils::url_cleaner;
+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,
@@ -45,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 crate::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(|_| ())
@@ -61,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 crate::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(|_| ())
@@ -80,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> {
@@ -100,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())
@@ -110,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());
 
@@ -130,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)
@@ -141,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
@@ -176,18 +157,17 @@ mod tests {
     use super::*;
     // use tokio_core::reactor::Core;
 
-    use failure::Error;
     use rss::Channel;
 
-    use crate::database::truncate_db;
-    use crate::models::NewShowBuilder;
+    use database::truncate_db;
+    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 \
@@ -195,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)
@@ -208,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)
@@ -224,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 \
@@ -235,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)
@@ -247,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 \
@@ -257,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)
@@ -266,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)
@@ -282,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 της Ελληνοφρένειας")
@@ -292,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")
@@ -309,80 +289,73 @@ mod tests {
     }
 
     #[test]
-    fn test_new_podcast_intercepted() -> Result<(), Error> {
-        let file = File::open("tests/feeds/2018-01-20-Intercepted.xml")?;
-        let channel = Channel::read_from(BufReader::new(file))?;
+    fn test_new_podcast_intercepted() {
+        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);
-        Ok(())
     }
 
     #[test]
-    fn test_new_podcast_lup() -> Result<(), Error> {
-        let file = File::open("tests/feeds/2018-01-20-LinuxUnplugged.xml")?;
-        let channel = Channel::read_from(BufReader::new(file))?;
+    fn test_new_podcast_lup() {
+        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);
-        Ok(())
     }
 
     #[test]
-    fn test_new_podcast_thetipoff() -> Result<(), Error> {
-        let file = File::open("tests/feeds/2018-01-20-TheTipOff.xml")?;
-        let channel = Channel::read_from(BufReader::new(file))?;
+    fn test_new_podcast_thetipoff() {
+        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);
-        Ok(())
     }
 
     #[test]
-    fn test_new_podcast_steal_the_stars() -> Result<(), Error> {
-        let file = File::open("tests/feeds/2018-01-20-StealTheStars.xml")?;
-        let channel = Channel::read_from(BufReader::new(file))?;
+    fn test_new_podcast_steal_the_stars() {
+        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);
-        Ok(())
     }
 
     #[test]
-    fn test_new_podcast_greater_than_code() -> Result<(), Error> {
-        let file = File::open("tests/feeds/2018-01-20-GreaterThanCode.xml")?;
-        let channel = Channel::read_from(BufReader::new(file))?;
+    fn test_new_podcast_greater_than_code() {
+        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);
-        Ok(())
     }
 
     #[test]
-    fn test_new_podcast_ellinofreneia() -> Result<(), Error> {
-        let file = File::open("tests/feeds/2018-03-28-Ellinofreneia.xml")?;
-        let channel = Channel::read_from(BufReader::new(file))?;
+    fn test_new_podcast_ellinofreneia() {
+        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);
-        Ok(())
     }
 
     #[test]
     // This maybe could be a doc test on insert.
-    fn test_new_podcast_insert() -> Result<(), Error> {
-        truncate_db()?;
-        let file = File::open("tests/feeds/2018-01-20-Intercepted.xml")?;
-        let channel = Channel::read_from(BufReader::new(file))?;
+    fn test_new_podcast_insert() {
+        truncate_db().unwrap();
+        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);
-        npd.insert()?;
-        let pd = dbqueries::get_podcast_from_source_id(42)?;
+        let npd = NewPodcast::new(&channel, 42);
+        npd.insert().unwrap();
+        let pd = dbqueries::get_podcast_from_source_id(42).unwrap();
 
         assert_eq!(npd, pd);
         assert_eq!(*EXPECTED_INTERCEPTED, npd);
         assert_eq!(&*EXPECTED_INTERCEPTED, &pd);
-        Ok(())
     }
 
     #[test]
@@ -390,64 +363,77 @@ mod tests {
     // Currently there's a test that only checks new description or title.
     // If you have time and want to help, implement the test for the other fields
     // too.
-    fn test_new_podcast_update() -> Result<(), Error> {
-        truncate_db()?;
-        let old = EXPECTED_INTERCEPTED.to_podcast()?;
+    fn test_new_podcast_update() {
+        truncate_db().unwrap();
+        let old = EXPECTED_INTERCEPTED.to_podcast().unwrap();
 
         let updated = &*UPDATED_DESC_INTERCEPTED;
-        updated.update(old.id())?;
-        let new = dbqueries::get_podcast_from_source_id(42)?;
+        updated.update(old.id()).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);
-        Ok(())
+
+        // 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]
-    fn test_new_podcast_index() -> Result<(), Error> {
-        truncate_db()?;
+    fn test_new_podcast_index() {
+        truncate_db().unwrap();
 
         // First insert
         assert!(EXPECTED_INTERCEPTED.index().is_ok());
         // Second identical, This should take the early return path
         assert!(EXPECTED_INTERCEPTED.index().is_ok());
         // Get the podcast
-        let old = dbqueries::get_podcast_from_source_id(42)?;
-        // Assert that NewShow is equal to the Indexed one
+        let old = dbqueries::get_podcast_from_source_id(42).unwrap();
+        // 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
-        let new = dbqueries::get_podcast_from_source_id(42)?;
+        // 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);
         assert_eq!(new.id(), old.id());
         assert_eq!(new.source_id(), old.source_id());
-        Ok(())
     }
 
     #[test]
-    fn test_to_podcast() -> Result<(), Error> {
+    fn test_to_podcast() {
         // Assert insert() produces the same result that you would get with to_podcast()
-        truncate_db()?;
-        EXPECTED_INTERCEPTED.insert()?;
-        let old = dbqueries::get_podcast_from_source_id(42)?;
-        let pd = EXPECTED_INTERCEPTED.to_podcast()?;
+        truncate_db().unwrap();
+        EXPECTED_INTERCEPTED.insert().unwrap();
+        let old = dbqueries::get_podcast_from_source_id(42).unwrap();
+        let pd = EXPECTED_INTERCEPTED.to_podcast().unwrap();
         assert_eq!(old, pd);
 
         // Same as above, diff order
-        truncate_db()?;
-        let pd = EXPECTED_INTERCEPTED.to_podcast()?;
+        truncate_db().unwrap();
+        let pd = EXPECTED_INTERCEPTED.to_podcast().unwrap();
         // This should error as a unique constrain violation
         assert!(EXPECTED_INTERCEPTED.insert().is_err());
-        let old = dbqueries::get_podcast_from_source_id(42)?;
+        let mut old = dbqueries::get_podcast_from_source_id(42).unwrap();
         assert_eq!(old, pd);
-        Ok(())
+
+        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/new_source.rs

@@ -1,32 +1,13 @@
-// new_source.rs
-//
-// Copyright 2017 Jordan Petridis <jpetridis@gnome.org>
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 use diesel;
 use diesel::prelude::*;
 use url::Url;
 
-use crate::database::connection;
-use crate::dbqueries;
+use database::connection;
+use dbqueries;
 // use models::{Insert, Update};
-use crate::errors::DataError;
-use crate::models::Source;
-use crate::schema::source;
+use errors::DataError;
+use models::Source;
+use schema::source;
 
 #[derive(Insertable)]
 #[table_name = "source"]
@@ -50,7 +31,7 @@ impl NewSource {
     }
 
     pub(crate) fn insert_or_ignore(&self) -> Result<(), DataError> {
-        use crate::schema::source::dsl::*;
+        use schema::source::dsl::*;
         let db = connection();
         let con = db.get()?;
 

hammond-data/src/models/podcast.rs

@@ -0,0 +1,173 @@
+use diesel::SaveChangesDsl;
+
+use database::connection;
+use errors::DataError;
+use models::{Save, Source};
+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 = "podcast"]
+#[derive(Debug, Clone)]
+/// 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<Podcast> for Podcast {
+    type Error = DataError;
+
+    /// Helper method to easily save/"sync" current state of self to the
+    /// Database.
+    fn save(&self) -> Result<Podcast, Self::Error> {
+        let db = connection();
+        let tempdb = db.get()?;
+
+        self.save_changes::<Podcast>(&*tempdb).map_err(From::from)
+    }
+}
+
+impl Podcast {
+    /// Get the Feed `id`.
+    pub fn id(&self) -> i32 {
+        self.id
+    }
+
+    /// Get the Feed `title`.
+    pub fn title(&self) -> &str {
+        &self.title
+    }
+
+    /// Get the Feed `link`.
+    ///
+    /// Usually the website/homepage of the content creator.
+    pub fn link(&self) -> &str {
+        &self.link
+    }
+
+    /// Set the Podcast/Feed `link`.
+    pub fn set_link(&mut self, value: &str) {
+        self.link = value.to_string();
+    }
+
+    /// Get the `description`.
+    pub fn description(&self) -> &str {
+        &self.description
+    }
+
+    /// Set the `description`.
+    pub fn set_description(&mut self, value: &str) {
+        self.description = value.to_string();
+    }
+
+    /// Get the `image_uri`.
+    ///
+    /// Represents the uri(url usually) that the Feed cover image is located at.
+    pub fn image_uri(&self) -> Option<&str> {
+        self.image_uri.as_ref().map(|s| s.as_str())
+    }
+
+    /// Set the `image_uri`.
+    pub fn set_image_uri(&mut self, value: Option<&str>) {
+        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
+    }
+}
+
+#[derive(Queryable, Debug, Clone)]
+/// 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<Podcast> for PodcastCoverQuery {
+    fn from(p: Podcast) -> PodcastCoverQuery {
+        PodcastCoverQuery {
+            id: p.id(),
+            title: p.title,
+            image_uri: p.image_uri,
+        }
+    }
+}
+
+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
+    }
+
+    /// Get the Feed `title`.
+    pub fn title(&self) -> &str {
+        &self.title
+    }
+
+    /// Get the `image_uri`.
+    ///
+    /// Represents the uri(url usually) that the Feed cover image is located at.
+    pub fn image_uri(&self) -> Option<&str> {
+        self.image_uri.as_ref().map(|s| s.as_str())
+    }
+}

hammond-data/src/models/source.rs

@@ -0,0 +1,282 @@
+use diesel::SaveChangesDsl;
+// use failure::ResultExt;
+use rss::Channel;
+use url::Url;
+
+use hyper::client::HttpConnector;
+use hyper::header::{
+    ETag, EntityTag, HttpDate, IfModifiedSince, IfNoneMatch, LastModified, Location, UserAgent,
+};
+use hyper::{Client, Method, Request, Response, StatusCode, Uri};
+use hyper_tls::HttpsConnector;
+
+// use futures::future::ok;
+use futures::future::{loop_fn, Future, Loop};
+use futures::prelude::*;
+
+use database::connection;
+use errors::*;
+use feed::{Feed, FeedBuilder};
+use models::{NewSource, Save};
+use schema::source;
+use USER_AGENT;
+
+use std::str::FromStr;
+
+#[derive(Queryable, Identifiable, AsChangeset, PartialEq)]
+#[table_name = "source"]
+#[changeset_options(treat_none_as_null = "true")]
+#[derive(Debug, Clone)]
+/// Diesel Model of the source table.
+pub struct Source {
+    id: i32,
+    uri: String,
+    last_modified: Option<String>,
+    http_etag: Option<String>,
+}
+
+impl Save<Source> for Source {
+    type Error = DataError;
+
+    /// Helper method to easily save/"sync" current state of self to the
+    /// Database.
+    fn save(&self) -> Result<Source, Self::Error> {
+        let db = connection();
+        let con = db.get()?;
+
+        self.save_changes::<Source>(&con).map_err(From::from)
+    }
+}
+
+impl Source {
+    /// Get the source `id` column.
+    pub fn id(&self) -> i32 {
+        self.id
+    }
+
+    /// Represents the location(usually url) of the Feed xml file.
+    pub fn uri(&self) -> &str {
+        &self.uri
+    }
+
+    /// Set the `uri` field value.
+    pub fn set_uri(&mut self, uri: String) {
+        self.uri = uri;
+    }
+
+    /// Represents the Http Last-Modified Header field.
+    ///
+    /// See [RFC 7231](https://tools.ietf.org/html/rfc7231#section-7.2) for more.
+    pub fn last_modified(&self) -> Option<&str> {
+        self.last_modified.as_ref().map(|s| s.as_str())
+    }
+
+    /// Set `last_modified` value.
+    pub fn set_last_modified(&mut self, value: Option<String>) {
+        // self.last_modified = value.map(|x| x.to_string());
+        self.last_modified = value;
+    }
+
+    /// Represents the Http Etag Header field.
+    ///
+    /// See [RFC 7231](https://tools.ietf.org/html/rfc7231#section-7.2) for more.
+    pub fn http_etag(&self) -> Option<&str> {
+        self.http_etag.as_ref().map(|s| s.as_str())
+    }
+
+    /// Set `http_etag` value.
+    pub fn set_http_etag(&mut self, value: Option<&str>) {
+        self.http_etag = value.map(|x| x.to_string());
+    }
+
+    /// Extract Etag and LastModifier from res, and update self and the
+    /// corresponding db row.
+    fn update_etag(&mut self, res: &Response) -> Result<(), DataError> {
+        let headers = res.headers();
+
+        let etag = headers.get::<ETag>().map(|x| x.tag());
+        let lmod = headers.get::<LastModified>().map(|x| format!("{}", x));
+
+        if (self.http_etag() != etag) || (self.last_modified != lmod) {
+            self.set_http_etag(etag);
+            self.set_last_modified(lmod);
+            self.save()?;
+        }
+
+        Ok(())
+    }
+
+    fn make_err(self, context: &str, code: StatusCode) -> DataError {
+        DataError::HttpStatusGeneral(HttpStatusError::new(self.uri, code, context.into()))
+    }
+
+    // TODO match on more stuff
+    // 301: Moved Permanently
+    // 304: Up to date Feed, checked with the Etag
+    // 307: Temporary redirect of the url
+    // 308: Permanent redirect of the url
+    // 401: Unathorized
+    // 403: Forbidden
+    // 408: Timeout
+    // 410: Feed deleted
+    // TODO: Rething this api,
+    fn match_status(mut self, res: Response) -> Result<Response, DataError> {
+        self.update_etag(&res)?;
+        let code = res.status();
+
+        match code {
+            StatusCode::NotModified => return Err(self.make_err("304: skipping..", code)),
+            StatusCode::MovedPermanently => {
+                error!("Feed was moved permanently.");
+                self.handle_301(&res)?;
+                return Err(DataError::F301(self));
+            }
+            StatusCode::TemporaryRedirect => debug!("307: Temporary Redirect."),
+            StatusCode::PermanentRedirect => warn!("308: Permanent Redirect."),
+            StatusCode::Unauthorized => return Err(self.make_err("401: Unauthorized.", code)),
+            StatusCode::Forbidden => return Err(self.make_err("403:  Forbidden.", code)),
+            StatusCode::NotFound => return Err(self.make_err("404: Not found.", code)),
+            StatusCode::RequestTimeout => return Err(self.make_err("408: Request Timeout.", code)),
+            StatusCode::Gone => return Err(self.make_err("410: Feed was deleted..", code)),
+            _ => info!("HTTP StatusCode: {}", code),
+        };
+        Ok(res)
+    }
+
+    fn handle_301(&mut self, res: &Response) -> Result<(), DataError> {
+        let headers = res.headers();
+
+        if let Some(url) = headers.get::<Location>() {
+            self.set_uri(url.to_string());
+            self.http_etag = None;
+            self.last_modified = None;
+            self.save()?;
+            info!("Feed url was updated succesfully.");
+        }
+
+        Ok(())
+    }
+
+    /// Construct a new `Source` with the given `uri` and index it.
+    ///
+    /// This only indexes the `Source` struct, not the Podcast Feed.
+    pub fn from_url(uri: &str) -> Result<Source, DataError> {
+        let url = Url::parse(uri)?;
+
+        NewSource::new(&url).to_source()
+    }
+
+    /// `Feed` constructor.
+    ///
+    /// Fetches the latest xml Feed.
+    ///
+    /// Updates the validator Http Headers.
+    ///
+    /// Consumes `self` and Returns the corresponding `Feed` Object.
+    // Refactor into TryInto once it lands on stable.
+    pub fn into_feed(
+        self,
+        client: Client<HttpsConnector<HttpConnector>>,
+        ignore_etags: bool,
+    ) -> impl Future<Item = Feed, Error = DataError> {
+        let id = self.id();
+        let response = loop_fn(self, move |source| {
+            source
+                .request_constructor(&client.clone(), ignore_etags)
+                .then(|res| match res {
+                    Ok(response) => Ok(Loop::Break(response)),
+                    Err(err) => match err {
+                        DataError::F301(s) => {
+                            info!("Following redirect...");
+                            Ok(Loop::Continue(s))
+                        }
+                        e => Err(e),
+                    },
+                })
+        });
+
+        response
+            .and_then(response_to_channel)
+            .and_then(move |chan| {
+                FeedBuilder::default()
+                    .channel(chan)
+                    .source_id(id)
+                    .build()
+                    .map_err(From::from)
+            })
+    }
+
+    // TODO: make ignore_etags an Enum for better ergonomics.
+    // #bools_are_just_2variant_enmus
+    fn request_constructor(
+        self,
+        client: &Client<HttpsConnector<HttpConnector>>,
+        ignore_etags: bool,
+    ) -> impl Future<Item = Response, Error = DataError> {
+        // FIXME: remove unwrap somehow
+        let uri = Uri::from_str(self.uri()).unwrap();
+        let mut req = Request::new(Method::Get, uri);
+
+        // Set the UserAgent cause ppl still seem to check it for some reason...
+        req.headers_mut().set(UserAgent::new(USER_AGENT));
+
+        if !ignore_etags {
+            if let Some(etag) = self.http_etag() {
+                let tag = vec![EntityTag::new(true, etag.to_owned())];
+                req.headers_mut().set(IfNoneMatch::Items(tag));
+            }
+
+            if let Some(lmod) = self.last_modified() {
+                if let Ok(date) = lmod.parse::<HttpDate>() {
+                    req.headers_mut().set(IfModifiedSince(date));
+                }
+            }
+        }
+
+        client
+            .request(req)
+            .map_err(From::from)
+            .and_then(move |res| self.match_status(res))
+    }
+}
+
+#[allow(needless_pass_by_value)]
+fn response_to_channel(res: Response) -> impl Future<Item = Channel, Error = DataError> + Send {
+    res.body()
+        .concat2()
+        .map(|x| x.into_iter())
+        .map_err(From::from)
+        .map(|iter| iter.collect::<Vec<u8>>())
+        .map(|utf_8_bytes| String::from_utf8_lossy(&utf_8_bytes).into_owned())
+        .and_then(|buf| Channel::from_str(&buf).map_err(From::from))
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use tokio_core::reactor::Core;
+
+    use database::truncate_db;
+    use utils::get_feed;
+
+    #[test]
+    fn test_into_feed() {
+        truncate_db().unwrap();
+
+        let mut core = Core::new().unwrap();
+        let client = Client::configure()
+            .connector(HttpsConnector::new(4, &core.handle()).unwrap())
+            .build(&core.handle());
+
+        let url = "https://web.archive.org/web/20180120083840if_/https://feeds.feedburner.\
+                   com/InterceptedWithJeremyScahill";
+        let source = Source::from_url(url).unwrap();
+        let id = source.id();
+
+        let feed = source.into_feed(client, true);
+        let feed = core.run(feed).unwrap();
+
+        let expected = get_feed("tests/feeds/2018-01-20-Intercepted.xml", id);
+        assert_eq!(expected, feed);
+    }
+}

hammond-data/src/opml.rs

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

hammond-data/src/parser.rs

@@ -1,22 +1,3 @@
-// parser.rs
-//
-// Copyright 2017 Jordan Petridis <jpetridis@gnome.org>
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 use rss::extension::itunes::ITunesItemExtension;
 
 /// Parses an Item Itunes extension and returns it's duration value in seconds.
@@ -96,4 +77,5 @@ mod tests {
         let item = Some(&extension);
         assert_eq!(parse_itunes_duration(item), Some(6970));
     }
+
 }

hammond-data/src/pipeline.rs

@@ -0,0 +1,128 @@
+// FIXME:
+//! Docs.
+
+use futures::future::*;
+use futures::prelude::*;
+use futures::stream::*;
+
+use hyper::client::HttpConnector;
+use hyper::Client;
+use hyper_tls::HttpsConnector;
+use tokio_core::reactor::Core;
+
+use num_cpus;
+use rayon;
+use rayon_futures::ScopeFutureExt;
+
+use errors::DataError;
+use Source;
+
+// use std::sync::{Arc, Mutex};
+
+// http://gtk-rs.org/tuto/closures
+#[macro_export]
+macro_rules! clone {
+    (@param _) => ( _ );
+    (@param $x:ident) => ( $x );
+    ($($n:ident),+ => move || $body:expr) => (
+        {
+            $( let $n = $n.clone(); )+
+            move || $body
+        }
+    );
+    ($($n:ident),+ => move |$($p:tt),+| $body:expr) => (
+        {
+            $( let $n = $n.clone(); )+
+            move |$(clone!(@param $p),)+| $body
+        }
+    );
+}
+
+type HttpsClient = Client<HttpsConnector<HttpConnector>>;
+
+/// The pipline to be run for indexing and updating a Podcast feed that originates from
+/// `Source.uri`.
+///
+/// Messy temp diagram:
+/// Source -> GET Request -> Update Etags -> Check Status -> Parse `xml/Rss` ->
+/// Convert `rss::Channel` into `Feed` -> Index Podcast -> Index Episodes.
+pub fn pipeline<'a, S>(
+    sources: S,
+    ignore_etags: bool,
+    client: &HttpsClient,
+) -> impl Future<Item = Vec<()>, Error = DataError> + 'a
+where
+    S: Stream<Item = Source, Error = DataError> + 'a,
+{
+    sources
+        .and_then(clone!(client => move |s| s.into_feed(client.clone(), ignore_etags)))
+        .and_then(|feed| rayon::scope(|s| s.spawn_future(feed.index())))
+        // the stream will stop at the first error so
+        // we ensure that everything will succeded regardless.
+        .map_err(|err| error!("Error: {}", err))
+        .then(|_| ok::<(), DataError>(()))
+        .collect()
+}
+
+/// Creates a tokio `reactor::Core`, and a `hyper::Client` and
+/// runs the pipeline to completion. The `reactor::Core` is dropped afterwards.
+pub fn run<S>(sources: S, ignore_etags: bool) -> Result<(), DataError>
+where
+    S: IntoIterator<Item = Source>,
+{
+    let mut core = Core::new()?;
+    let handle = core.handle();
+    let client = Client::configure()
+        .connector(HttpsConnector::new(num_cpus::get(), &handle)?)
+        .build(&handle);
+
+    let stream = iter_ok::<_, DataError>(sources);
+    let p = pipeline(stream, ignore_etags, &client);
+    core.run(p).map(|_| ())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use database::truncate_db;
+    use dbqueries;
+    use Source;
+
+    // (path, url) tuples.
+    const URLS: &[&str] = &[
+        "https://web.archive.org/web/20180120083840if_/https://feeds.feedburner.\
+         com/InterceptedWithJeremyScahill",
+        "https://web.archive.org/web/20180120110314if_/https://feeds.feedburner.com/linuxunplugged",
+        "https://web.archive.org/web/20180120110727if_/https://rss.acast.com/thetipoff",
+        "https://web.archive.org/web/20180120104957if_/https://rss.art19.com/steal-the-stars",
+        "https://web.archive.org/web/20180120104741if_/https://www.greaterthancode.\
+         com/feed/podcast",
+    ];
+
+    #[test]
+    /// Insert feeds and update/index them.
+    fn test_pipeline() {
+        truncate_db().unwrap();
+        let bad_url = "https://gitlab.gnome.org/World/hammond.atom";
+        // if a stream returns error/None it stops
+        // bad we want to parse all feeds regardless if one fails
+        Source::from_url(bad_url).unwrap();
+
+        URLS.iter().for_each(|url| {
+            // Index the urls into the source table.
+            Source::from_url(url).unwrap();
+        });
+
+        let sources = dbqueries::get_sources().unwrap();
+        run(sources, true).unwrap();
+
+        let sources = dbqueries::get_sources().unwrap();
+        // Run again to cover Unique constrains erros.
+        run(sources, true).unwrap();
+
+        // Assert the index rows equal the controlled results
+        assert_eq!(dbqueries::get_sources().unwrap().len(), 6);
+        assert_eq!(dbqueries::get_podcasts().unwrap().len(), 5);
+        assert_eq!(dbqueries::get_episodes().unwrap().len(), 354);
+    }
+}

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

@@ -1,22 +1,3 @@
-// utils.rs
-//
-// Copyright 2017 Jordan Petridis <jpetridis@gnome.org>
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 //! Helper utilities for accomplishing various tasks.
 
 use chrono::prelude::*;
@@ -24,10 +5,10 @@ use rayon::prelude::*;
 
 use url::{Position, Url};
 
-use crate::dbqueries;
-use crate::errors::DataError;
-use crate::models::{EpisodeCleanerModel, Save, Show};
-use crate::xdg_dirs::DL_DIR;
+use dbqueries;
+use errors::DataError;
+use models::{EpisodeCleanerQuery, Podcast, Save};
+use xdg_dirs::DL_DIR;
 
 use std::fs;
 use std::path::Path;
@@ -56,7 +37,7 @@ fn download_checker() -> Result<(), DataError> {
     Ok(())
 }
 
-/// Delete watched `episodes` that have exceeded their lifetime after played.
+/// Delete watched `episodes` that have exceded their liftime after played.
 fn played_cleaner(cleanup_date: DateTime<Utc>) -> Result<(), DataError> {
     let mut episodes = dbqueries::get_played_cleaner_episodes()?;
     let now_utc = cleanup_date.timestamp() as i32;
@@ -68,7 +49,7 @@ fn played_cleaner(cleanup_date: DateTime<Utc>) -> Result<(), DataError> {
             let limit = ep.played().unwrap();
             if now_utc > limit {
                 delete_local_content(ep)
-                    .map(|_| info!("Episode {:?} was deleted successfully.", ep.local_uri()))
+                    .map(|_| info!("Episode {:?} was deleted succesfully.", ep.local_uri()))
                     .map_err(|err| error!("Error: {}", err))
                     .map_err(|_| error!("Failed to delete file: {:?}", ep.local_uri()))
                     .ok();
@@ -78,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() {
@@ -122,14 +103,14 @@ pub fn url_cleaner(s: &str) -> String {
     // https://rust-lang-nursery.github.io/rust-cookbook/net.html
     // #remove-fragment-identifiers-and-query-pairs-from-a-url
     match Url::parse(s) {
-        Ok(parsed) => parsed[..Position::AfterQuery].to_owned(),
+        Ok(parsed) => parsed[..Position::AfterPath].to_owned(),
         _ => s.trim().to_owned(),
     }
 }
 
-/// 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
@@ -142,25 +123,26 @@ 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 successfully.", pd.title());
+    info!("{} was removed succesfully.", pd.title());
 
     let fold = get_download_folder(pd.title())?;
     fs::remove_dir_all(&fold)?;
-    info!("All the content at, {} was removed successfully", &fold);
+    info!("All the content at, {} was removed succesfully", &fold);
     Ok(())
 }
 
 #[cfg(test)]
-use crate::Feed;
+use Feed;
 
 #[cfg(test)]
 /// Helper function that open a local file, parse the rss::Channel and gives back a Feed object.
 /// Alternative Feed constructor to be used for tests.
 pub fn get_feed(file_path: &str, id: i32) -> Feed {
-    use crate::feed::FeedBuilder;
+    use feed::FeedBuilder;
     use rss::Channel;
+    use std::fs;
     use std::io::BufReader;
 
     // open the xml file
@@ -176,58 +158,61 @@ pub fn get_feed(file_path: &str, id: i32) -> Feed {
 
 #[cfg(test)]
 mod tests {
+    extern crate tempdir;
+
+    use self::tempdir::TempDir;
     use super::*;
     use chrono::Duration;
-    use failure::Error;
-    use tempdir::TempDir;
 
-    use crate::database::truncate_db;
-    use crate::models::NewEpisodeBuilder;
+    use database::truncate_db;
+    use models::NewEpisodeBuilder;
 
     use std::fs::File;
     use std::io::Write;
 
-    fn helper_db() -> Result<TempDir, Error> {
+    fn helper_db() -> TempDir {
         // Clean the db
-        truncate_db()?;
+        truncate_db().unwrap();
         // Setup tmp file stuff
-        let tmp_dir = TempDir::new("podcasts_test")?;
+        let tmp_dir = TempDir::new("hammond_test").unwrap();
         let valid_path = tmp_dir.path().join("virtual_dl.mp3");
         let bad_path = tmp_dir.path().join("invalid_thing.mp3");
-        let mut tmp_file = File::create(&valid_path)?;
-        writeln!(tmp_file, "Foooo")?;
+        let mut tmp_file = File::create(&valid_path).unwrap();
+        writeln!(tmp_file, "Foooo").unwrap();
 
         // Setup episodes
         let n1 = NewEpisodeBuilder::default()
             .title("foo_bar".to_string())
-            .show_id(0)
+            .podcast_id(0)
             .build()
             .unwrap()
-            .to_episode()?;
+            .to_episode()
+            .unwrap();
 
         let n2 = NewEpisodeBuilder::default()
             .title("bar_baz".to_string())
-            .show_id(1)
+            .podcast_id(1)
             .build()
             .unwrap()
-            .to_episode()?;
+            .to_episode()
+            .unwrap();
 
-        let mut ep1 = dbqueries::get_episode_cleaner_from_pk(n1.title(), n1.show_id())?;
-        let mut ep2 = dbqueries::get_episode_cleaner_from_pk(n2.title(), n2.show_id())?;
+        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()));
 
-        ep1.save()?;
-        ep2.save()?;
+        ep1.save().unwrap();
+        ep2.save().unwrap();
 
-        Ok(tmp_dir)
+        tmp_dir
     }
 
     #[test]
-    fn test_download_checker() -> Result<(), Error> {
-        let tmp_dir = helper_db()?;
-        download_checker()?;
-        let episodes = dbqueries::get_downloaded_episodes()?;
+    fn test_download_checker() {
+        let tmp_dir = helper_db();
+        download_checker().unwrap();
+        let episodes = dbqueries::get_downloaded_episodes().unwrap();
         let valid_path = tmp_dir.path().join("virtual_dl.mp3");
 
         assert_eq!(episodes.len(), 1);
@@ -236,75 +221,69 @@ mod tests {
             episodes.first().unwrap().local_uri()
         );
 
-        let _tmp_dir = helper_db()?;
-        download_checker()?;
-        let episode = dbqueries::get_episode_cleaner_from_pk("bar_baz", 1)?;
+        let _tmp_dir = helper_db();
+        download_checker().unwrap();
+        let episode = dbqueries::get_episode_from_pk("bar_baz", 1).unwrap();
         assert!(episode.local_uri().is_none());
-        Ok(())
     }
 
     #[test]
-    fn test_download_cleaner() -> Result<(), Error> {
-        let _tmp_dir = helper_db()?;
-        let mut episode: EpisodeCleanerModel =
-            dbqueries::get_episode_cleaner_from_pk("foo_bar", 0)?.into();
+    fn test_download_cleaner() {
+        let _tmp_dir = helper_db();
+        let mut episode: EpisodeCleanerQuery =
+            dbqueries::get_episode_from_pk("foo_bar", 0).unwrap().into();
 
         let valid_path = episode.local_uri().unwrap().to_owned();
-        delete_local_content(&mut episode)?;
+        delete_local_content(&mut episode).unwrap();
         assert_eq!(Path::new(&valid_path).exists(), false);
-        Ok(())
     }
 
     #[test]
-    fn test_played_cleaner_expired() -> Result<(), Error> {
-        let _tmp_dir = helper_db()?;
-        let mut episode = dbqueries::get_episode_cleaner_from_pk("foo_bar", 0)?;
+    fn test_played_cleaner_expired() {
+        let _tmp_dir = helper_db();
+        let mut episode = dbqueries::get_episode_from_pk("foo_bar", 0).unwrap();
         let cleanup_date = Utc::now() - Duration::seconds(1000);
         let epoch = cleanup_date.timestamp() as i32 - 1;
         episode.set_played(Some(epoch));
-        episode.save()?;
+        episode.save().unwrap();
         let valid_path = episode.local_uri().unwrap().to_owned();
 
         // This should delete the file
-        played_cleaner(cleanup_date)?;
+        played_cleaner(cleanup_date).unwrap();
         assert_eq!(Path::new(&valid_path).exists(), false);
-        Ok(())
     }
 
     #[test]
-    fn test_played_cleaner_none() -> Result<(), Error> {
-        let _tmp_dir = helper_db()?;
-        let mut episode = dbqueries::get_episode_cleaner_from_pk("foo_bar", 0)?;
+    fn test_played_cleaner_none() {
+        let _tmp_dir = helper_db();
+        let mut episode = dbqueries::get_episode_from_pk("foo_bar", 0).unwrap();
         let cleanup_date = Utc::now() - Duration::seconds(1000);
         let epoch = cleanup_date.timestamp() as i32 + 1;
         episode.set_played(Some(epoch));
-        episode.save()?;
+        episode.save().unwrap();
         let valid_path = episode.local_uri().unwrap().to_owned();
 
         // This should not delete the file
-        played_cleaner(cleanup_date)?;
+        played_cleaner(cleanup_date).unwrap();
         assert_eq!(Path::new(&valid_path).exists(), true);
-        Ok(())
     }
 
     #[test]
-    fn test_url_cleaner() -> Result<(), Error> {
-        let good_url = "http://traffic.megaphone.fm/FL8608731318.mp3?updated=1484685184";
-        let bad_url = "http://traffic.megaphone.fm/FL8608731318.mp3?updated=1484685184#foobar";
+    fn test_url_cleaner() {
+        let good_url = "http://traffic.megaphone.fm/FL8608731318.mp3";
+        let bad_url = "http://traffic.megaphone.fm/FL8608731318.mp3?updated=1484685184";
 
         assert_eq!(url_cleaner(bad_url), good_url);
         assert_eq!(url_cleaner(good_url), good_url);
         assert_eq!(url_cleaner(&format!("   {}\t\n", bad_url)), good_url);
-        Ok(())
     }
 
     #[test]
     // This test needs access to local system so we ignore it by default.
     #[ignore]
-    fn test_get_dl_folder() -> Result<(), Error> {
+    fn test_get_dl_folder() {
         let foo_ = format!("{}/{}", DL_DIR.to_str().unwrap(), "foo");
-        assert_eq!(get_download_folder("foo")?, foo_);
+        assert_eq!(get_download_folder("foo").unwrap(), foo_);
         let _ = fs::remove_dir_all(foo_);
-        Ok(())
     }
 }

hammond-data/tests/feeds/notes.md

@@ -43,9 +43,3 @@ Raw file: https://web.archive.org/web/20180120104741if_/https://www.greaterthanc
 Web view: https://web.archive.org/web/20180328083913/https://ellinofreneia.sealabs.net/audio/podcast.rss
 
 Raw file: https://web.archive.org/web/20180328083913if_/https://ellinofreneia.sealabs.net/audio/podcast.rss
-
-#### David Harvey's Anti-Capitalist Chronicles
-
-Web view: https://web.archive.org/web/20190127005213/https://anticapitalistchronicles.libsyn.com/rss
-
-Raw file: https://web.archive.org/web/20190127005213if_/https://anticapitalistchronicles.libsyn.com/rss

hammond-downloader/Cargo.toml

@@ -0,0 +1,22 @@
+[package]
+authors = ["Jordan Petridis <jordanpetridis@protonmail.com>"]
+name = "hammond-downloader"
+version = "0.1.0"
+workspace = "../"
+
+[dependencies]
+error-chain = "0.11.0"
+hyper = "0.11.27"
+log = "0.4.1"
+mime_guess = "1.8.4"
+reqwest = "0.8.5"
+tempdir = "0.3.7"
+glob = "0.2.11"
+failure = "0.1.1"
+failure_derive = "0.1.1"
+
+[dependencies.hammond-data]
+path = "../hammond-data"
+
+[dev-dependencies]
+pretty_assertions = "0.5.1"

hammond-downloader/src/downloader.rs

@@ -1,26 +1,7 @@
-// downloader.rs
-//
-// Copyright 2017 Jordan Petridis <jpetridis@gnome.org>
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 use glob::glob;
+use hyper::header::*;
 use mime_guess;
 use reqwest;
-use reqwest::header::*;
 use reqwest::RedirectPolicy;
 use tempdir::TempDir;
 
@@ -30,23 +11,20 @@ use std::io::{BufWriter, Read, Write};
 use std::path::Path;
 use std::sync::{Arc, Mutex};
 
-use podcasts_data::xdg_dirs::PODCASTS_CACHE;
-use podcasts_data::{EpisodeWidgetModel, Save, ShowCoverModel};
+use hammond_data::xdg_dirs::HAMMOND_CACHE;
+use hammond_data::{EpisodeWidgetQuery, PodcastCoverQuery, Save};
 
 // use failure::Error;
-use crate::errors::DownloadError;
+use errors::DownloadError;
 
 // TODO: Replace path that are of type &str with std::path.
 // TODO: Have a convention/document absolute/relative paths, if they should end
 // with / or not.
 
 pub trait DownloadProgress {
-    fn get_downloaded(&self) -> u64;
     fn set_downloaded(&mut self, downloaded: u64);
-    fn get_size(&self) -> u64;
     fn set_size(&mut self, bytes: u64);
     fn should_cancel(&self) -> bool;
-    fn cancel(&mut self);
 }
 
 // Adapted from https://github.com/mattgathu/rget .
@@ -54,17 +32,17 @@ pub trait DownloadProgress {
 // Sorry to those who will have to work with that code.
 // Would much rather use a crate,
 // or bindings for a lib like youtube-dl(python),
-// But can't seem to find one.
+// But cant seem to find one.
 // TODO: Write unit-tests.
 fn download_into(
     dir: &str,
     file_title: &str,
     url: &str,
-    progress: Option<Arc<Mutex<dyn DownloadProgress>>>,
+    progress: Option<Arc<Mutex<DownloadProgress>>>,
 ) -> Result<String, DownloadError> {
     info!("GET request to: {}", url);
     // Haven't included the loop check as
-    // Steal the Stars would trigger it as
+    // Steal the Stars would tigger it as
     // it has a loop back before giving correct url
     let policy = RedirectPolicy::custom(|attempt| {
         info!("Redirect Attempt URL: {:?}", attempt.url());
@@ -85,42 +63,28 @@ fn download_into(
     info!("Status Resp: {}", resp.status());
 
     if !resp.status().is_success() {
-        if let Some(ref prog) = progress {
-            if let Ok(mut m) = prog.lock() {
-                m.cancel();
-            }
-        }
-
         return Err(DownloadError::UnexpectedResponse(resp.status()));
     }
 
     let headers = resp.headers().clone();
-    let ct_len = headers
-        .get(CONTENT_LENGTH)
-        .and_then(|h| h.to_str().ok())
-        .and_then(|len| len.parse().ok());
-    let ct_type = headers
-        .get(CONTENT_TYPE)
-        .and_then(|h| h.to_str().ok())
-        .map(From::from);
-
-    ct_len.map(|x| info!("File Length: {}", x));
+    let ct_len = headers.get::<ContentLength>().map(|ct_len| **ct_len);
+    let ct_type = headers.get::<ContentType>();
+    ct_len.map(|x| info!("File Lenght: {}", x));
     ct_type.map(|x| info!("Content Type: {}", x));
 
-    let ext = get_ext(ct_type).unwrap_or_else(|| String::from("unknown"));
+    let ext = get_ext(ct_type.cloned()).unwrap_or_else(|| String::from("unknown"));
     info!("Extension: {}", ext);
 
     // Construct a temp file to save desired content.
     // It has to be a `new_in` instead of new cause rename can't move cross
     // filesystems.
-    let tempdir = TempDir::new_in(PODCASTS_CACHE.to_str().unwrap(), "temp_download")?;
+    let tempdir = TempDir::new_in(HAMMOND_CACHE.to_str().unwrap(), "temp_download")?;
     let out_file = format!("{}/temp.part", tempdir.path().to_str().unwrap(),);
 
     ct_len.map(|x| {
-        if let Some(ref p) = progress {
-            if let Ok(mut m) = p.lock() {
-                m.set_size(x);
-            }
+        if let Some(p) = progress.clone() {
+            let mut m = p.lock().unwrap();
+            m.set_size(x);
         }
     });
 
@@ -131,39 +95,39 @@ fn download_into(
     let target = format!("{}/{}.{}", dir, file_title, ext);
     // Rename/move the tempfile into a permanent place upon success.
     rename(out_file, &target)?;
-    info!("Downloading of {} completed successfully.", &target);
+    info!("Downloading of {} completed succesfully.", &target);
     Ok(target)
 }
 
 /// Determine the file extension from the http content-type header.
-fn get_ext(content: Option<&str>) -> Option<String> {
-    let mut iter = content?.split("/");
-    let type_ = iter.next()?;
-    let subtype = iter.next()?;
-    mime_guess::get_extensions(type_, subtype).and_then(|c| {
-        if c.contains(&&subtype) {
-            Some(subtype.to_string())
-        } else {
-            Some(c.first()?.to_string())
-        }
-    })
+fn get_ext(content: Option<ContentType>) -> Option<String> {
+    let cont = content.clone()?;
+    content
+        .and_then(|c| mime_guess::get_extensions(c.type_().as_ref(), c.subtype().as_ref()))
+        .and_then(|c| {
+            if c.contains(&cont.subtype().as_ref()) {
+                Some(cont.subtype().as_ref().to_string())
+            } else {
+                Some(c.first().unwrap().to_string())
+            }
+        })
 }
 
 // TODO: Write unit-tests.
 // TODO: Refactor... Somehow.
 /// Handles the I/O of fetching a remote file and saving into a Buffer and A
 /// File.
-#[allow(clippy::needless_pass_by_value)]
+#[allow(needless_pass_by_value)]
 fn save_io(
     file: &str,
     resp: &mut reqwest::Response,
     content_lenght: Option<u64>,
-    progress: Option<Arc<Mutex<dyn DownloadProgress>>>,
+    progress: Option<Arc<Mutex<DownloadProgress>>>,
 ) -> Result<(), DownloadError> {
     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)?);
@@ -197,9 +161,9 @@ fn save_io(
 
 // TODO: Refactor
 pub fn get_episode(
-    ep: &mut EpisodeWidgetModel,
+    ep: &mut EpisodeWidgetQuery,
     download_folder: &str,
-    progress: Option<Arc<Mutex<dyn DownloadProgress>>>,
+    progress: Option<Arc<Mutex<DownloadProgress>>>,
 ) -> Result<(), DownloadError> {
     // Check if its alrdy downloaded
     if ep.local_uri().is_some() {
@@ -219,10 +183,10 @@ pub fn get_episode(
         progress,
     )?;
 
-    // If download succeeds set episode local_uri to dlpath.
+    // If download succedes set episode local_uri to dlpath.
     ep.set_local_uri(Some(&path));
 
-    // Over-write episode length
+    // Over-write episode lenght
     let size = fs::metadata(path);
     if let Ok(s) = size {
         ep.set_length(Some(s.len() as i32))
@@ -232,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)?
@@ -242,7 +206,7 @@ pub fn cache_image(pd: &ShowCoverModel) -> Result<String, DownloadError> {
         return Err(DownloadError::NoImageLocation);
     }
 
-    let cache_path = PODCASTS_CACHE
+    let cache_path = HAMMOND_CACHE
         .to_str()
         .ok_or_else(|| DownloadError::InvalidCacheLocation)?;
     let cache_download_fold = format!("{}{}", cache_path, pd.title().to_owned());
@@ -272,37 +236,35 @@ pub fn cache_image(pd: &ShowCoverModel) -> Result<String, DownloadError> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use failure::Error;
-    use podcasts_data::dbqueries;
-    use podcasts_data::pipeline;
-    use podcasts_data::Source;
+    use hammond_data::dbqueries;
+    use hammond_data::pipeline;
+    use hammond_data::Source;
 
     use std::fs;
 
     #[test]
-    // This test inserts an rss feed to your `XDG_DATA/podcasts/podcasts.db` so we make it explicit
+    // This test inserts an rss feed to your `XDG_DATA/hammond/hammond.db` so we make it explicit
     // to run it.
     #[ignore]
-    fn test_cache_image() -> Result<(), Error> {
+    fn test_cache_image() {
         let url = "https://web.archive.org/web/20180120110727if_/https://rss.acast.com/thetipoff";
         // Create and index a source
-        let source = Source::from_url(url)?;
+        let source = Source::from_url(url).unwrap();
         // Copy it's id
         let sid = source.id();
         // Convert Source it into a future Feed and index it
-        pipeline::run(vec![source])?;
+        pipeline::run(vec![source], true).unwrap();
 
         // Get the Podcast
-        let pd = dbqueries::get_podcast_from_source_id(sid)?.into();
+        let pd = dbqueries::get_podcast_from_source_id(sid).unwrap().into();
 
         let img_path = cache_image(&pd);
         let foo_ = format!(
             "{}{}/cover.jpeg",
-            PODCASTS_CACHE.to_str().unwrap(),
+            HAMMOND_CACHE.to_str().unwrap(),
             pd.title()
         );
-        assert_eq!(img_path?, foo_);
-        fs::remove_file(foo_)?;
-        Ok(())
+        assert_eq!(img_path.unwrap(), foo_);
+        fs::remove_file(foo_).unwrap();
     }
 }

hammond-downloader/src/errors.rs

@@ -0,0 +1,41 @@
+use hammond_data::errors::DataError;
+use reqwest;
+use std::io;
+
+#[derive(Fail, Debug)]
+pub enum DownloadError {
+    #[fail(display = "Reqwest error: {}", _0)]
+    RequestError(#[cause] reqwest::Error),
+    #[fail(display = "Data error: {}", _0)]
+    DataError(#[cause] DataError),
+    #[fail(display = "Io error: {}", _0)]
+    IoError(#[cause] io::Error),
+    #[fail(display = "Unexpected server response: {}", _0)]
+    UnexpectedResponse(reqwest::StatusCode),
+    #[fail(display = "The Download was cancelled.")]
+    DownloadCancelled,
+    #[fail(display = "Remote Image location not found.")]
+    NoImageLocation,
+    #[fail(display = "Failed to parse CacheLocation.")]
+    InvalidCacheLocation,
+    #[fail(display = "Failed to parse Cached Image Location.")]
+    InvalidCachedImageLocation,
+}
+
+impl From<reqwest::Error> for DownloadError {
+    fn from(err: reqwest::Error) -> Self {
+        DownloadError::RequestError(err)
+    }
+}
+
+impl From<io::Error> for DownloadError {
+    fn from(err: io::Error) -> Self {
+        DownloadError::IoError(err)
+    }
+}
+
+impl From<DataError> for DownloadError {
+    fn from(err: DataError) -> Self {
+        DownloadError::DataError(err)
+    }
+}

hammond-downloader/src/lib.rs

@@ -0,0 +1,25 @@
+#![recursion_limit = "1024"]
+#![warn(unused_extern_crates, unused)]
+#![allow(unknown_lints)]
+#![cfg_attr(feature = "cargo-clippy", allow(blacklisted_name, option_map_unit_fn))]
+#![deny(warnings)]
+
+extern crate failure;
+#[macro_use]
+extern crate failure_derive;
+#[macro_use]
+extern crate log;
+
+#[cfg(test)]
+#[macro_use]
+extern crate pretty_assertions;
+
+extern crate glob;
+extern crate hammond_data;
+extern crate hyper;
+extern crate mime_guess;
+extern crate reqwest;
+extern crate tempdir;
+
+pub mod downloader;
+pub mod errors;

hammond-gtk/Cargo.toml

@@ -0,0 +1,44 @@
+[package]
+authors = ["Jordan Petridis <jordanpetridis@protonmail.com>"]
+build = "build.rs"
+name = "hammond-gtk"
+version = "0.1.0"
+workspace = "../"
+
+[dependencies]
+chrono = "0.4.2"
+crossbeam-channel = "0.1.2"
+gdk = "0.8.0"
+gdk-pixbuf = "0.4.0"
+glib = "0.5.0"
+humansize = "1.1.0"
+lazy_static = "1.0.0"
+log = "0.4.1"
+loggerv = "0.7.1"
+open = "1.2.1"
+rayon = "1.0.1"
+send-cell = "0.1.3"
+url = "1.7.0"
+failure = "0.1.1"
+failure_derive = "0.1.1"
+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"]
+version = "0.4.1"
+
+[dependencies.gio]
+features = ["v2_50"]
+version = "0.4.0"
+
+[dependencies.hammond-data]
+path = "../hammond-data"
+
+[dependencies.hammond-downloader]
+path = "../hammond-downloader"
+
+[dev-dependencies]
+pretty_assertions = "0.5.1"

hammond-gtk/build.rs

@@ -0,0 +1,9 @@
+use std::process::Command;
+
+fn main() {
+    Command::new("glib-compile-resources")
+        .args(&["--generate", "resources.xml"])
+        .current_dir("resources")
+        .status()
+        .unwrap();
+}

hammond-gtk/resources/gtk/empty_show.ui

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.0 -->
+<interface>
+  <requires lib="gtk+" version="3.20"/>
+  <object class="GtkBox" id="empty_show">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="halign">center</property>
+    <property name="valign">center</property>
+    <property name="hexpand">True</property>
+    <property name="vexpand">True</property>
+    <property name="orientation">vertical</property>
+    <property name="spacing">12</property>
+    <child>
+      <object class="GtkImage">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="pixel_size">128</property>
+        <property name="icon_name">application-rss+xml-symbolic</property>
+        <property name="use_fallback">True</property>
+        <style>
+          <class name="dim-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">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">This show does not have any episodes</property>
+        <attributes>
+          <attribute name="weight" value="bold"/>
+          <attribute name="scale" value="1.4399999999999999"/>
+        </attributes>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkLabel">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">If you think this is an Error, Plese consider opening a bug report.</property>
+        <style>
+          <class name="dim-label"/>
+        </style>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">2</property>
+      </packing>
+    </child>
+  </object>
+</interface>

hammond-gtk/resources/gtk/empty_view.ui

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.21.0 
+
+Copyright (C) 2017 - 2018
+
+This file is part of Hammond.
+
+Hammond is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Hammond is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Hammond.  If not, see <http://www.gnu.org/licenses/>.
+
+Authors:
+Jordan Petridis
+Tobias Bernard
+
+-->
+<interface>
+  <requires lib="gtk+" version="3.20"/>
+  <!-- interface-license-type gplv3 -->
+  <!-- interface-name Hammond -->
+  <!-- interface-description A podcast client for the GNOME Desktop -->
+  <!-- interface-copyright 2017 - 2018 -->
+  <!-- interface-authors Jordan Petridis\nTobias Bernard -->
+  <object class="GtkBox" id="empty_view">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="halign">center</property>
+    <property name="valign">center</property>
+    <property name="hexpand">True</property>
+    <property name="vexpand">True</property>
+    <property name="orientation">vertical</property>
+    <property name="spacing">12</property>
+    <child>
+      <object class="GtkImage">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="pixel_size">128</property>
+        <property name="icon_name">application-rss+xml-symbolic</property>
+        <property name="use_fallback">True</property>
+        <style>
+          <class name="dim-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">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">No Feed Subscription Found</property>
+        <attributes>
+          <attribute name="weight" value="bold"/>
+          <attribute name="scale" value="1.4399999999999999"/>
+        </attributes>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkLabel">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">You can subscribe to feeds using the "+" button</property>
+        <style>
+          <class name="dim-label"/>
+        </style>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">2</property>
+      </packing>
+    </child>
+  </object>
+</interface>

hammond-gtk/resources/gtk/episode_widget.ui

@@ -3,20 +3,20 @@
 
 Copyright (C) 2017 - 2018
 
-This file is part of GNOME Podcasts.
+This file is part of Hammond.
 
-GNOME Podcasts is free software: you can redistribute it and/or modify
+Hammond is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 
-GNOME Podcasts is distributed in the hope that it will be useful,
+Hammond is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNOME Podcasts.  If not, see <http://www.gnu.org/licenses/>.
+along with Hammond.  If not, see <http://www.gnu.org/licenses/>.
 
 Authors:
 Jordan Petridis
@@ -24,9 +24,9 @@ Tobias Bernard
 
 -->
 <interface>
-  <requires lib="gtk+" version="3.22"/>
+  <requires lib="gtk+" version="3.20"/>
   <!-- interface-license-type gplv3 -->
-  <!-- interface-name GNOME Podcasts -->
+  <!-- interface-name Hammond -->
   <!-- interface-description A podcast client for the GNOME Desktop -->
   <!-- interface-copyright 2017 - 2018 -->
   <!-- interface-authors Jordan Petridis\nTobias Bernard -->
@@ -35,8 +35,6 @@ Tobias Bernard
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="valign">center</property>
-    <property name="margin_start">6</property>
-    <property name="margin_end">6</property>
     <property name="orientation">vertical</property>
     <child>
       <object class="GtkBox">
@@ -44,54 +42,25 @@ Tobias Bernard
         <property name="can_focus">False</property>
         <child>
           <object class="GtkBox" id="info_container">
-            <property name="width_request">200</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="halign">start</property>
             <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
-              <object class="GtkBox">
+              <object class="GtkLabel" id="title_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkLabel" id="title_label">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label">Episode Title</property>
-                    <property name="ellipsize">end</property>
-                    <property name="single_line_mode">True</property>
-                    <property name="track_visited_links">False</property>
-                    <property name="lines">1</property>
-                    <property name="xalign">0</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkImage" id="played_checkmark">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="tooltip_text" translatable="yes">You’ve already listened to this episode.</property>
-                    <property name="icon_name">object-select-symbolic</property>
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
+                <property name="label" translatable="yes">Episode Title</property>
+                <property name="ellipsize">end</property>
+                <property name="width_chars">55</property>
+                <property name="single_line_mode">True</property>
+                <property name="track_visited_links">False</property>
+                <property name="lines">1</property>
+                <property name="xalign">0</property>
               </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">False</property>
+                <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
@@ -104,15 +73,12 @@ Tobias Bernard
                   <object class="GtkLabel" id="date_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label">3 Jan</property>
+                    <property name="label" translatable="yes">3 Jan</property>
                     <property name="single_line_mode">True</property>
                     <property name="track_visited_links">False</property>
                     <style>
                       <class name="dim-label"/>
                     </style>
-                    <attributes>
-                      <attribute name="font-features" value="tnum=1"/>
-                    </attributes>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -124,7 +90,7 @@ Tobias Bernard
                   <object class="GtkLabel" id="separator1">
                     <property name="can_focus">False</property>
                     <property name="no_show_all">True</property>
-                    <property name="label">·</property>
+                    <property name="label" translatable="yes">·</property>
                     <property name="track_visited_links">False</property>
                     <style>
                       <class name="dim-label"/>
@@ -140,15 +106,12 @@ Tobias Bernard
                   <object class="GtkLabel" id="duration_label">
                     <property name="can_focus">False</property>
                     <property name="no_show_all">True</property>
-                    <property name="label">42 min</property>
+                    <property name="label" translatable="yes">42 min</property>
                     <property name="single_line_mode">True</property>
                     <property name="track_visited_links">False</property>
                     <style>
                       <class name="dim-label"/>
                     </style>
-                    <attributes>
-                      <attribute name="font-features" value="tnum=1"/>
-                    </attributes>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -160,7 +123,7 @@ Tobias Bernard
                   <object class="GtkLabel" id="separator2">
                     <property name="can_focus">False</property>
                     <property name="no_show_all">True</property>
-                    <property name="label">·</property>
+                    <property name="label" translatable="yes">·</property>
                     <property name="track_visited_links">False</property>
                     <style>
                       <class name="dim-label"/>
@@ -176,16 +139,12 @@ Tobias Bernard
                   <object class="GtkLabel" id="local_size">
                     <property name="can_focus">False</property>
                     <property name="no_show_all">True</property>
-                    <property name="label">0 MB</property>
-                    <property name="ellipsize">end</property>
+                    <property name="label" translatable="yes">0 MB</property>
                     <property name="single_line_mode">True</property>
                     <property name="track_visited_links">False</property>
                     <style>
                       <class name="dim-label"/>
                     </style>
-                    <attributes>
-                      <attribute name="font-features" value="tnum=1"/>
-                    </attributes>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -197,7 +156,7 @@ Tobias Bernard
                   <object class="GtkLabel" id="prog_separator">
                     <property name="can_focus">False</property>
                     <property name="no_show_all">True</property>
-                    <property name="label">/</property>
+                    <property name="label" translatable="yes">/</property>
                     <property name="single_line_mode">True</property>
                     <property name="track_visited_links">False</property>
                     <style>
@@ -214,16 +173,12 @@ Tobias Bernard
                   <object class="GtkLabel" id="total_size">
                     <property name="can_focus">False</property>
                     <property name="no_show_all">True</property>
-                    <property name="label" translatable="yes">Calculating episode size…</property>
-                    <property name="ellipsize">end</property>
+                    <property name="label" translatable="yes">XX MB</property>
                     <property name="single_line_mode">True</property>
                     <property name="track_visited_links">False</property>
                     <style>
                       <class name="dim-label"/>
                     </style>
-                    <attributes>
-                      <attribute name="font-features" value="tnum=1"/>
-                    </attributes>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -247,11 +202,32 @@ Tobias Bernard
           </packing>
         </child>
         <child>
-          <object class="GtkBox" id="button_box">
+          <object class="GtkButtonBox" id="button_box">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="halign">end</property>
-            <property name="spacing">6</property>
+            <property name="layout_style">center</property>
+            <child>
+              <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="halign">center</property>
+                <property name="valign">center</property>
+                <child>
+                  <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="icon_name">view-paged-symbolic</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+                <property name="non_homogeneous">True</property>
+              </packing>
+            </child>
             <child>
               <object class="GtkButton" id="play_button">
                 <property name="can_focus">True</property>
@@ -271,29 +247,8 @@ Tobias Bernard
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="cancel_button">
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="tooltip_text" translatable="yes">Cancel the download process</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <child>
-                  <object class="GtkImage">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="icon_name">media-playback-stop-symbolic</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="pack_type">end</property>
-                <property name="position">1</property>
+                <property name="position">2</property>
+                <property name="non_homogeneous">True</property>
               </packing>
             </child>
             <child>
@@ -316,7 +271,23 @@ Tobias Bernard
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">2</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>
@@ -338,8 +309,8 @@ Tobias Bernard
       <object class="GtkProgressBar" id="progress_bar">
         <property name="can_focus">False</property>
         <property name="no_show_all">True</property>
-        <property name="margin_start">6</property>
-        <property name="margin_end">6</property>
+        <property name="margin_left">6</property>
+        <property name="margin_right">6</property>
         <property name="hexpand">True</property>
         <property name="pulse_step">0</property>
       </object>

hammond-gtk/resources/gtk/episodes_view.ui

@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.0 
+
+Copyright (C) 2017 - 2018
+
+This file is part of Hammond.
+
+Hammond is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Hammond is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Hammond.  If not, see <http://www.gnu.org/licenses/>.
+
+Authors:
+Jordan Petridis
+Tobias Bernard
+
+-->
+<interface>
+  <requires lib="gtk+" version="3.20"/>
+  <!-- interface-license-type gplv3 -->
+  <!-- interface-name Hammond -->
+  <!-- interface-description A podcast client for the GNOME Desktop -->
+  <!-- interface-copyright 2017 - 2018 -->
+  <!-- interface-authors Jordan Petridis\nTobias Bernard -->
+  <object class="GtkBox" id="container">
+    <property name="name">container</property>
+    <property name="width_request">400</property>
+    <property name="height_request">600</property>
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="orientation">vertical</property>
+    <child>
+      <object class="GtkScrolledWindow" id="scrolled_window">
+        <property name="name">scrolled_window</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="hscrollbar_policy">never</property>
+        <child>
+          <object class="GtkViewport">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <child>
+                  <object class="GtkBox">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="frame_parent">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="margin_left">32</property>
+                    <property name="margin_right">32</property>
+                    <property name="margin_top">32</property>
+                    <property name="margin_bottom">32</property>
+                    <property name="hexpand">True</property>
+                    <property name="orientation">vertical</property>
+                    <property name="spacing">24</property>
+                    <child>
+                      <object class="GtkBox" id="today_box">
+                        <property name="can_focus">False</property>
+                        <property name="no_show_all">True</property>
+                        <property name="hexpand">True</property>
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="halign">start</property>
+                            <property name="hexpand">True</property>
+                            <property name="label" translatable="yes">Today</property>
+                            <attributes>
+                              <attribute name="weight" value="bold"/>
+                              <attribute name="scale" value="1.5"/>
+                            </attributes>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkFrame">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="hexpand">True</property>
+                            <property name="label_xalign">0</property>
+                            <property name="shadow_type">in</property>
+                            <child>
+                              <object class="GtkListBox" id="today_list">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="hexpand">True</property>
+                                <property name="selection_mode">none</property>
+                              </object>
+                            </child>
+                            <child type="label_item">
+                              <placeholder/>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="yday_box">
+                        <property name="can_focus">False</property>
+                        <property name="no_show_all">True</property>
+                        <property name="hexpand">True</property>
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="halign">start</property>
+                            <property name="label" translatable="yes">Yesterday</property>
+                            <attributes>
+                              <attribute name="weight" value="bold"/>
+                              <attribute name="scale" value="1.5"/>
+                            </attributes>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkFrame">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="hexpand">True</property>
+                            <property name="label_xalign">0</property>
+                            <property name="shadow_type">in</property>
+                            <child>
+                              <object class="GtkListBox" id="yday_list">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="hexpand">True</property>
+                                <property name="selection_mode">none</property>
+                              </object>
+                            </child>
+                            <child type="label_item">
+                              <placeholder/>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="week_box">
+                        <property name="can_focus">False</property>
+                        <property name="no_show_all">True</property>
+                        <property name="hexpand">True</property>
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="halign">start</property>
+                            <property name="label" translatable="yes">This Week</property>
+                            <attributes>
+                              <attribute name="weight" value="bold"/>
+                              <attribute name="scale" value="1.5"/>
+                            </attributes>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkFrame">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="hexpand">True</property>
+                            <property name="label_xalign">0</property>
+                            <property name="shadow_type">in</property>
+                            <child>
+                              <object class="GtkListBox" id="week_list">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="hexpand">True</property>
+                                <property name="selection_mode">none</property>
+                              </object>
+                            </child>
+                            <child type="label_item">
+                              <placeholder/>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="month_box">
+                        <property name="can_focus">False</property>
+                        <property name="no_show_all">True</property>
+                        <property name="hexpand">True</property>
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="halign">start</property>
+                            <property name="label" translatable="yes">This Month</property>
+                            <attributes>
+                              <attribute name="weight" value="bold"/>
+                              <attribute name="scale" value="1.5"/>
+                            </attributes>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkFrame">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="hexpand">True</property>
+                            <property name="label_xalign">0</property>
+                            <property name="shadow_type">in</property>
+                            <child>
+                              <object class="GtkListBox" id="month_list">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="hexpand">True</property>
+                                <property name="selection_mode">none</property>
+                              </object>
+                            </child>
+                            <child type="label_item">
+                              <placeholder/>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">3</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkBox" id="rest_box">
+                        <property name="can_focus">False</property>
+                        <property name="no_show_all">True</property>
+                        <property name="hexpand">True</property>
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="halign">start</property>
+                            <property name="hexpand">True</property>
+                            <property name="label" translatable="yes">Older</property>
+                            <attributes>
+                              <attribute name="weight" value="bold"/>
+                              <attribute name="scale" value="1.5"/>
+                            </attributes>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkFrame">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="hexpand">True</property>
+                            <property name="label_xalign">0</property>
+                            <property name="shadow_type">in</property>
+                            <child>
+                              <object class="GtkListBox" id="rest_list">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="no_show_all">True</property>
+                                <property name="hexpand">True</property>
+                                <property name="selection_mode">none</property>
+                              </object>
+                            </child>
+                            <child type="label_item">
+                              <placeholder/>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">5</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">True</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+  </object>
+</interface>

hammond-gtk/resources/gtk/episodes_view_widget.ui

@@ -3,20 +3,20 @@
 
 Copyright (C) 2017 - 2018
 
-This file is part of GNOME Podcasts.
+This file is part of Hammond.
 
-GNOME Podcasts is free software: you can redistribute it and/or modify
+Hammond is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 
-GNOME Podcasts is distributed in the hope that it will be useful,
+Hammond is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNOME Podcasts.  If not, see <http://www.gnu.org/licenses/>.
+along with Hammond.  If not, see <http://www.gnu.org/licenses/>.
 
 Authors:
 Jordan Petridis
@@ -24,9 +24,9 @@ Tobias Bernard
 
 -->
 <interface>
-  <requires lib="gtk+" version="3.22"/>
+  <requires lib="gtk+" version="3.20"/>
   <!-- interface-license-type gplv3 -->
-  <!-- interface-name GNOME Podcasts -->
+  <!-- interface-name Hammond -->
   <!-- interface-description A podcast client for the GNOME Desktop -->
   <!-- interface-copyright 2017 - 2018 -->
   <!-- interface-authors Jordan Petridis\nTobias Bernard -->
@@ -36,11 +36,12 @@ Tobias Bernard
     <property name="valign">center</property>
     <property name="margin_top">6</property>
     <property name="margin_bottom">6</property>
+    <property name="spacing">6</property>
     <child>
       <object class="GtkImage" id="cover">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="margin_start">8</property>
+        <property name="margin_left">6</property>
         <property name="pixel_size">64</property>
         <property name="icon_name">image-x-generic-symbolic</property>
       </object>

hammond-gtk/resources/gtk/headerbar.ui

@@ -3,20 +3,20 @@
 
 Copyright (C) 2017 - 2018
 
-This file is part of GNOME Podcasts.
+This file is part of Hammond.
 
-GNOME Podcasts is free software: you can redistribute it and/or modify
+Hammond is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 
-GNOME Podcasts is distributed in the hope that it will be useful,
+Hammond is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNOME Podcasts.  If not, see <http://www.gnu.org/licenses/>.
+along with Hammond.  If not, see <http://www.gnu.org/licenses/>.
 
 Authors:
 Jordan Petridis
@@ -24,9 +24,9 @@ Tobias Bernard
 
 -->
 <interface>
-  <requires lib="gtk+" version="3.22"/>
+  <requires lib="gtk+" version="3.20"/>
   <!-- interface-license-type gplv3 -->
-  <!-- interface-name GNOME Podcasts -->
+  <!-- interface-name Hammond -->
   <!-- interface-description A podcast client for the GNOME Desktop -->
   <!-- interface-copyright 2017 - 2018 -->
   <!-- interface-authors Jordan Petridis\nTobias Bernard -->
@@ -41,7 +41,10 @@ Tobias Bernard
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="valign">center</property>
-        <property name="border_width">6</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">6</property>
         <child>
@@ -70,7 +73,7 @@ Tobias Bernard
               <object class="GtkEntry" id="new_url">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="width_chars">26</property>
+                <property name="width_chars">30</property>
                 <property name="input_purpose">url</property>
               </object>
               <packing>
@@ -126,66 +129,31 @@ Tobias Bernard
             <property name="position">1</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkLabel" id="result_label">
+            <property name="can_focus">False</property>
+            <property name="halign">start</property>
+            <property name="label" translatable="yes">You are already subscribed to that feed!</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
       </object>
     </child>
   </object>
-  <object class="HdyHeaderBar" id="headerbar">
+  <object class="GtkHeaderBar" id="headerbar">
     <property name="can_focus">False</property>
     <property name="show_close_button">True</property>
-    <property name="centering-policy">strict</property>
-    <child type="title">
-      <object class="GtkStack" id="title_stack">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="transition_type">crossfade</property>
-        <child>
-          <object class="HdySqueezer" id="switch_squeezer">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="transition_type">crossfade</property>
-            <child>
-              <object class="HdyViewSwitcher" id="switch">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">center</property>
-                <property name="policy">wide</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Podcasts</property>
-                <style>
-                  <class name="title"/>
-                </style>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel" id="show_title">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="no_show_all">True</property>
-            <property name="label" translatable="yes">Show Title</property>
-            <property name="ellipsize">end</property>
-            <property name="track_visited_links">False</property>
-            <style>
-              <class name="title" />
-            </style>
-          </object>
-        </child>
-      </object>
-    </child>
     <child>
       <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>
@@ -223,11 +191,78 @@ Tobias Bernard
       </packing>
     </child>
     <child>
-      <object class="GtkMenuButton" id="hamburger">
+      <object class="GtkBox" id="update_notification">
+        <property name="can_focus">False</property>
+        <property name="no_show_all">True</property>
+        <child>
+          <object class="GtkSpinner" id="update_spinner">
+            <property name="can_focus">False</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="padding">6</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="update_label">
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Fetching new episodes</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="position">3</property>
+      </packing>
+    </child>
+    <child type="title">
+      <object class="GtkBox">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkStackSwitcher" id="switch">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">center</property>
+            <property name="valign">center</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="show_title">
+            <property name="can_focus">False</property>
+            <property name="no_show_all">True</property>
+            <property name="label" translatable="yes">Show Title</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuButton" id="menu_button">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
         <property name="valign">center</property>
+        <property name="use_popover">True</property>
         <child>
           <object class="GtkImage">
             <property name="visible">True</property>
@@ -245,28 +280,5 @@ Tobias Bernard
         <property name="position">2</property>
       </packing>
     </child>
-    <child>
-      <object class="GtkMenuButton" id="secondary_menu">
-        <property name="can_focus">True</property>
-        <property name="receives_default">False</property>
-        <property name="no_show_all">True</property>
-        <property name="valign">center</property>
-        <child>
-          <object class="GtkImage">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="icon_name">view-more-symbolic</property>
-            <property name="icon_size">1</property>
-          </object>
-        </child>
-        <style>
-          <class name="image-button"/>
-        </style>
-      </object>
-      <packing>
-        <property name="pack_type">end</property>
-        <property name="position">2</property>
-      </packing>
-    </child>
   </object>
 </interface>

hammond-gtk/resources/gtk/inapp_notif.ui

@@ -1,35 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.0 
-
-Copyright (C) 2017 - 2018
-
-This file is part of GNOME Podcast.
-
-GNOME Podcast is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNOME Podcast is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNOME Podcast.  If not, see <http://www.gnu.org/licenses/>.
-
-Authors:
-Jordan Petridis
-Tobias Bernard
-
--->
+<!-- Generated with glade 3.21.0 -->
 <interface>
-  <requires lib="gtk+" version="3.22"/>
-  <!-- interface-license-type gplv3 -->
-  <!-- interface-name GNOME Podcast -->
-  <!-- interface-description A podcast client for the GNOME Desktop -->
-  <!-- interface-copyright 2017 - 2018 -->
-  <!-- interface-authors Jordan Petridis\nTobias Bernard -->
+  <requires lib="gtk+" version="3.20"/>
   <object class="GtkRevealer" id="revealer">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -49,16 +21,22 @@ Tobias Bernard
             <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
-            <property name="margin_start">3</property>
-            <property name="margin_end">3</property>
+            <property name="margin_left">3</property>
+            <property name="margin_right">3</property>
             <property name="spacing">6</property>
             <child>
-              <object class="GtkSpinner" id="spinner">
+              <object class="GtkLabel" id="text">
+                <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="halign">center</property>
+                <property name="valign">center</property>
+                <property name="margin_left">12</property>
+                <property name="margin_right">12</property>
+                <property name="label" translatable="yes">An in-app action notification</property>
               </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">True</property>
+                <property name="fill">False</property>
                 <property name="position">0</property>
               </packing>
             </child>
@@ -89,27 +67,10 @@ Tobias Bernard
                 <property name="position">1</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkLabel" id="text">
-                <property name="width_request">150</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <property name="margin_start">12</property>
-                <property name="margin_end">12</property>
-                <property name="label" translatable="yes">An in-app action notification</property>
-                <property name="ellipsize">start</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="undo">
                 <property name="label" translatable="yes">Undo</property>
+                <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="halign">center</property>
@@ -122,7 +83,7 @@ Tobias Bernard
                 <property name="expand">False</property>
                 <property name="fill">False</property>
                 <property name="pack_type">end</property>
-                <property name="position">3</property>
+                <property name="position">2</property>
               </packing>
             </child>
           </object>

hammond-gtk/resources/gtk/menus.ui

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

hammond-gtk/resources/gtk/show_widget.ui

@@ -0,0 +1,300 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.0 
+
+Copyright (C) 2017 - 2018
+
+This file is part of Hammond.
+
+Hammond is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Hammond is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Hammond.  If not, see <http://www.gnu.org/licenses/>.
+
+Authors:
+Jordan Petridis
+Tobias Bernard
+
+-->
+<interface domain="">
+  <requires lib="gtk+" version="3.20"/>
+  <!-- interface-license-type gplv3 -->
+  <!-- interface-name Hammond -->
+  <!-- interface-description A podcast client for the GNOME Desktop -->
+  <!-- interface-copyright 2017 - 2018 -->
+  <!-- interface-authors Jordan Petridis\nTobias Bernard -->
+  <object class="GtkBox" id="container">
+    <property name="width_request">400</property>
+    <property name="height_request">600</property>
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="orientation">vertical</property>
+    <child>
+      <object class="GtkScrolledWindow" id="scrolled_window">
+        <property name="name">scrolled_window</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="vexpand">True</property>
+        <property name="hscrollbar_policy">never</property>
+        <child>
+          <object class="GtkViewport">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="can_default">True</property>
+                <property name="hexpand">True</property>
+                <child>
+                  <object class="GtkBox">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</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="margin_left">32</property>
+                    <property name="margin_right">32</property>
+                    <property name="margin_top">32</property>
+                    <property name="margin_bottom">32</property>
+                    <property name="hexpand">True</property>
+                    <property name="orientation">vertical</property>
+                    <property name="spacing">24</property>
+                    <child>
+                      <object class="GtkBox">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <object class="GtkImage" id="cover">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="pixel_size">256</property>
+                            <property name="icon_name">image-x-generic-symbolic</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkScrolledWindow">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="hscrollbar_policy">never</property>
+                            <property name="min_content_height">80</property>
+                            <child>
+                              <object class="GtkViewport">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="shadow_type">none</property>
+                                <child>
+                                  <object class="GtkLabel" id="description">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="halign">center</property>
+                                    <property name="valign">center</property>
+                                    <property name="label">This is embarrasing!
+Sorry, we could not find a description for this Show.</property>
+                                    <property name="use_markup">True</property>
+                                    <property name="justify">center</property>
+                                    <property name="wrap">True</property>
+                                    <property name="max_width_chars">70</property>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkBox">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkMenuButton" id="settings_button">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <child>
+                                  <object class="GtkImage">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="halign">center</property>
+                                    <property name="valign">center</property>
+                                    <property name="icon_name">emblem-system-symbolic</property>
+                                  </object>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="link_button">
+                                <property name="label" translatable="yes">Website</property>
+                                <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>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="padding">5</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="unsub_button">
+                                <property name="label" translatable="yes">Unsubscribe</property>
+                                <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>
+                                <style>
+                                  <class name="destructive-action"/>
+                                </style>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="padding">5</property>
+                                <property name="pack_type">end</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkFrame">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label_xalign">0</property>
+                        <property name="shadow_type">in</property>
+                        <child>
+                          <object class="GtkListBox" id="episodes">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="selection_mode">none</property>
+                          </object>
+                        </child>
+                        <child type="label_item">
+                          <placeholder/>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="pack_type">end</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+  </object>
+  <object class="GtkPopover" id="show_menu">
+    <property name="can_focus">False</property>
+    <property name="position">bottom</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>
+        <child>
+          <object class="GtkModelButton" id="mark_all_watched">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="text" translatable="yes">Mark all episodes as listened</property>
+            <property name="centered">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>

hammond-gtk/resources/gtk/shows_child.ui

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.0 
+
+Copyright (C) 2017 - 2018
+
+This file is part of Hammond.
+
+Hammond is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Hammond is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Hammond.  If not, see <http://www.gnu.org/licenses/>.
+
+Authors:
+Jordan Petridis
+Tobias Bernard
+
+-->
+<interface>
+  <requires lib="gtk+" version="3.20"/>
+  <!-- interface-license-type gplv3 -->
+  <!-- interface-name Hammond -->
+  <!-- interface-description A podcast client for the GNOME Desktop -->
+  <!-- interface-copyright 2017 - 2018 -->
+  <!-- interface-authors Jordan Petridis\nTobias Bernard -->
+  <object class="GtkBox" id="fb_child">
+    <property name="width_request">256</property>
+    <property name="height_request">256</property>
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="halign">center</property>
+    <property name="valign">center</property>
+    <property name="orientation">vertical</property>
+    <child>
+      <object class="GtkImage" id="pd_cover">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="halign">center</property>
+        <property name="valign">center</property>
+        <property name="pixel_size">256</property>
+        <property name="icon_name">image-x-generic-symbolic</property>
+        <property name="icon_size">0</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+  </object>
+</interface>

hammond-gtk/resources/gtk/shows_view.ui

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.21.0 
+
+Copyright (C) 2017 - 2018
+
+This file is part of Hammond.
+
+Hammond is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Hammond is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Hammond.  If not, see <http://www.gnu.org/licenses/>.
+
+Authors:
+Jordan Petridis
+Tobias Bernard
+
+-->
+<interface>
+  <requires lib="gtk+" version="3.20"/>
+  <!-- interface-license-type gplv3 -->
+  <!-- interface-name Hammond -->
+  <!-- interface-description A podcast client for the GNOME Desktop -->
+  <!-- interface-copyright 2017 - 2018 -->
+  <!-- interface-authors Jordan Petridis\nTobias Bernard -->
+  <object class="GtkBox" id="fb_parent">
+    <property name="name">fb_parent</property>
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="orientation">vertical</property>
+    <child>
+      <object class="GtkScrolledWindow" id="scrolled_window">
+        <property name="name">scrolled_window</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <child>
+          <object class="GtkViewport">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <object class="GtkFlowBox" id="flowbox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="halign">center</property>
+                <property name="valign">start</property>
+                <property name="margin_top">24</property>
+                <property name="margin_bottom">24</property>
+                <property name="homogeneous">True</property>
+                <property name="column_spacing">12</property>
+                <property name="row_spacing">12</property>
+                <property name="max_children_per_line">20</property>
+                <property name="selection_mode">none</property>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">True</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+  </object>
+</interface>

hammond-gtk/resources/gtk/style.css

@@ -0,0 +1,11 @@
+row {
+	border-bottom: solid 1px rgba(0,0,0, 0.1);
+}
+
+row:last-child {
+	border-bottom: none;
+}
+
+list, border {
+  border-radius: 4px;
+}

hammond-gtk/resources/meson.build

@@ -0,0 +1,6 @@
+# subdir('icons')
+
+install_data('org.gnome.Hammond.desktop', install_dir : datadir + '/applications')
+install_data('org.gnome.Hammond.appdata.xml', install_dir : datadir + '/appdata')
+install_data('org.gnome.Hammond.gschema.xml', install_dir: join_paths(datadir, 'glib-2.0', 'schemas'))
+meson.add_install_script('../../scripts/compile-gschema.py')

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

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+  <id>org.gnome.Hammond</id>
+  <name>Hammond</name>
+  <project_license>GPL-3.0</project_license>
+  <metadata_license>CC0-1.0</metadata_license>
+  <developer_name>Jordan Petridis</developer_name>
+  <summary>Modern Podcast Client for the GNOME desktop</summary>
+  <description xml:lang="en">
+    <p>
+      Hammond is a modern, reliable, and fast Podcast Client for the GNOME
+      desktop written in Rust.
+    </p>
+  </description>
+  <url type="homepage">https://gitlab.gnome.org/World/hammond</url>
+  <screenshots>
+    <screenshot>
+      <image>https://gitlab.gnome.org/World/hammond/raw/master/screenshots/episodes_view.png</image>
+      <caption>Page 1</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://gitlab.gnome.org/World/hammond/raw/master/screenshots/shows_view.png</image>
+      <caption>Page 2</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://gitlab.gnome.org/World/hammond/raw/master/screenshots/show_widget.png</image>
+      <caption>Page 3</caption>
+    </screenshot>
+  </screenshots>
+  <releases>
+    <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>
+  <developer_name>Jordan Petridis and others</developer_name>
+</component>

hammond-gtk/resources/org.gnome.Hammond.desktop

@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Hammond
+GenericName=Podcast Client
+Comment=Play, Subscribe and Manage Podcast Feeds.
+Icon=multimedia-player
+Exec=hammond
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories=AudioVideo;Audio;Video;
+Keywords=Podcast

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <schemalist>
-    <enum id="org.gnome.Podcasts.timePeriods">
+    <enum id="org.gnome.Hammond.timePeriods">
         <value nick="seconds" value="1"/>
         <value nick="minutes" value="2"/>
         <value nick="hours" value="3"/>
@@ -9,7 +9,7 @@
         <value nick="months" value="6"/>
     </enum>
 
-    <schema path="/org/gnome/Podcasts/" id="org.gnome.Podcasts" gettext-domain="gnome-podcasts">
+    <schema path="/org/gnome/hammond/" id="org.gnome.Hammond">
         <key name="persist-window-geometry-top" type="i">
             <default>-1</default>
             <summary>Top position of the last open main window</summary>
@@ -45,7 +45,7 @@
             <default>1</default>
             <summary>How many periods of time to wait between automatic refreshes</summary>
         </key>
-        <key name="refresh-interval-period" enum="org.gnome.Podcasts.timePeriods">
+        <key name="refresh-interval-period" enum="org.gnome.Hammond.timePeriods">
             <default>'hours'</default>
             <summary>What period of time to wait between automatic refreshes</summary>
         </key>
@@ -59,7 +59,7 @@
             <default>2</default>
             <summary>How many periods of time to wait between automatic cleanups</summary>
         </key>
-        <key name="cleanup-age-period" enum="org.gnome.Podcasts.timePeriods">
+        <key name="cleanup-age-period" enum="org.gnome.Hammond.timePeriods">
             <default>'days'</default>
             <summary>What period of time to wait between automatic cleanups</summary>
         </key>

hammond-gtk/resources/resources.xml

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

hammond-gtk/src/app.rs

@@ -0,0 +1,299 @@
+#![allow(new_without_default)]
+
+use gio::{
+    ActionMapExt, ApplicationExt, ApplicationExtManual, ApplicationFlags, Settings, SettingsExt,
+    SimpleAction, SimpleActionExt,
+};
+use glib;
+use gtk;
+use gtk::prelude::*;
+use gtk::SettingsExt as GtkSettingsExt;
+
+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::{about_dialog, mark_all_notif, remove_show_notif};
+
+use std::rc::Rc;
+use std::sync::Arc;
+
+/// Creates an action named $called in the action map $on with the handler $handle
+macro_rules! action {
+    ($on:expr, $called:expr, $handle:expr) => {{
+        // Create a stateless, parameterless action
+        let act = SimpleAction::new($called, None);
+        // Connect the handler
+        act.connect_activate($handle);
+        // Add it to the map
+        $on.add_action(&act);
+        // Return the action
+        act
+    }};
+}
+
+#[derive(Debug, Clone)]
+pub enum Action {
+    RefreshAllViews,
+    RefreshEpisodesView,
+    RefreshEpisodesViewBGR,
+    RefreshShowsView,
+    ReplaceWidget(Arc<Podcast>),
+    RefreshWidgetIfSame(i32),
+    ShowWidgetAnimated,
+    ShowShowsAnimated,
+    HeaderBarShowTile(String),
+    HeaderBarNormal,
+    HeaderBarShowUpdateIndicator,
+    HeaderBarHideUpdateIndicator,
+    MarkAllPlayerNotification(Arc<Podcast>),
+    RemoveShow(Arc<Podcast>),
+    ErrorNotification(String),
+    AboutWidget(i32),
+}
+
+#[derive(Debug)]
+pub struct App {
+    app_instance: gtk::Application,
+    settings: Settings,
+}
+
+impl App {
+    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...");
+
+        // Weird magic I copy-pasted that sets the Application Name in the Shell.
+        glib::set_application_name("Hammond");
+        glib::set_prgname(Some("Hammond"));
+
+        let cleanup_date = settings::get_cleanup_date(&settings);
+        utils::cleanup(cleanup_date);
+
+        application.connect_startup(clone!(settings => move |app| {
+            let (sender, receiver) = unbounded();
+
+            App::setup_gactions(&app, &sender);
+
+            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");
+
+                    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(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(settings: &Settings) {
+        let gtk_settings = gtk::Settings::get_default().unwrap();
+        let enabled = settings.get_boolean("dark-theme");
+
+        gtk_settings.set_property_gtk_application_prefer_dark_theme(enabled);
+    }
+
+    fn setup_refresh_on_startup(sender: &Sender<Action>, settings: &Settings) {
+        // Update the feeds right after the Application is initialized.
+        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
+            // requests that will come from loading the gui on startup.
+            gtk::timeout_add(1500, move || {
+                let s: Option<Vec<_>> = None;
+                utils::refresh(s, sender.clone());
+                glib::Continue(false)
+            });
+        }
+    }
+
+    fn setup_auto_refresh(sender: &Sender<Action>, settings: &Settings) {
+        let refresh_interval = settings::get_refresh_interval(&settings).num_seconds() as u32;
+
+        info!("Auto-refresh every {:?} seconds.", refresh_interval);
+
+        let sender = sender.clone();
+        gtk::timeout_add_seconds(refresh_interval, move || {
+            let s: Option<Vec<_>> = None;
+            utils::refresh(s, sender.clone());
+
+            glib::Continue(true)
+        });
+    }
+
+    /// Define the `GAction`s.
+    ///
+    /// Used in menus and the keyboard shortcuts dialog.
+    fn setup_gactions(app: &gtk::Application, sender: &Sender<Action>) {
+        // Create the `refresh` action.
+        //
+        // This will trigger a refresh of all the shows in the database.
+        action!(
+            app,
+            "refresh",
+            clone!(sender => move |_, _| {
+            gtk::idle_add(clone!(sender => move || {
+                let s: Option<Vec<_>> = None;
+                utils::refresh(s, sender.clone());
+                glib::Continue(false)
+            }));
+        })
+        );
+        app.set_accels_for_action("app.refresh", &["<primary>r"]);
+
+        // Create the `OPML` import action
+        action!(
+            app,
+            "import",
+            clone!(sender, app => move |_, _| {
+            let window = app.get_active_window().expect("Failed to get active window");
+            utils::on_import_clicked(&window, &sender);
+        })
+        );
+
+        // Create the action that shows a `gtk::AboutDialog`
+        action!(
+            app,
+            "about",
+            clone!(app => move |_, _| {
+            let window = app.get_active_window().expect("Failed to get active window");
+            about_dialog(&window);
+        })
+        );
+
+        // Create the quit action
+        action!(app, "quit", clone!(app => move |_, _| app.quit()));
+        app.set_accels_for_action("app.quit", &["<primary>q"]);
+
+        // Bind the hamburger menu button to `F10`
+        app.set_accels_for_action("win.menu", &["F10"]);
+    }
+
+    pub fn run(self) {
+        ApplicationExtManual::run(&self.app_instance, &[]);
+    }
+}

hammond-gtk/src/headerbar.rs

@@ -0,0 +1,223 @@
+use gio::MenuModel;
+use glib;
+use gtk;
+use gtk::prelude::*;
+
+use failure::Error;
+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};
+
+#[derive(Debug, Clone)]
+// TODO: split this into smaller
+pub struct Header {
+    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,
+}
+
+impl Default for Header {
+    fn default() -> Header {
+        let builder = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/headerbar.ui");
+        let menus = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/menus.ui");
+
+        let header = builder.get_object("headerbar").unwrap();
+        let add_toggle = builder.get_object("add_toggle").unwrap();
+        let switch = builder.get_object("switch").unwrap();
+        let back = builder.get_object("back").unwrap();
+        let show_title = builder.get_object("show_title").unwrap();
+        let update_box = builder.get_object("update_notification").unwrap();
+        let update_label = builder.get_object("update_label").unwrap();
+        let update_spinner = builder.get_object("update_spinner").unwrap();
+        let menu_button = builder.get_object("menu_button").unwrap();
+        let app_menu = menus.get_object("menu").unwrap();
+
+        Header {
+            container: header,
+            add_toggle,
+            switch,
+            back,
+            show_title,
+            update_box,
+            update_label,
+            update_spinner,
+            menu_button,
+            app_menu,
+        }
+    }
+}
+
+// TODO: Refactor components into smaller state machines
+impl Header {
+    pub fn new(
+        content: &Content,
+        window: &gtk::ApplicationWindow,
+        sender: &Sender<Action>,
+    ) -> Header {
+        let h = Header::default();
+        h.init(content, window, &sender);
+        h
+    }
+
+    pub fn init(
+        &self,
+        content: &Content,
+        window: &gtk::ApplicationWindow,
+        sender: &Sender<Action>,
+    ) {
+        let builder = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/headerbar.ui");
+
+        let add_popover: gtk::Popover = builder.get_object("add_popover").unwrap();
+        let new_url: gtk::Entry = builder.get_object("new_url").unwrap();
+        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());
+
+        new_url.connect_changed(clone!(add_button => move |url| {
+            on_url_change(url, &result_label, &add_button)
+                .map_err(|err| error!("Error: {}", err))
+                .ok();
+        }));
+
+        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();
+        }));
+
+        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();
+                sender.send(Action::ShowShowsAnimated)
+                    .map_err(|err| error!("Action Sender: {}", err))
+                    .ok();
+            }),
+        );
+
+        self.menu_button.set_menu_model(Some(&self.app_menu));
+    }
+
+    pub fn switch_to_back(&self, title: &str) {
+        self.switch.hide();
+        self.add_toggle.hide();
+        self.back.show();
+        self.set_show_title(title);
+        self.show_title.show();
+    }
+
+    pub fn switch_to_normal(&self) {
+        self.switch.show();
+        self.add_toggle.show();
+        self.back.hide();
+        self.show_title.hide();
+    }
+
+    pub fn set_show_title(&self, title: &str) {
+        self.show_title.set_text(title)
+    }
+
+    pub fn show_update_notification(&self) {
+        self.update_spinner.start();
+        self.update_box.show();
+        self.update_spinner.show();
+        self.update_label.show();
+    }
+
+    pub fn hide_update_notification(&self) {
+        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

@@ -0,0 +1,95 @@
+#![cfg_attr(
+    feature = "cargo-clippy",
+    allow(clone_on_ref_ptr, blacklisted_name, match_same_arms, option_map_unit_fn)
+)]
+#![allow(unknown_lints)]
+#![warn(unused_extern_crates, unused)]
+#![deny(warnings)]
+
+extern crate gdk;
+extern crate gdk_pixbuf;
+extern crate gio;
+extern crate glib;
+extern crate gtk;
+
+#[macro_use]
+extern crate failure;
+// #[macro_use]
+// extern crate failure_derive;
+#[macro_use]
+extern crate lazy_static;
+#[macro_use]
+extern crate log;
+
+#[cfg(test)]
+#[macro_use]
+extern crate pretty_assertions;
+
+extern crate chrono;
+extern crate crossbeam_channel;
+extern crate hammond_data;
+extern crate hammond_downloader;
+extern crate html2pango;
+extern crate humansize;
+extern crate loggerv;
+extern crate open;
+extern crate rayon;
+extern crate regex;
+extern crate reqwest;
+extern crate send_cell;
+extern crate serde_json;
+extern crate url;
+
+use log::Level;
+
+use gtk::prelude::*;
+
+// http://gtk-rs.org/tuto/closures
+#[macro_export]
+macro_rules! clone {
+    (@param _) => ( _ );
+    (@param $x:ident) => ( $x );
+    ($($n:ident),+ => move || $body:expr) => (
+        {
+            $( let $n = $n.clone(); )+
+            move || $body
+        }
+    );
+    ($($n:ident),+ => move |$($p:tt),+| $body:expr) => (
+        {
+            $( let $n = $n.clone(); )+
+            move |$(clone!(@param $p),)+| $body
+        }
+    );
+}
+
+mod stacks;
+mod widgets;
+
+mod app;
+mod headerbar;
+
+mod manager;
+mod settings;
+mod static_resource;
+mod utils;
+
+use app::App;
+
+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.");
+    static_resource::init().expect("Something went wrong with the resource file initialization.");
+
+    // Add custom style
+    let provider = gtk::CssProvider::new();
+    gtk::CssProvider::load_from_resource(&provider, "/org/gnome/Hammond/gtk/style.css");
+    gtk::StyleContext::add_provider_for_screen(
+        &gdk::Screen::get_default().expect("Error initializing gtk css provider."),
+        &provider,
+        600,
+    );
+
+    App::new().run();
+}

hammond-gtk/src/manager.rs

@@ -1,28 +1,9 @@
-// manager.rs
-//
-// Copyright 2017 Jordan Petridis <jpetridis@gnome.org>
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 use failure::Error;
 use rayon;
 
-// use podcasts_data::Episode;
-use podcasts_data::dbqueries;
-use podcasts_downloader::downloader::{get_episode, DownloadProgress};
+// use hammond_data::Episode;
+use hammond_data::dbqueries;
+use hammond_downloader::downloader::{get_episode, DownloadProgress};
 
 use std::collections::HashMap;
 use std::sync::{Arc, Mutex, RwLock};
@@ -30,10 +11,10 @@ use std::sync::{Arc, Mutex, RwLock};
 // use std::path::PathBuf;
 
 // This is messy, undocumented and hacky af.
-// I am terrible at writing downloaders and download managers.
+// I am terrible at writting downloaders and download managers.
 
 #[derive(Debug)]
-pub(crate) struct Progress {
+pub struct Progress {
     total_bytes: u64,
     downloaded_bytes: u64,
     cancel: bool,
@@ -50,7 +31,7 @@ impl Default for Progress {
 }
 
 impl Progress {
-    pub(crate) fn get_fraction(&self) -> f64 {
+    pub fn get_fraction(&self) -> f64 {
         let ratio = self.downloaded_bytes as f64 / self.total_bytes as f64;
         debug!("{:?}", self);
         debug!("Ratio completed: {}", ratio);
@@ -60,13 +41,21 @@ impl Progress {
         };
         ratio
     }
-}
 
-impl DownloadProgress for Progress {
-    fn get_downloaded(&self) -> u64 {
+    pub fn get_total_size(&self) -> u64 {
+        self.total_bytes
+    }
+
+    pub fn get_downloaded(&self) -> u64 {
         self.downloaded_bytes
     }
 
+    pub fn cancel(&mut self) {
+        self.cancel = true;
+    }
+}
+
+impl DownloadProgress for Progress {
     fn set_downloaded(&mut self, downloaded: u64) {
         self.downloaded_bytes = downloaded
     }
@@ -75,32 +64,24 @@ impl DownloadProgress for Progress {
         self.total_bytes = bytes;
     }
 
-    fn get_size(&self) -> u64 {
-        self.total_bytes
-    }
-
     fn should_cancel(&self) -> bool {
         self.cancel
     }
-
-    fn cancel(&mut self) {
-        self.cancel = true;
-    }
 }
 
 lazy_static! {
-    pub(crate) static ref ACTIVE_DOWNLOADS: Arc<RwLock<HashMap<i32, Arc<Mutex<Progress>>>>> =
+    pub static ref ACTIVE_DOWNLOADS: Arc<RwLock<HashMap<i32, Arc<Mutex<Progress>>>>> =
         { Arc::new(RwLock::new(HashMap::new())) };
     static ref DLPOOL: rayon::ThreadPool = rayon::ThreadPoolBuilder::new().build().unwrap();
 }
 
-pub(crate) fn add(id: i32, directory: String) -> Result<(), Error> {
+pub fn add(id: i32, directory: String) -> Result<(), Error> {
     // Create a new `Progress` struct to keep track of dl progress.
     let prog = Arc::new(Mutex::new(Progress::default()));
 
     match ACTIVE_DOWNLOADS.write() {
         Ok(mut guard) => guard.insert(id, prog.clone()),
-        Err(err) => return Err(format_err!("ActiveDownloads: {}.", err)),
+        Err(err) => return Err(format_err!("ActiveDonwloads: {}.", err)),
     };
 
     DLPOOL.spawn(move || {
@@ -129,82 +110,75 @@ pub(crate) fn add(id: i32, directory: String) -> Result<(), Error> {
 mod tests {
     use super::*;
 
-    use podcasts_data::dbqueries;
-    use podcasts_data::pipeline;
-    use podcasts_data::utils::get_download_folder;
-    use podcasts_data::{Episode, Save, Source};
+    use hammond_data::dbqueries;
+    use hammond_data::pipeline;
+    use hammond_data::utils::get_download_folder;
+    use hammond_data::{Episode, Source};
 
-    use podcasts_downloader::downloader::get_episode;
+    use hammond_downloader::downloader::get_episode;
 
     use std::fs;
     use std::path::Path;
     use std::{thread, time};
 
     #[test]
-    // This test inserts an rss feed to your `XDG_DATA/podcasts/podcasts.db` so we make it explicit
+    // This test inserts an rss feed to your `XDG_DATA/hammond/hammond.db` so we make it explicit
     // to run it.
     #[ignore]
     // THIS IS NOT A RELIABLE TEST
     // Just quick sanity check
-    fn test_start_dl() -> Result<(), Error> {
+    fn test_start_dl() {
         let url = "https://web.archive.org/web/20180120110727if_/https://rss.acast.com/thetipoff";
         // Create and index a source
-        let mut source = Source::from_url(url)?;
-        // Copy its id
+        let source = Source::from_url(url).unwrap();
+        // Copy it's id
         let sid = source.id();
-        source.set_http_etag(None);
-        source.set_last_modified(None);
-        source.save()?;
-        pipeline::run(vec![source])?;
+        pipeline::run(vec![source], true).unwrap();
 
-        // Get the podcast
-        let pd = dbqueries::get_podcast_from_source_id(sid)?;
+        // Get the Podcast
+        let pd = dbqueries::get_podcast_from_source_id(sid).unwrap();
         let title = "Coming soon... The Tip Off";
         // Get an episode
-        let episode: Episode = dbqueries::get_episode_from_pk(title, pd.id())?;
+        let episode: Episode = dbqueries::get_episode_from_pk(title, pd.id()).unwrap();
 
-        let download_fold = get_download_folder(&pd.title())?;
+        let download_fold = get_download_folder(&pd.title()).unwrap();
         let fold2 = download_fold.clone();
-        add(episode.rowid(), download_fold)?;
+        add(episode.rowid(), download_fold).unwrap();
         assert_eq!(ACTIVE_DOWNLOADS.read().unwrap().len(), 1);
 
-        // Give it some time to download the file
+        // Give it soem time to download the file
         thread::sleep(time::Duration::from_secs(20));
 
         let final_path = format!("{}/{}.mp3", &fold2, episode.rowid());
-        assert_eq!(ACTIVE_DOWNLOADS.read().unwrap().len(), 0);
         assert!(Path::new(&final_path).exists());
-        fs::remove_file(final_path)?;
-        Ok(())
+        fs::remove_file(final_path).unwrap();
     }
 
     #[test]
     // This test needs access to local system so we ignore it by default.
     #[ignore]
-    fn test_dl_steal_the_stars() -> Result<(), Error> {
+    fn test_dl_steal_the_stars() {
         let url =
             "https://web.archive.org/web/20180120104957if_/https://rss.art19.com/steal-the-stars";
         // Create and index a source
-        let mut source = Source::from_url(url)?;
-        // Copy its id
+        let source = Source::from_url(url).unwrap();
+        // Copy it's id
         let sid = source.id();
-        source.set_http_etag(None);
-        source.set_last_modified(None);
-        source.save()?;
-        pipeline::run(vec![source])?;
+        pipeline::run(vec![source], true).unwrap();
 
-        // Get the podcast
-        let pd = dbqueries::get_podcast_from_source_id(sid)?;
+        // Get the Podcast
+        let pd = dbqueries::get_podcast_from_source_id(sid).unwrap();
         let title = "Introducing Steal the Stars";
         // Get an episode
-        let mut episode = dbqueries::get_episode_from_pk(title, pd.id())?.into();
-        let download_fold = get_download_folder(&pd.title())?;
+        let mut episode = dbqueries::get_episode_from_pk(title, pd.id())
+            .unwrap()
+            .into();
+        let download_fold = get_download_folder(&pd.title()).unwrap();
 
-        get_episode(&mut episode, &download_fold, None)?;
+        get_episode(&mut episode, &download_fold, None).unwrap();
 
         let final_path = format!("{}/{}.mp3", &download_fold, episode.rowid());
         assert!(Path::new(&final_path).exists());
-        fs::remove_file(final_path)?;
-        Ok(())
+        fs::remove_file(final_path).unwrap();
     }
 }

hammond-gtk/src/settings.rs

@@ -1,22 +1,3 @@
-// prefs.rs
-//
-// Copyright 2018 Measly Twerp <measlytwerp@gmail.com>
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 use gio;
 use gio::{Settings, SettingsExt};
 use gtk;
@@ -25,7 +6,7 @@ use gtk::GtkWindowExt;
 use chrono::prelude::*;
 use chrono::Duration;
 
-pub(crate) struct WindowGeometry {
+pub struct WindowGeometry {
     left: i32,
     top: i32,
     width: i32,
@@ -34,7 +15,7 @@ pub(crate) struct WindowGeometry {
 }
 
 impl WindowGeometry {
-    pub(crate) fn from_window(window: &gtk::ApplicationWindow) -> WindowGeometry {
+    pub fn from_window(window: &gtk::ApplicationWindow) -> WindowGeometry {
         let position = window.get_position();
         let size = window.get_size();
         let left = position.0;
@@ -52,7 +33,7 @@ impl WindowGeometry {
         }
     }
 
-    pub(crate) fn from_settings(settings: &gio::Settings) -> WindowGeometry {
+    pub fn from_settings(settings: &gio::Settings) -> WindowGeometry {
         let top = settings.get_int("persist-window-geometry-top");
         let left = settings.get_int("persist-window-geometry-left");
         let width = settings.get_int("persist-window-geometry-width");
@@ -68,7 +49,7 @@ impl WindowGeometry {
         }
     }
 
-    pub(crate) fn apply(&self, window: &gtk::ApplicationWindow) {
+    pub fn apply(&self, window: &gtk::ApplicationWindow) {
         if self.width > 0 && self.height > 0 {
             window.resize(self.width, self.height);
         }
@@ -80,33 +61,23 @@ impl WindowGeometry {
         }
     }
 
-    pub(crate) fn write(&self, settings: &gio::Settings) {
-        settings
-            .set_int("persist-window-geometry-left", self.left)
-            .unwrap();
-        settings
-            .set_int("persist-window-geometry-top", self.top)
-            .unwrap();
-        settings
-            .set_int("persist-window-geometry-width", self.width)
-            .unwrap();
-        settings
-            .set_int("persist-window-geometry-height", self.height)
-            .unwrap();
-        settings
-            .set_boolean("persist-window-geometry-maximized", self.is_maximized)
-            .unwrap();
+    pub fn write(&self, settings: &gio::Settings) {
+        settings.set_int("persist-window-geometry-left", self.left);
+        settings.set_int("persist-window-geometry-top", self.top);
+        settings.set_int("persist-window-geometry-width", self.width);
+        settings.set_int("persist-window-geometry-height", self.height);
+        settings.set_boolean("persist-window-geometry-maximized", self.is_maximized);
     }
 }
 
-pub(crate) fn get_refresh_interval(settings: &Settings) -> Duration {
+pub fn get_refresh_interval(settings: &Settings) -> Duration {
     let time = i64::from(settings.get_int("refresh-interval-time"));
     let period = settings.get_string("refresh-interval-period").unwrap();
 
     time_period_to_duration(time, period.as_str())
 }
 
-pub(crate) fn get_cleanup_date(settings: &Settings) -> DateTime<Utc> {
+pub fn get_cleanup_date(settings: &Settings) -> DateTime<Utc> {
     let time = i64::from(settings.get_int("cleanup-age-time"));
     let period = settings.get_string("cleanup-age-period").unwrap();
     let duration = time_period_to_duration(time, period.as_str());
@@ -114,7 +85,7 @@ pub(crate) fn get_cleanup_date(settings: &Settings) -> DateTime<Utc> {
     Utc::now() - duration
 }
 
-pub(crate) fn time_period_to_duration(time: i64, period: &str) -> Duration {
+pub fn time_period_to_duration(time: i64, period: &str) -> Duration {
     match period {
         "weeks" => Duration::weeks(time),
         "days" => Duration::days(time),

hammond-gtk/src/stacks/content.rs

@@ -0,0 +1,92 @@
+use gtk;
+use gtk::prelude::*;
+
+use crossbeam_channel::Sender;
+use failure::Error;
+
+use app::Action;
+use stacks::{HomeStack, ShowStack};
+
+use std::cell::RefCell;
+use std::rc::Rc;
+
+#[derive(Debug, Clone)]
+pub struct Content {
+    stack: gtk::Stack,
+    shows: Rc<RefCell<ShowStack>>,
+    home: Rc<RefCell<HomeStack>>,
+    sender: Sender<Action>,
+}
+
+impl Content {
+    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", "Recent");
+        stack.add_titled(&shows.borrow().get_stack(), "shows", "Shows");
+
+        Ok(Content {
+            stack,
+            shows,
+            home,
+            sender,
+        })
+    }
+
+    pub fn update(&self) {
+        self.update_home();
+        self.update_shows();
+    }
+
+    pub fn update_home(&self) {
+        self.home
+            .borrow_mut()
+            .update()
+            .map_err(|err| error!("Failed to update HomeView: {}", err))
+            .ok();
+    }
+
+    pub fn update_home_if_background(&self) {
+        if self.stack.get_visible_child_name() != Some("home".into()) {
+            self.update_home();
+        }
+    }
+
+    fn update_shows(&self) {
+        self.shows
+            .borrow_mut()
+            .update()
+            .map_err(|err| error!("Failed to update ShowsView: {}", err))
+            .ok();
+    }
+
+    pub fn update_shows_view(&self) {
+        self.shows
+            .borrow_mut()
+            .update()
+            .map_err(|err| error!("Failed to update ShowsView: {}", err))
+            .ok();
+    }
+
+    pub fn update_widget_if_same(&self, pid: i32) {
+        let pop = self.shows.borrow().populated();
+        pop.borrow_mut()
+            .update_widget_if_same(pid)
+            .map_err(|err| error!("Failed to update ShowsWidget: {}", err))
+            .ok();
+    }
+
+    pub fn get_stack(&self) -> gtk::Stack {
+        self.stack.clone()
+    }
+
+    pub fn get_shows(&self) -> Rc<RefCell<ShowStack>> {
+        self.shows.clone()
+    }
+
+    pub fn get_visible_stack(&self) -> Option<gtk::Stack> {
+        self.stack.get_visible_child().and_then(|w| w.downcast::<gtk::Stack>().ok())
+    }
+}

hammond-gtk/src/stacks/home.rs

@@ -0,0 +1,117 @@
+use gtk;
+use gtk::prelude::*;
+use gtk::StackTransitionType;
+
+use crossbeam_channel::Sender;
+use failure::Error;
+use hammond_data::dbqueries::is_episodes_populated;
+use hammond_data::errors::DataError;
+
+use app::Action;
+use widgets::{EmptyView, HomeView};
+
+use std::rc::Rc;
+
+#[derive(Debug, Clone, Copy)]
+enum State {
+    Home,
+    Empty,
+}
+
+#[derive(Debug, Clone)]
+pub struct HomeStack {
+    empty: EmptyView,
+    episodes: Rc<HomeView>,
+    stack: gtk::Stack,
+    state: State,
+    sender: Sender<Action>,
+}
+
+impl HomeStack {
+    pub fn new(sender: Sender<Action>) -> Result<HomeStack, Error> {
+        let episodes = HomeView::new(sender.clone())?;
+        let empty = EmptyView::new();
+        let stack = gtk::Stack::new();
+        let state = State::Empty;
+
+        stack.add_named(&episodes.container, "home");
+        stack.add_named(&empty.container, "empty");
+
+        let mut home = HomeStack {
+            empty,
+            episodes,
+            stack,
+            state,
+            sender,
+        };
+
+        home.determine_state()?;
+        Ok(home)
+    }
+
+    pub fn get_stack(&self) -> gtk::Stack {
+        self.stack.clone()
+    }
+
+    pub fn update(&mut self) -> Result<(), Error> {
+        // Copy the vertical scrollbar adjustment from the old view.
+        self.episodes
+            .save_alignment()
+            .map_err(|err| error!("Failed to set episodes_view allignment: {}", err))
+            .ok();
+
+        self.replace_view()?;
+        // Determine the actuall state.
+        self.determine_state().map_err(From::from)
+    }
+
+    fn replace_view(&mut self) -> Result<(), Error> {
+        // Get the container of the view
+        let old = &self.episodes.container.clone();
+        let eps = HomeView::new(self.sender.clone())?;
+
+        // Remove the old widget and add the new one
+        // during this the previous view is removed,
+        // and the visibile child fallsback to empty view.
+        self.stack.remove(old);
+        self.stack.add_named(&eps.container, "home");
+        // Keep the previous state.
+        let s = self.state;
+        // Set the visible child back to the previous one to avoid
+        // the stack transition animation to show the empty view
+        self.switch_visible(s, StackTransitionType::None);
+
+        // replace view in the struct too
+        self.episodes = eps;
+
+        // This might not be needed
+        old.destroy();
+
+        Ok(())
+    }
+
+    fn switch_visible(&mut self, s: State, animation: StackTransitionType) {
+        use self::State::*;
+
+        match s {
+            Home => {
+                self.stack.set_visible_child_full("home", animation);
+                self.state = Home;
+            }
+            Empty => {
+                self.stack.set_visible_child_full("empty", animation);
+                self.state = Empty;
+            }
+        }
+    }
+
+    fn determine_state(&mut self) -> Result<(), DataError> {
+        if is_episodes_populated()? {
+            self.switch_visible(State::Home, StackTransitionType::Crossfade);
+        } else {
+            self.switch_visible(State::Empty, StackTransitionType::Crossfade);
+        };
+
+        Ok(())
+    }
+}

hammond-gtk/src/stacks/mod.rs

@@ -0,0 +1,9 @@
+mod content;
+mod home;
+mod populated;
+mod show;
+
+pub use self::content::Content;
+pub use self::home::HomeStack;
+pub use self::populated::{PopulatedStack, PopulatedState};
+pub use self::show::{ShowStack, ShowState};

hammond-gtk/src/stacks/populated.rs

@@ -0,0 +1,162 @@
+use gtk;
+use gtk::prelude::*;
+use gtk::StackTransitionType;
+
+use crossbeam_channel::Sender;
+use failure::Error;
+
+use hammond_data::dbqueries;
+use hammond_data::Podcast;
+
+use app::Action;
+use widgets::{ShowWidget, ShowsView};
+
+use std::rc::Rc;
+use std::sync::Arc;
+
+#[derive(Debug, Clone, Copy)]
+pub enum PopulatedState {
+    View,
+    Widget,
+}
+
+#[derive(Debug, Clone)]
+pub struct PopulatedStack {
+    container: gtk::Box,
+    populated: Rc<ShowsView>,
+    show: Rc<ShowWidget>,
+    stack: gtk::Stack,
+    state: PopulatedState,
+    sender: Sender<Action>,
+}
+
+impl PopulatedStack {
+    pub fn new(sender: Sender<Action>) -> Result<PopulatedStack, Error> {
+        let stack = gtk::Stack::new();
+        let state = PopulatedState::View;
+        let populated = ShowsView::new(sender.clone())?;
+        let show = Rc::new(ShowWidget::default());
+        let container = gtk::Box::new(gtk::Orientation::Horizontal, 0);
+
+        stack.add_named(&populated.container, "shows");
+        stack.add_named(&show.container, "widget");
+        container.add(&stack);
+        container.show_all();
+
+        let show = PopulatedStack {
+            container,
+            stack,
+            populated,
+            show,
+            state,
+            sender,
+        };
+
+        Ok(show)
+    }
+
+    pub fn update(&mut self) {
+        self.update_widget().map_err(|err| format!("{}", err)).ok();
+        self.update_shows().map_err(|err| format!("{}", err)).ok();
+    }
+
+    pub fn update_shows(&mut self) -> Result<(), Error> {
+        // The current visible child might change depending on
+        // removal and insertion in the gtk::Stack, so we have
+        // to make sure it will stay the same.
+        let s = self.state;
+        self.replace_shows()?;
+        self.switch_visible(s, StackTransitionType::Crossfade);
+
+        Ok(())
+    }
+
+    pub fn replace_shows(&mut self) -> Result<(), Error> {
+        let old = &self.populated.container.clone();
+        debug!("Name: {:?}", WidgetExt::get_name(old));
+
+        self.populated
+            .save_alignment()
+            .map_err(|err| error!("Failed to set episodes_view allignment: {}", err))
+            .ok();
+
+        let pop = ShowsView::new(self.sender.clone())?;
+        self.populated = pop;
+        self.stack.remove(old);
+        self.stack.add_named(&self.populated.container, "shows");
+
+        old.destroy();
+        Ok(())
+    }
+
+    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
+            .podcast_id()
+            .map(|id| self.show.save_vadjustment(id));
+
+        let new = ShowWidget::new(pd, self.sender.clone());
+        self.show = new;
+        self.stack.remove(&old);
+        self.stack.add_named(&self.show.container, "widget");
+
+        // The current visible child might change depending on
+        // removal and insertion in the gtk::Stack, so we have
+        // to make sure it will stay the same.
+        let s = self.state;
+        self.switch_visible(s, StackTransitionType::None);
+
+        Ok(())
+    }
+
+    pub fn update_widget(&mut self) -> Result<(), Error> {
+        let old = self.show.container.clone();
+        let id = self.show.podcast_id();
+        if id.is_none() {
+            return Ok(());
+        }
+
+        let pd = dbqueries::get_podcast_from_id(id.unwrap_or_default())?;
+        self.replace_widget(Arc::new(pd))?;
+
+        // The current visible child might change depending on
+        // removal and insertion in the gtk::Stack, so we have
+        // to make sure it will stay the same.
+        let s = self.state;
+        self.switch_visible(s, StackTransitionType::Crossfade);
+
+        old.destroy();
+        Ok(())
+    }
+
+    // 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.podcast_id() != Some(pid) {
+            debug!("Different widget. Early return");
+            return Ok(());
+        }
+
+        self.update_widget()
+    }
+
+    pub fn container(&self) -> gtk::Box {
+        self.container.clone()
+    }
+
+    pub fn switch_visible(&mut self, state: PopulatedState, animation: StackTransitionType) {
+        use self::PopulatedState::*;
+
+        match state {
+            View => {
+                self.stack.set_visible_child_full("shows", animation);
+                self.state = View;
+            }
+            Widget => {
+                self.stack.set_visible_child_full("widget", animation);
+                self.state = Widget;
+            }
+        }
+    }
+}

hammond-gtk/src/stacks/show.rs

@@ -0,0 +1,94 @@
+use gtk;
+use gtk::prelude::*;
+
+use crossbeam_channel::Sender;
+use failure::Error;
+use hammond_data::dbqueries::is_podcasts_populated;
+
+use app::Action;
+use stacks::PopulatedStack;
+use utils::get_ignored_shows;
+use widgets::EmptyView;
+
+use std::cell::RefCell;
+use std::rc::Rc;
+
+#[derive(Debug, Clone, Copy)]
+pub enum ShowState {
+    Populated,
+    Empty,
+}
+
+#[derive(Debug, Clone)]
+pub struct ShowStack {
+    empty: EmptyView,
+    populated: Rc<RefCell<PopulatedStack>>,
+    stack: gtk::Stack,
+    state: ShowState,
+    sender: Sender<Action>,
+}
+
+impl ShowStack {
+    pub fn new(sender: Sender<Action>) -> Result<Self, Error> {
+        let populated = Rc::new(RefCell::new(PopulatedStack::new(sender.clone())?));
+        let empty = EmptyView::new();
+        let stack = gtk::Stack::new();
+        let state = ShowState::Empty;
+
+        stack.add_named(&populated.borrow().container(), "populated");
+        stack.add_named(&empty.container, "empty");
+
+        let mut show = ShowStack {
+            empty,
+            populated,
+            stack,
+            state,
+            sender,
+        };
+
+        show.determine_state()?;
+        Ok(show)
+    }
+
+    pub fn get_stack(&self) -> gtk::Stack {
+        self.stack.clone()
+    }
+
+    pub fn populated(&self) -> Rc<RefCell<PopulatedStack>> {
+        self.populated.clone()
+    }
+
+    pub fn update(&mut self) -> Result<(), Error> {
+        self.populated.borrow_mut().update();
+        self.determine_state()
+    }
+
+    fn switch_visible(&mut self, s: ShowState) {
+        use self::ShowState::*;
+
+        match s {
+            Populated => {
+                self.stack.set_visible_child_name("populated");
+                self.state = Populated;
+            }
+            Empty => {
+                self.stack.set_visible_child_name("empty");
+                self.state = Empty;
+            }
+        };
+    }
+
+    fn determine_state(&mut self) -> Result<(), Error> {
+        use self::ShowState::*;
+
+        let ign = get_ignored_shows()?;
+        debug!("IGNORED SHOWS {:?}", ign);
+        if is_podcasts_populated(&ign)? {
+            self.switch_visible(Populated);
+        } else {
+            self.switch_visible(Empty);
+        };
+
+        Ok(())
+    }
+}

hammond-gtk/src/static_resource.rs

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

hammond-gtk/src/utils.rs

@@ -0,0 +1,447 @@
+#![cfg_attr(feature = "cargo-clippy", allow(type_complexity))]
+
+use gdk::FrameClockExt;
+use gdk_pixbuf::Pixbuf;
+use glib;
+use gtk;
+use gtk::prelude::*;
+use gtk::{IsA, Widget};
+
+use chrono::prelude::*;
+use crossbeam_channel::Sender;
+use failure::Error;
+use rayon;
+use regex::Regex;
+use reqwest;
+use send_cell::SendCell;
+use serde_json::Value;
+
+// use hammond_data::feed;
+use hammond_data::dbqueries;
+use hammond_data::opml;
+use hammond_data::pipeline;
+use hammond_data::utils::checkup;
+use hammond_data::Source;
+use hammond_downloader::downloader;
+
+use std::collections::{HashMap, HashSet};
+use std::sync::mpsc::channel;
+use std::sync::{Arc, Mutex, RwLock};
+
+use app::Action;
+
+/// Lazy evaluates and loads widgets to the parent `container` widget.
+///
+/// Accepts an `IntoIterator`, `data`, as the source from which each widget
+/// will be constructed. An `FnMut` function that returns the desired
+/// widget should be passed as the widget `constructor`. You can also specify
+/// a `callback` that will be executed when the iteration finish.
+///
+/// ```no_run
+/// # struct Message;
+/// # struct MessageWidget(gtk::Label);
+///
+/// # impl MessageWidget {
+/// #    fn new(_: Message) -> Self {
+/// #        MessageWidget(gtk::Label::new("A message"))
+/// #    }
+/// # }
+///
+/// let messages: Vec<Message> = Vec::new();
+/// let list = gtk::ListBox::new();
+/// let constructor = |m| MessageWidget::new(m).0;
+/// lazy_load(messages, list, constructor, || {});
+/// ```
+///
+/// If you have already constructed the widgets and only want to
+/// load them to the parent you can pass a closure that returns it's
+/// own argument to the constructor.
+///
+/// ```no_run
+/// # use std::collections::binary_heap::BinaryHeap;
+/// let widgets: BinaryHeap<gtk::Button> = BinaryHeap::new();
+/// let list = gtk::ListBox::new();
+/// lazy_load(widgets, list, |w| w, || {});
+/// ```
+pub fn lazy_load<T, C, F, W, U>(data: T, container: C, mut contructor: F, callback: U)
+where
+    T: IntoIterator + 'static,
+    T::Item: 'static,
+    C: ContainerExt + 'static,
+    F: FnMut(T::Item) -> W + 'static,
+    W: IsA<Widget> + WidgetExt,
+    U: Fn() + 'static,
+{
+    let func = move |x| {
+        let widget = contructor(x);
+        container.add(&widget);
+        widget.show();
+    };
+    lazy_load_full(data, func, callback);
+}
+
+/// Iterate over `data` and execute `func` using a `gtk::idle_add()`,
+/// when the iteration finishes, it executes `finish_callback`.
+///
+/// This is a more flexible version of `lazy_load` with less constrains.
+/// If you just want to lazy add `widgets` to a `container` check if
+/// `lazy_load` fits your needs first.
+#[cfg_attr(feature = "cargo-clippy", allow(redundant_closure))]
+pub fn lazy_load_full<T, F, U>(data: T, mut func: F, finish_callback: U)
+where
+    T: IntoIterator + 'static,
+    T::Item: 'static,
+    F: FnMut(T::Item) + 'static,
+    U: Fn() + 'static,
+{
+    let mut data = data.into_iter();
+    gtk::idle_add(move || {
+        data.next()
+            .map(|x| func(x))
+            .map(|_| glib::Continue(true))
+            .unwrap_or_else(|| {
+                finish_callback();
+                glib::Continue(false)
+            })
+    });
+}
+
+// Kudos to Julian Sparber
+// https://blogs.gnome.org/jsparber/2018/04/29/animate-a-scrolledwindow/
+#[cfg_attr(feature = "cargo-clippy", allow(float_cmp))]
+pub fn smooth_scroll_to(view: &gtk::ScrolledWindow, target: &gtk::Adjustment) {
+    if let Some(adj) = view.get_vadjustment() {
+        if let Some(clock) = view.get_frame_clock() {
+            let duration = 200;
+            let start = adj.get_value();
+            let end = target.get_value();
+            let start_time = clock.get_frame_time();
+            let end_time = start_time + 1000 * duration;
+
+            view.add_tick_callback(move |_, clock| {
+                let now = clock.get_frame_time();
+                // FIXME: `adj.get_value != end` is a float comparison...
+                if now < end_time && adj.get_value().abs() != end.abs() {
+                    let mut t = (now - start_time) as f64 / (end_time - start_time) as f64;
+                    t = ease_out_cubic(t);
+                    adj.set_value(start + t * (end - start));
+                    glib::Continue(true)
+                } else {
+                    adj.set_value(end);
+                    glib::Continue(false)
+                }
+            });
+        }
+    }
+}
+
+// From clutter-easing.c, based on Robert Penner's
+// infamous easing equations, MIT license.
+fn ease_out_cubic(t: f64) -> f64 {
+    let p = t - 1f64;
+    p * p * p + 1f64
+}
+
+lazy_static! {
+    static ref IGNORESHOWS: Arc<Mutex<HashSet<i32>>> = Arc::new(Mutex::new(HashSet::new()));
+}
+
+pub fn ignore_show(id: i32) -> Result<bool, Error> {
+    IGNORESHOWS
+        .lock()
+        .map(|mut guard| guard.insert(id))
+        .map_err(|err| format_err!("{}", err))
+}
+
+pub fn uningore_show(id: i32) -> Result<bool, Error> {
+    IGNORESHOWS
+        .lock()
+        .map(|mut guard| guard.remove(&id))
+        .map_err(|err| format_err!("{}", err))
+}
+
+pub fn get_ignored_shows() -> Result<Vec<i32>, Error> {
+    IGNORESHOWS
+        .lock()
+        .map(|guard| guard.iter().cloned().collect::<Vec<_>>())
+        .map_err(|err| format_err!("{}", err))
+}
+
+pub fn cleanup(cleanup_date: DateTime<Utc>) {
+    checkup(cleanup_date)
+        .map_err(|err| error!("Check up failed: {}", err))
+        .ok();
+}
+
+pub fn refresh<S>(source: Option<S>, sender: Sender<Action>)
+where
+    S: IntoIterator<Item = Source> + Send + 'static,
+{
+    refresh_feed(source, sender)
+        .map_err(|err| error!("Failed to update feeds: {}", err))
+        .ok();
+}
+
+/// Update the rss feed(s) originating from `source`.
+/// If `source` is None, Fetches all the `Source` entries in the database and updates them.
+/// When It's done,it queues up a `RefreshViews` action.
+fn refresh_feed<S>(source: Option<S>, sender: Sender<Action>) -> Result<(), Error>
+where
+    S: IntoIterator<Item = Source> + Send + 'static,
+{
+    sender
+        .send(Action::HeaderBarShowUpdateIndicator)
+        .map_err(|err| error!("Action Sender: {}", err))
+        .ok();
+
+    rayon::spawn(move || {
+        if let Some(s) = source {
+            // Refresh only specified feeds
+            pipeline::run(s, false)
+                .map_err(|err| error!("Error: {}", err))
+                .map_err(|_| error!("Error While trying to update the database."))
+                .ok();
+        } else {
+            // Refresh all the feeds
+            dbqueries::get_sources()
+                .map(|s| s.into_iter())
+                .and_then(|s| pipeline::run(s, false))
+                .map_err(|err| error!("Error: {}", err))
+                .ok();
+        };
+
+        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(())
+}
+
+lazy_static! {
+    static ref CACHED_PIXBUFS: RwLock<HashMap<(i32, u32), Mutex<SendCell<Pixbuf>>>> =
+        { RwLock::new(HashMap::new()) };
+    static ref COVER_DL_REGISTRY: RwLock<HashSet<i32>> = RwLock::new(HashSet::new());
+    static ref THREADPOOL: rayon::ThreadPool = rayon::ThreadPoolBuilder::new().build().unwrap();
+}
+
+// Since gdk_pixbuf::Pixbuf is refference counted and every episode,
+// use the cover of the Podcast Feed/Show, We can only create a Pixbuf
+// cover per show and pass around the Rc pointer.
+//
+// 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, 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(&podcast_id) {
+            let callback = clone!(image => move || {
+                 let _ = set_image_from_path(&image, podcast_id, size);
+                 glib::Continue(false)
+            });
+            gtk::timeout_add(250, callback);
+            return Ok(());
+        }
+    }
+
+    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(&(podcast_id, size)) {
+            guard
+                .lock()
+                .map_err(|err| format_err!("SendCell Mutex: {}", err))
+                .and_then(|sendcell| {
+                    sendcell
+                        .try_get()
+                        .map(|px| image.set_from_pixbuf(px))
+                        .ok_or_else(|| format_err!("Pixbuf was accessed from a different thread"))
+                })?;
+
+            return Ok(());
+        }
+    }
+
+    let (sender, receiver) = channel();
+    THREADPOOL.spawn(move || {
+        if let Ok(mut guard) = COVER_DL_REGISTRY.write() {
+            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 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((podcast_id, size), Mutex::new(SendCell::new(px.clone())));
+                        image.set_from_pixbuf(&px);
+                    }
+                }
+            }
+            glib::Continue(false)
+        } else {
+            glib::Continue(true)
+        }
+    });
+    Ok(())
+}
+
+// FIXME: the signature should be `fn foo(s: Url) -> Result<Url, Error>`
+pub fn itunes_to_rss(url: &str) -> Result<String, Error> {
+    let id = itunes_id_from_url(url).ok_or_else(|| format_err!("Failed to find an Itunes ID."))?;
+    lookup_id(id)
+}
+
+fn itunes_id_from_url(url: &str) -> Option<u32> {
+    lazy_static! {
+        static ref RE: Regex = Regex::new(r"/id([0-9]+)").unwrap();
+    }
+
+    // Get the itunes id from the url
+    let foo = RE.captures_iter(url).nth(0)?.get(1)?.as_str();
+    // Parse it to a u32, this *should* never fail
+    foo.parse::<u32>().ok()
+}
+
+fn lookup_id(id: u32) -> Result<String, Error> {
+    let url = format!("https://itunes.apple.com/lookup?id={}&entity=podcast", id);
+    let req: Value = reqwest::get(&url)?.json()?;
+    let rssurl = || -> Option<&str> { req.get("results")?.get(0)?.get("feedUrl")?.as_str() };
+    rssurl()
+        .map(From::from)
+        .ok_or_else(|| format_err!("Failed to get url from itunes response"))
+}
+
+pub fn on_import_clicked(window: &gtk::Window, sender: &Sender<Action>) {
+    use glib::translate::ToGlib;
+    use gtk::{FileChooserAction, FileChooserNative, FileFilter, ResponseType};
+
+    // let dialog = FileChooserDialog::new(title, Some(&window), FileChooserAction::Open);
+    // TODO: It might be better to use a FileChooserNative widget.
+    // Create the FileChooser Dialog
+    let dialog = FileChooserNative::new(
+        Some("Select the file from which to you want to Import Shows."),
+        Some(window),
+        FileChooserAction::Open,
+        Some("_Import"),
+        None,
+    );
+
+    // Do not show hidden(.thing) files
+    dialog.set_show_hidden(false);
+
+    // Set a filter to show only xml files
+    let filter = FileFilter::new();
+    FileFilterExt::set_name(&filter, Some("OPML file"));
+    filter.add_mime_type("application/xml");
+    filter.add_mime_type("text/xml");
+    dialog.add_filter(&filter);
+
+    dialog.connect_response(clone!(sender => move |dialog, resp| {
+        debug!("Dialong Response {}", resp);
+        if resp == ResponseType::Accept.to_glib() {
+            // TODO: Show an in-app notifictaion if the file can not be accessed
+            if let Some(filename) = dialog.get_filename() {
+                debug!("File selected: {:?}", filename);
+
+                rayon::spawn(clone!(sender => move || {
+                    // Parse the file and import the feeds
+                    if let Ok(sources) = opml::import_from_file(filename) {
+                        // Refresh the succesfully parsed feeds to index them
+                        refresh(Some(sources), sender)
+                    } else {
+                        let text = String::from("Failed to parse the Imported file");
+                        sender.send(Action::ErrorNotification(text))
+                            .map_err(|err| error!("Action Sender: {}", err))
+                            .ok();
+                    }
+                }))
+            } else {
+                let text = String::from("Selected File could not be accessed.");
+                sender.send(Action::ErrorNotification(text))
+                    .map_err(|err| error!("Action Sender: {}", err))
+                    .ok();
+            }
+        }
+
+        dialog.destroy();
+    }));
+
+    dialog.run();
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    // use hammond_data::Source;
+    // use hammond_data::dbqueries;
+
+    // #[test]
+    // This test inserts an rss feed to your `XDG_DATA/hammond/hammond.db` so we make it explicit
+    // to run it.
+    // #[ignore]
+    // Disabled till https://gitlab.gnome.org/World/hammond/issues/56
+    // fn test_set_image_from_path() {
+    //     let url = "https://web.archive.org/web/20180120110727if_/https://rss.acast.com/thetipoff";
+    // Create and index a source
+    //     let source = Source::from_url(url).unwrap();
+    // Copy it's id
+    //     let sid = source.id();
+    //     pipeline::run(vec![source], true).unwrap();
+
+    // Get the Podcast
+    //     let img = gtk::Image::new();
+    //     let pd = dbqueries::get_podcast_from_source_id(sid).unwrap().into();
+    //     let pxbuf = set_image_from_path(&img, Arc::new(pd), 256);
+    //     assert!(pxbuf.is_ok());
+    // }
+
+    #[test]
+    fn test_itunes_to_rss() {
+        let itunes_url = "https://itunes.apple.com/podcast/id1195206601";
+        let rss_url = String::from("http://feeds.feedburner.com/InterceptedWithJeremyScahill");
+        assert_eq!(rss_url, itunes_to_rss(itunes_url).unwrap());
+
+        let itunes_url = "https://itunes.apple.com/podcast/id000000000000000";
+        assert!(itunes_to_rss(itunes_url).is_err());
+    }
+
+    #[test]
+    fn test_itunes_id() {
+        let id = 1195206601;
+        let itunes_url = "https://itunes.apple.com/podcast/id1195206601";
+        assert_eq!(id, itunes_id_from_url(itunes_url).unwrap());
+    }
+
+    #[test]
+    fn test_itunes_lookup_id() {
+        let id = 1195206601;
+        let rss_url = "http://feeds.feedburner.com/InterceptedWithJeremyScahill";
+        assert_eq!(rss_url, lookup_id(id).unwrap());
+
+        let id = 000000000;
+        assert!(lookup_id(id).is_err());
+    }
+}

hammond-gtk/src/widgets/aboutdialog.rs

@@ -0,0 +1,42 @@
+use gtk;
+use gtk::prelude::*;
+
+// Totally copied it from fractal.
+// https://gitlab.gnome.org/danigm/fractal/blob/503e311e22b9d7540089d735b92af8e8f93560c5/fractal-gtk/src/app.rs#L1883-1912
+/// Given a `window` create and attach an `gtk::AboutDialog` to it.
+pub fn about_dialog(window: &gtk::Window) {
+    // Feel free to add yourself if you contribured.
+    let authors = &[
+        "Constantin Nickel",
+        "Gabriele Musco",
+        "James Wykeham-Martin",
+        "Jordan Petridis",
+        "Julian Sparber",
+        "Rowan Lewis",
+        "Zander Brown",
+    ];
+
+    let dialog = gtk::AboutDialog::new();
+    // Waiting for a logo.
+    // dialog.set_logo_icon_name("org.gnome.Hammond");
+    dialog.set_logo_icon_name("multimedia-player");
+    dialog.set_comments("Podcast Client for the GNOME Desktop.");
+    dialog.set_copyright("© 2017, 2018 Jordan Petridis");
+    dialog.set_license_type(gtk::License::Gpl30);
+    dialog.set_modal(true);
+    // TODO: make it show it fetches the commit hash from which it was built
+    // and the version number is kept in sync automaticly
+    dialog.set_version("0.3.4");
+    dialog.set_program_name("Hammond");
+    // TODO: Need a wiki page first.
+    // dialog.set_website("https://wiki.gnome.org/Design/Apps/Potential/Podcasts");
+    // dialog.set_website_label("Learn more about Hammond");
+    dialog.set_transient_for(window);
+
+    dialog.set_artists(&["Tobias Bernard"]);
+    dialog.set_authors(authors);
+
+    dialog.connect_response(|dlg, _| dlg.destroy());
+
+    dialog.show();
+}

hammond-gtk/src/widgets/appnotif.rs

@@ -0,0 +1,94 @@
+use glib;
+use gtk;
+use gtk::prelude::*;
+
+use std::cell::RefCell;
+use std::rc::Rc;
+
+#[derive(Debug, Clone, Copy)]
+pub enum UndoState {
+    Shown,
+    Hidden,
+}
+
+#[derive(Debug, Clone)]
+pub struct InAppNotification {
+    revealer: gtk::Revealer,
+    text: gtk::Label,
+    undo: gtk::Button,
+    close: gtk::Button,
+}
+
+impl Default for InAppNotification {
+    fn default() -> Self {
+        let builder = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/inapp_notif.ui");
+
+        let revealer: gtk::Revealer = builder.get_object("revealer").unwrap();
+        let text: gtk::Label = builder.get_object("text").unwrap();
+        let undo: gtk::Button = builder.get_object("undo").unwrap();
+        let close: gtk::Button = builder.get_object("close").unwrap();
+
+        InAppNotification {
+            revealer,
+            text,
+            undo,
+            close,
+        }
+    }
+}
+
+impl InAppNotification {
+    pub fn new<F, U>(text: &str, mut callback: F, undo_callback: U, show_undo: UndoState) -> Self
+    where
+        F: FnMut() -> glib::Continue + 'static,
+        U: Fn() + 'static,
+    {
+        let notif = InAppNotification::default();
+        notif.text.set_text(&text);
+
+        let revealer = notif.revealer.clone();
+        let id = timeout_add_seconds(6, move || {
+            revealer.set_reveal_child(false);
+            callback()
+        });
+        let id = Rc::new(RefCell::new(Some(id)));
+
+        // Cancel the callback
+        let revealer = notif.revealer.clone();
+        notif.undo.connect_clicked(move |_| {
+            let foo = id.borrow_mut().take();
+            if let Some(id) = foo {
+                glib::source::source_remove(id);
+            }
+
+            undo_callback();
+
+            // Hide the notification
+            revealer.set_reveal_child(false);
+        });
+
+        // Hide the revealer when the close button is clicked
+        let revealer = notif.revealer.clone();
+        notif.close.connect_clicked(move |_| {
+            revealer.set_reveal_child(false);
+        });
+
+        match show_undo {
+            UndoState::Shown => (),
+            UndoState::Hidden => notif.undo.hide(),
+        }
+
+        notif
+    }
+
+    // This is a seperate method cause in order to get a nice animation
+    // the revealer should be attached to something that displays it.
+    // Previously we where doing it in the constructor, which had the result
+    // of the animation being skipped cause there was no parent widget to display it.
+    pub fn show(&self, overlay: &gtk::Overlay) {
+        overlay.add_overlay(&self.revealer);
+        // We need to display the notification after the widget is added to the overlay
+        // so there will be a nice animation.
+        self.revealer.set_reveal_child(true);
+    }
+}

hammond-gtk/src/widgets/empty.rs

@@ -0,0 +1,21 @@
+use gtk;
+
+#[derive(Debug, Clone)]
+pub struct EmptyView {
+    pub container: gtk::Box,
+}
+
+impl Default for EmptyView {
+    fn default() -> Self {
+        let builder = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/empty_view.ui");
+        let view: gtk::Box = builder.get_object("empty_view").unwrap();
+
+        EmptyView { container: view }
+    }
+}
+
+impl EmptyView {
+    pub fn new() -> EmptyView {
+        EmptyView::default()
+    }
+}

hammond-gtk/src/widgets/episode.rs

@@ -1,24 +1,4 @@
-// episode.rs
-//
-// Copyright 2017 Jordan Petridis <jpetridis@gnome.org>
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 use glib;
-use glib::clone;
 use gtk;
 use gtk::prelude::*;
 
@@ -27,23 +7,19 @@ 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 podcasts_data::dbqueries;
-use podcasts_data::utils::get_download_folder;
-use podcasts_data::EpisodeWidgetModel;
-use podcasts_downloader::downloader::DownloadProgress;
+use hammond_data::dbqueries;
+use hammond_data::utils::get_download_folder;
+use hammond_data::EpisodeWidgetQuery;
 
-use crate::app::Action;
-use crate::manager;
+use app::Action;
+use manager;
 
-use std::cell::RefCell;
-use std::rc::{Rc, Weak};
+use std::path::Path;
+use std::rc::Rc;
 use std::sync::{Arc, Mutex, TryLockError};
 
-use crate::i18n::i18n_f;
-
 lazy_static! {
     static ref SIZE_OPTS: Arc<size_opts::FileSizeOpts> =  {
         // Declare a custom humansize option struct
@@ -63,8 +39,8 @@ lazy_static! {
 }
 
 #[derive(Clone, Debug)]
-pub(crate) struct EpisodeWidget {
-    pub(crate) container: gtk::Box,
+pub struct EpisodeWidget {
+    pub container: gtk::Box,
     info: InfoLabels,
     buttons: Buttons,
     progressbar: gtk::ProgressBar,
@@ -81,41 +57,43 @@ struct InfoLabels {
     local_size: gtk::Label,
     size_separator: gtk::Label,
     total_size: gtk::Label,
-    played_checkmark: gtk::Image,
 }
 
 #[derive(Clone, Debug)]
 struct Buttons {
-    container: gtk::Box,
+    container: gtk::ButtonBox,
     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);
 
         // Set the date label.
         self.set_date(episode.epoch());
 
-        // Set the duration label.
+        // Set the duaration label.
         self.set_duration(episode.duration());
 
         // Set the total_size label.
         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() {
-            self.title.get_style_context().add_class("dim-label");
-            self.played_checkmark.show();
+            self.title
+                .get_style_context()
+                .map(|c| c.add_class("dim-label"));
         } else {
-            self.title.get_style_context().remove_class("dim-label");
-            self.played_checkmark.hide();
+            self.title
+                .get_style_context()
+                .map(|c| c.remove_class("dim-label"));
         }
     }
 
@@ -138,15 +116,14 @@ impl InfoLabels {
 
     // Set the duration label of the episode widget.
     fn set_duration(&self, seconds: Option<i32>) {
-        // If length is provided
+        // If lenght is provided
         if let Some(s) = seconds {
             // Convert seconds to minutes
             let minutes = chrono::Duration::seconds(s.into()).num_minutes();
-            // If the length is 1 or more minutes
+            // If the lenght is 1 or more minutes
             if minutes != 0 {
                 // Set the label and show them.
-                self.duration
-                    .set_text(&i18n_f("{} min", &[&minutes.to_string()]));
+                self.duration.set_text(&format!("{} min", minutes));
                 self.duration.show();
                 self.separator1.show();
                 return;
@@ -183,7 +160,7 @@ impl InfoLabels {
 
 impl Default for EpisodeWidget {
     fn default() -> Self {
-        let builder = gtk::Builder::new_from_resource("/org/gnome/Podcasts/gtk/episode_widget.ui");
+        let builder = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/episode_widget.ui");
 
         let container = builder.get_object("episode_container").unwrap();
         let progressbar = builder.get_object("progress_bar").unwrap();
@@ -192,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();
@@ -199,7 +177,6 @@ impl Default for EpisodeWidget {
         let duration = builder.get_object("duration_label").unwrap();
         let local_size = builder.get_object("local_size").unwrap();
         let total_size = builder.get_object("total_size").unwrap();
-        let played_checkmark = builder.get_object("played_checkmark").unwrap();
 
         let separator1 = builder.get_object("separator1").unwrap();
         let separator2 = builder.get_object("separator2").unwrap();
@@ -217,13 +194,13 @@ impl Default for EpisodeWidget {
                 local_size,
                 total_size,
                 size_separator,
-                played_checkmark,
             },
             buttons: Buttons {
                 container: buttons_container,
                 play,
                 download,
                 cancel,
+                desc: desc_button,
             },
             progressbar,
             container,
@@ -232,40 +209,39 @@ impl Default for EpisodeWidget {
 }
 
 impl EpisodeWidget {
-    pub(crate) 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());
-        let episode = RefCell::new(Some(episode));
-        let weak = Rc::downgrade(&widget);
+        widget.info.init(episode);
+        Self::determine_buttons_state(&widget, episode, sender)
+            .map_err(|err| error!("Error: {}", err))
+            .ok();
         widget
-            .container
-            .connect_draw(clone!(@strong sender => move |_, _| {
-                episode.borrow_mut().take().map(|ep| {
-                    weak.upgrade().map(|w| w.info.init(&ep));
-                    Self::determine_buttons_state(&weak, &ep, &sender)
-                        .map_err(|err| error!("Error: {}", err))
-                        .ok();
-                });
+            .on_desc_clicked(episode, sender)
+            .map_err(|err| error!("Error: {}", err))
+            .ok();
+        widget
+    }
 
-                gtk::Inhibit(false)
+    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();
             }));
-
-        // When the widget is attached to a parent,
-        // since it's a rust struct and not a widget the
-        // compiler drops the reference to it at the end of
-        // scope. That's cause we only attach the `self.container`
-        // to the parent.
-        //
-        // So this callback keeps a reference to the Rust Struct
-        // so the compiler won't drop it.
-        //
-        // When the widget is detached from its parent view this
-        // callback runs freeing the last reference we were holding.
-        let foo = RefCell::new(Some(widget.clone()));
-        widget.container.connect_remove(move |_, _| {
-            foo.borrow_mut().take();
-        });
-
-        widget
+            Ok(())
+        } else {
+            self.buttons.desc.hide();
+            Ok(())
+        }
     }
 
     // fn init(widget: Rc<Self>, sender: &Sender<Action>) {}
@@ -349,13 +325,10 @@ impl EpisodeWidget {
     /// |   ToDownload    |
     /// -------------------
     fn determine_buttons_state(
-        weak: &Weak<Self>,
-        episode: &EpisodeWidgetModel,
+        widget: &Rc<Self>,
+        episode: &EpisodeWidgetQuery,
         sender: &Sender<Action>,
     ) -> Result<(), Error> {
-        let widget = weak
-            .upgrade()
-            .ok_or_else(|| format_err!("Widget is already dropped"))?;
         // Reset the buttons state no matter the glade file.
         // This is just to make it easier to port to relm in the future.
         widget.buttons.cancel.hide();
@@ -372,14 +345,14 @@ impl EpisodeWidget {
             Ok(m.get(&id).cloned())
         };
 
-        // State: InProgress
+        // State: InProggress
         if let Some(prog) = active_dl()? {
             // set a callback that will update the state when the download finishes
-            let callback = clone!(@strong weak, @strong sender => move || {
+            let callback = clone!(widget, sender => move || {
                 if let Ok(guard) = manager::ACTIVE_DOWNLOADS.read() {
                     if !guard.contains_key(&id) {
                         if let Ok(ep) = dbqueries::get_episode_widget_from_rowid(id) {
-                            Self::determine_buttons_state(&weak, &ep, &sender)
+                            Self::determine_buttons_state(&widget, &ep, &sender)
                                 .map_err(|err| error!("Error: {}", err))
                                 .ok();
 
@@ -396,20 +369,20 @@ impl EpisodeWidget {
             widget
                 .buttons
                 .cancel
-                .connect_clicked(clone!(@strong prog, @strong weak, @strong sender => move |_| {
+                .connect_clicked(clone!(prog, widget, sender => move |_| {
                     // Cancel the download
                     if let Ok(mut m) = prog.lock() {
                         m.cancel();
                     }
 
                     // Cancel is not instant so we have to wait a bit
-                    timeout_add(50, clone!(@strong weak, @strong sender => move || {
+                    timeout_add(50, clone!(widget, sender => move || {
                         if let Ok(thing) = active_dl() {
                             if thing.is_none() {
                                 // Recalculate the widget state
                                 dbqueries::get_episode_widget_from_rowid(id)
                                     .map_err(From::from)
-                                    .and_then(|ep| Self::determine_buttons_state(&weak, &ep, &sender))
+                                    .and_then(|ep| Self::determine_buttons_state(&widget, &ep, &sender))
                                     .map_err(|err| error!("Error: {}", err))
                                     .ok();
 
@@ -424,10 +397,10 @@ impl EpisodeWidget {
             // Setup a callback that will update the total_size label
             // with the http ContentLength header number rather than
             // relying to the RSS feed.
-            update_total_size_callback(&weak, &prog);
+            update_total_size_callback(&widget, &prog);
 
             // Setup a callback that will update the progress bar.
-            update_progressbar_callback(&weak, &prog, id);
+            update_progressbar_callback(&widget, &prog, id);
 
             // Change the widget layout/state
             widget.state_prog();
@@ -444,9 +417,9 @@ impl EpisodeWidget {
             widget
                 .buttons
                 .play
-                .connect_clicked(clone!(@strong weak, @strong sender => move |_| {
+                .connect_clicked(clone!(widget, sender => move |_| {
                     if let Ok(mut ep) = dbqueries::get_episode_widget_from_rowid(id) {
-                        on_play_bttn_clicked(&weak, &mut ep, &sender)
+                        on_play_bttn_clicked(&widget, &mut ep, &sender)
                             .map_err(|err| error!("Error: {}", err))
                             .ok();
                     }
@@ -460,14 +433,14 @@ impl EpisodeWidget {
         widget
             .buttons
             .download
-            .connect_clicked(clone!(@strong weak, @strong sender => move |dl| {
+            .connect_clicked(clone!(widget, sender => move |dl| {
                 // Make the button insensitive so it won't be pressed twice
                 dl.set_sensitive(false);
                 if let Ok(ep) = dbqueries::get_episode_widget_from_rowid(id) {
                     on_download_clicked(&ep, &sender)
                         .and_then(|_| {
-                            info!("Download started successfully.");
-                            Self::determine_buttons_state(&weak, &ep, &sender)
+                            info!("Donwload started succesfully.");
+                            Self::determine_buttons_state(&widget, &ep, &sender)
                         })
                         .map_err(|err| error!("Error: {}", err))
                         .ok();
@@ -484,8 +457,8 @@ 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.
@@ -494,67 +467,60 @@ fn on_download_clicked(ep: &EpisodeWidgetModel, sender: &Sender<Action>) -> Resu
     // Update Views
     sender
         .send(Action::RefreshEpisodesViewBGR)
-        .expect("Action channel blew up somehow");
-    Ok(())
+        .map_err(From::from)
 }
 
 fn on_play_bttn_clicked(
-    widget: &Weak<EpisodeWidget>,
-    episode: &mut EpisodeWidgetModel,
+    widget: &Rc<EpisodeWidget>,
+    episode: &mut EpisodeWidgetQuery,
     sender: &Sender<Action>,
 ) -> Result<(), Error> {
-    let widget = widget
-        .upgrade()
-        .ok_or_else(|| format_err!("Widget is already dropped"))?;
-
-    // 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()))
-        .expect("Action channel blew up somehow");
-    // Refresh background views to match the normal/greyout title state
+    widget.info.set_title(&episode);
     sender
         .send(Action::RefreshEpisodesViewBGR)
-        .expect("Action channel blew up somehow");
+        .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(())
 }
 
 // Setup a callback that will update the progress bar.
 #[inline]
-#[allow(clippy::if_same_then_else)]
+#[cfg_attr(feature = "cargo-clippy", allow(if_same_then_else))]
 fn update_progressbar_callback(
-    widget: &Weak<EpisodeWidget>,
+    widget: &Rc<EpisodeWidget>,
     prog: &Arc<Mutex<manager::Progress>>,
     episode_rowid: i32,
 ) {
-    let callback = clone!(@strong widget,@strong prog => move || {
+    let callback = clone!(widget, prog => move || {
         progress_bar_helper(&widget, &prog, episode_rowid)
             .unwrap_or(glib::Continue(false))
     });
     timeout_add(100, callback);
 }
 
-#[allow(clippy::if_same_then_else)]
+#[allow(if_same_then_else)]
 fn progress_bar_helper(
-    widget: &Weak<EpisodeWidget>,
+    widget: &Rc<EpisodeWidget>,
     prog: &Arc<Mutex<manager::Progress>>,
     episode_rowid: i32,
 ) -> Result<glib::Continue, Error> {
-    let widget = match widget.upgrade() {
-        Some(w) => w,
-        None => return Ok(glib::Continue(false)),
-    };
-
-    let (fraction, downloaded, cancel) = match prog.try_lock() {
-        Ok(guard) => (
-            guard.get_fraction(),
-            guard.get_downloaded(),
-            guard.should_cancel(),
-        ),
+    let (fraction, downloaded) = match prog.try_lock() {
+        Ok(guard) => (guard.get_fraction(), guard.get_downloaded()),
         Err(TryLockError::WouldBlock) => return Ok(glib::Continue(true)),
         Err(TryLockError::Poisoned(_)) => return Err(format_err!("Progress Mutex is poisoned")),
     };
@@ -581,19 +547,7 @@ fn progress_bar_helper(
 
     if (fraction >= 1.0) && (!fraction.is_nan()) {
         Ok(glib::Continue(false))
-    } else if !active || cancel {
-        // if the total size is not a number, hide it
-        if widget
-            .info
-            .total_size
-            .get_text()
-            .as_ref()
-            .map(|s| s.trim_end_matches(" MB"))
-            .and_then(|s| s.parse::<i32>().ok())
-            .is_none()
-        {
-            widget.info.total_size.hide();
-        }
+    } else if !active {
         Ok(glib::Continue(false))
     } else {
         Ok(glib::Continue(true))
@@ -604,25 +558,20 @@ fn progress_bar_helper(
 // with the http ContentLength header number rather than
 // relying to the RSS feed.
 #[inline]
-fn update_total_size_callback(widget: &Weak<EpisodeWidget>, prog: &Arc<Mutex<manager::Progress>>) {
-    let callback = clone!(@strong prog, @strong widget => move || {
+fn update_total_size_callback(widget: &Rc<EpisodeWidget>, prog: &Arc<Mutex<manager::Progress>>) {
+    let callback = clone!(prog, widget => move || {
         total_size_helper(&widget, &prog).unwrap_or(glib::Continue(true))
     });
     timeout_add(100, callback);
 }
 
 fn total_size_helper(
-    widget: &Weak<EpisodeWidget>,
+    widget: &Rc<EpisodeWidget>,
     prog: &Arc<Mutex<manager::Progress>>,
 ) -> Result<glib::Continue, Error> {
-    let widget = match widget.upgrade() {
-        Some(w) => w,
-        None => return Ok(glib::Continue(false)),
-    };
-
     // Get the total_bytes.
     let total_bytes = match prog.try_lock() {
-        Ok(guard) => guard.get_size(),
+        Ok(guard) => guard.get_total_size(),
         Err(TryLockError::WouldBlock) => return Ok(glib::Continue(true)),
         Err(TryLockError::Poisoned(_)) => return Err(format_err!("Progress Mutex is poisoned")),
     };

hammond-gtk/src/widgets/home_view.rs

@@ -0,0 +1,229 @@
+use chrono::prelude::*;
+use failure::Error;
+
+use gtk;
+use gtk::prelude::*;
+
+use crossbeam_channel::Sender;
+use hammond_data::dbqueries;
+use hammond_data::EpisodeWidgetQuery;
+use send_cell::SendCell;
+
+use app::Action;
+use utils::{self, lazy_load_full};
+use widgets::EpisodeWidget;
+
+use std::rc::Rc;
+use std::sync::Mutex;
+
+lazy_static! {
+    pub static ref EPISODES_VIEW_VALIGNMENT: Mutex<Option<SendCell<gtk::Adjustment>>> =
+        Mutex::new(None);
+}
+
+#[derive(Debug, Clone)]
+enum ListSplit {
+    Today,
+    Yday,
+    Week,
+    Month,
+    Rest,
+}
+
+#[derive(Debug, Clone)]
+pub struct HomeView {
+    pub container: gtk::Box,
+    scrolled_window: gtk::ScrolledWindow,
+    frame_parent: gtk::Box,
+    today_box: gtk::Box,
+    yday_box: gtk::Box,
+    week_box: gtk::Box,
+    month_box: gtk::Box,
+    rest_box: gtk::Box,
+    today_list: gtk::ListBox,
+    yday_list: gtk::ListBox,
+    week_list: gtk::ListBox,
+    month_list: gtk::ListBox,
+    rest_list: gtk::ListBox,
+}
+
+impl Default for HomeView {
+    fn default() -> Self {
+        let builder = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/episodes_view.ui");
+        let container: gtk::Box = builder.get_object("container").unwrap();
+        let scrolled_window: gtk::ScrolledWindow = builder.get_object("scrolled_window").unwrap();
+        let frame_parent: gtk::Box = builder.get_object("frame_parent").unwrap();
+        let today_box: gtk::Box = builder.get_object("today_box").unwrap();
+        let yday_box: gtk::Box = builder.get_object("yday_box").unwrap();
+        let week_box: gtk::Box = builder.get_object("week_box").unwrap();
+        let month_box: gtk::Box = builder.get_object("month_box").unwrap();
+        let rest_box: gtk::Box = builder.get_object("rest_box").unwrap();
+        let today_list: gtk::ListBox = builder.get_object("today_list").unwrap();
+        let yday_list: gtk::ListBox = builder.get_object("yday_list").unwrap();
+        let week_list: gtk::ListBox = builder.get_object("week_list").unwrap();
+        let month_list: gtk::ListBox = builder.get_object("month_list").unwrap();
+        let rest_list: gtk::ListBox = builder.get_object("rest_list").unwrap();
+
+        HomeView {
+            container,
+            scrolled_window,
+            frame_parent,
+            today_box,
+            yday_box,
+            week_box,
+            month_box,
+            rest_box,
+            today_list,
+            yday_list,
+            week_list,
+            month_list,
+            rest_list,
+        }
+    }
+}
+
+// TODO: REFACTOR ME
+impl HomeView {
+    pub fn new(sender: Sender<Action>) -> Result<Rc<HomeView>, Error> {
+        use self::ListSplit::*;
+
+        let view = Rc::new(HomeView::default());
+        let ignore = utils::get_ignored_shows()?;
+        let episodes = dbqueries::get_episodes_widgets_filter_limit(&ignore, 100)?;
+        let now_utc = Utc::now();
+
+        let view_ = view.clone();
+        let func = move |ep: EpisodeWidgetQuery| {
+            let epoch = ep.epoch();
+            let widget = HomeEpisode::new(&ep, &sender);
+
+            match split(&now_utc, i64::from(epoch)) {
+                Today => add_to_box(&widget, &view_.today_list, &view_.today_box),
+                Yday => add_to_box(&widget, &view_.yday_list, &view_.yday_box),
+                Week => add_to_box(&widget, &view_.week_list, &view_.week_box),
+                Month => add_to_box(&widget, &view_.month_list, &view_.month_box),
+                Rest => add_to_box(&widget, &view_.rest_list, &view_.rest_box),
+            }
+        };
+
+        let view_ = view.clone();
+        let callback = move || {
+            view_
+                .set_vadjustment()
+                .map_err(|err| format!("{}", err))
+                .ok();
+        };
+
+        lazy_load_full(episodes, func, callback);
+        view.container.show_all();
+        Ok(view)
+    }
+
+    /// Set scrolled window vertical adjustment.
+    fn set_vadjustment(&self) -> Result<(), Error> {
+        let guard = EPISODES_VIEW_VALIGNMENT
+            .lock()
+            .map_err(|err| format_err!("Failed to lock widget align mutex: {}", err))?;
+
+        if let Some(ref sendcell) = *guard {
+            // Copy the vertical scrollbar adjustment from the old view into the new one.
+            sendcell
+                .try_get()
+                .map(|x| utils::smooth_scroll_to(&self.scrolled_window, &x));
+        }
+
+        Ok(())
+    }
+
+    /// Save the vertical scrollbar position.
+    pub fn save_alignment(&self) -> Result<(), Error> {
+        if let Ok(mut guard) = EPISODES_VIEW_VALIGNMENT.lock() {
+            let adj = self
+                .scrolled_window
+                .get_vadjustment()
+                .ok_or_else(|| format_err!("Could not get the adjustment"))?;
+            *guard = Some(SendCell::new(adj));
+            info!("Saved episodes_view alignment.");
+        }
+
+        Ok(())
+    }
+}
+
+fn add_to_box(widget: &HomeEpisode, listbox: &gtk::ListBox, box_: &gtk::Box) {
+    listbox.add(&widget.container);
+    box_.show();
+}
+
+fn split(now: &DateTime<Utc>, epoch: i64) -> ListSplit {
+    let ep = Utc.timestamp(epoch, 0);
+
+    if now.ordinal() == ep.ordinal() && now.year() == ep.year() {
+        ListSplit::Today
+    } else if now.ordinal() == ep.ordinal() + 1 && now.year() == ep.year() {
+        ListSplit::Yday
+    } else if now.iso_week().week() == ep.iso_week().week() && now.year() == ep.year() {
+        ListSplit::Week
+    } else if now.month() == ep.month() && now.year() == ep.year() {
+        ListSplit::Month
+    } else {
+        ListSplit::Rest
+    }
+}
+
+#[derive(Debug, Clone)]
+struct HomeEpisode {
+    container: gtk::Box,
+    image: gtk::Image,
+    // FIXME: Change it to `EpisodeWidget` instead of a `Box`?
+    episode: gtk::Box,
+}
+
+impl Default for HomeEpisode {
+    fn default() -> Self {
+        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 ep = EpisodeWidget::default();
+        container.pack_start(&ep.container, true, true, 6);
+
+        HomeEpisode {
+            container,
+            image,
+            episode: ep.container,
+        }
+    }
+}
+
+impl HomeEpisode {
+    fn new(episode: &EpisodeWidgetQuery, sender: &Sender<Action>) -> HomeEpisode {
+        let builder =
+            gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/episodes_view_widget.ui");
+        let container: gtk::Box = builder.get_object("container").unwrap();
+        let image: gtk::Image = builder.get_object("cover").unwrap();
+        let pid = episode.podcast_id();
+        let ep = EpisodeWidget::new(episode, sender);
+
+        let view = HomeEpisode {
+            container,
+            image,
+            episode: ep.container.clone(),
+        };
+
+        view.init(pid);
+        view
+    }
+
+    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, podcast_id: i32) -> Result<(), Error> {
+        utils::set_image_from_path(&self.image, podcast_id, 64)
+    }
+}

hammond-gtk/src/widgets/mod.rs

@@ -0,0 +1,15 @@
+mod aboutdialog;
+pub mod appnotif;
+mod empty;
+mod episode;
+mod home_view;
+mod show;
+mod shows_view;
+
+pub use self::aboutdialog::about_dialog;
+pub use self::empty::EmptyView;
+pub use self::episode::EpisodeWidget;
+pub use self::home_view::HomeView;
+pub use self::show::ShowWidget;
+pub use self::show::{mark_all_notif, remove_show_notif};
+pub use self::shows_view::ShowsView;

hammond-gtk/src/widgets/show.rs

@@ -0,0 +1,347 @@
+use glib;
+use gtk;
+use gtk::prelude::*;
+
+use crossbeam_channel::{SendError, Sender};
+use failure::Error;
+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::Podcast;
+
+use app::Action;
+use utils::{self, lazy_load};
+use widgets::appnotif::{InAppNotification, UndoState};
+use widgets::EpisodeWidget;
+
+use std::rc::Rc;
+use std::sync::{Arc, Mutex};
+
+lazy_static! {
+    static ref SHOW_WIDGET_VALIGNMENT: Mutex<Option<(i32, SendCell<gtk::Adjustment>)>> =
+        Mutex::new(None);
+}
+
+#[derive(Debug, Clone)]
+pub struct ShowWidget {
+    pub container: gtk::Box,
+    scrolled_window: gtk::ScrolledWindow,
+    cover: gtk::Image,
+    description: gtk::Label,
+    link: gtk::Button,
+    settings: gtk::MenuButton,
+    unsub: gtk::Button,
+    episodes: gtk::ListBox,
+    podcast_id: Option<i32>,
+}
+
+impl Default for ShowWidget {
+    fn default() -> Self {
+        let builder = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/show_widget.ui");
+        let container: gtk::Box = builder.get_object("container").unwrap();
+        let scrolled_window: gtk::ScrolledWindow = builder.get_object("scrolled_window").unwrap();
+        let episodes = builder.get_object("episodes").unwrap();
+
+        let cover: gtk::Image = builder.get_object("cover").unwrap();
+        let description: gtk::Label = builder.get_object("description").unwrap();
+        let unsub: gtk::Button = builder.get_object("unsub_button").unwrap();
+        let link: gtk::Button = builder.get_object("link_button").unwrap();
+        let settings: gtk::MenuButton = builder.get_object("settings_button").unwrap();
+
+        ShowWidget {
+            container,
+            scrolled_window,
+            cover,
+            description,
+            unsub,
+            link,
+            settings,
+            episodes,
+            podcast_id: None,
+        }
+    }
+}
+
+impl 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);
+        populate_listbox(&pdw, pd, sender)
+            .map_err(|err| error!("Failed to populate the listbox: {}", err))
+            .ok();
+
+        pdw
+    }
+
+    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
+            .connect_clicked(clone!(pd, sender => move |bttn| {
+                on_unsub_button_clicked(pd.clone(), bttn, &sender);
+        }));
+
+        self.set_description(pd.description());
+        self.podcast_id = Some(pd.id());
+
+        self.set_cover(&pd)
+            .map_err(|err| error!("Failed to set a cover: {}", err))
+            .ok();
+
+        let link = pd.link().to_owned();
+        self.link.set_tooltip_text(Some(link.as_str()));
+        self.link.connect_clicked(move |_| {
+            info!("Opening link: {}", &link);
+            open::that(&link)
+                .map_err(|err| error!("Error: {}", err))
+                .map_err(|_| error!("Failed open link: {}", &link))
+                .ok();
+        });
+
+        let show_menu: gtk::Popover = builder.get_object("show_menu").unwrap();
+        let mark_all: gtk::ModelButton = builder.get_object("mark_all_watched").unwrap();
+
+        let episodes = self.episodes.clone();
+        mark_all.connect_clicked(clone!(pd, sender => move |_| {
+            on_played_button_clicked(
+                pd.clone(),
+                &episodes,
+                &sender
+            )
+        }));
+        self.settings.set_popover(&show_menu);
+    }
+
+    /// Set the show cover.
+    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(&markup_from_raw(text));
+    }
+
+    /// Save the scrollabar vajustment to the cache.
+    pub fn save_vadjustment(&self, oldid: i32) -> Result<(), Error> {
+        if let Ok(mut guard) = SHOW_WIDGET_VALIGNMENT.lock() {
+            let adj = self
+                .scrolled_window
+                .get_vadjustment()
+                .ok_or_else(|| format_err!("Could not get the adjustment"))?;
+            *guard = Some((oldid, SendCell::new(adj)));
+            debug!("Widget Alignment was saved with ID: {}.", oldid);
+        }
+
+        Ok(())
+    }
+
+    /// Set scrolled window vertical adjustment.
+    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))?;
+
+        if let Some((oldid, ref sendcell)) = *guard {
+            // Only copy the old scrollbar if both widget's represent the same podcast.
+            debug!("PID: {}", pd.id());
+            debug!("OLDID: {}", oldid);
+            if pd.id() != oldid {
+                debug!("Early return");
+                return Ok(());
+            };
+
+            // Copy the vertical scrollbar adjustment from the old view into the new one.
+            sendcell
+                .try_get()
+                .map(|x| utils::smooth_scroll_to(&self.scrolled_window, &x));
+        }
+
+        Ok(())
+    }
+
+    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<Podcast>,
+    sender: Sender<Action>,
+) -> Result<(), Error> {
+    use crossbeam_channel::bounded;
+    use crossbeam_channel::TryRecvError::*;
+
+    let count = dbqueries::get_pd_episodes_count(&pd)?;
+
+    let (sender_, receiver) = bounded(1);
+    rayon::spawn(clone!(pd => move || {
+        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).ok();
+    }));
+
+    if count == 0 {
+        let builder = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/empty_show.ui");
+        let container: gtk::Box = builder.get_object("empty_show").unwrap();
+        show.episodes.add(&container);
+        return Ok(());
+    }
+
+    let show_ = show.clone();
+    gtk::idle_add(move || {
+        let episodes = match receiver.try_recv() {
+            Ok(e) => e,
+            Err(Empty) => return glib::Continue(true),
+            Err(Disconnected) => return glib::Continue(false),
+        };
+
+        let list = show_.episodes.clone();
+
+        let constructor = clone!(sender => move |ep| {
+            EpisodeWidget::new(&ep, &sender).container.clone()
+        });
+
+        let callback = clone!(pd, show_ => move || {
+            show_.set_vadjustment(&pd)
+                .map_err(|err| error!("Failed to set ShowWidget Alignment: {}", err))
+                .ok();
+        });
+
+        lazy_load(episodes, list.clone(), constructor, callback);
+
+        glib::Continue(false)
+    });
+
+    Ok(())
+}
+
+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);
+
+    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)?;
+        Ok(())
+    };
+
+    wrap().map_err(|err| error!("Action Sender: {}", err)).ok();
+    unsub_button.set_sensitive(true);
+}
+
+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))
+        .map_err(|err| error!("Action Sender: {}", err))
+        .ok();
+}
+
+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).map_err(From::from)
+}
+
+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)
+            .map_err(|err| error!("Notif Callback Error: {}", err))
+            .ok();
+        glib::Continue(false)
+    });
+
+    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<Podcast>, sender: Sender<Action>) -> InAppNotification {
+    let text = format!("Unsubscribed from {}", pd.title());
+
+    utils::ignore_show(pd.id())
+        .map_err(|err| error!("Error: {}", err))
+        .map_err(|_| error!("Could not insert {} to the ignore list.", pd.title()))
+        .ok();
+
+    let callback = clone!(pd, sender => move || {
+        utils::uningore_show(pd.id())
+            .map_err(|err| error!("Error: {}", err))
+            .map_err(|_| error!("Could not remove {} from the ignore list.", pd.title()))
+            .ok();
+
+        // Spawn a thread so it won't block the ui.
+        rayon::spawn(clone!(pd, sender => move || {
+            delete_show(&pd)
+                .map_err(|err| error!("Error: {}", err))
+                .map_err(|_| error!("Failed to delete {}", pd.title()))
+                .ok();
+
+            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 || {
+        undo_wrap().map_err(|err| error!("{}", err)).ok();
+    };
+
+    InAppNotification::new(&text, callback, undo_callback, UndoState::Shown)
+}
+
+// Ideally if we had a custom widget this would have been as simple as:
+// `for row in listbox { ep = row.get_episode(); ep.dim_title(); }`
+// But now I can't think of a better way to do it than hardcoding the title
+// position relative to the EpisodeWidget container gtk::Box.
+fn dim_titles(episodes: &gtk::ListBox) -> Option<()> {
+    let children = episodes.get_children();
+
+    for row in children {
+        let row = row.downcast::<gtk::ListBoxRow>().ok()?;
+        let container = row.get_children().remove(0).downcast::<gtk::Box>().ok()?;
+        let foo = container
+            .get_children()
+            .remove(0)
+            .downcast::<gtk::Box>()
+            .ok()?;
+        let bar = foo.get_children().remove(0).downcast::<gtk::Box>().ok()?;
+        let title = bar.get_children().remove(0).downcast::<gtk::Label>().ok()?;
+
+        title.get_style_context().map(|c| c.add_class("dim-label"));
+    }
+    Some(())
+}

hammond-gtk/src/widgets/shows_view.rs

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

hammond.doap

@@ -5,22 +5,25 @@
          xmlns:gnome="http://api.gnome.org/doap-extensions#"
          xmlns="http://usefulinc.com/ns/doap#">
 
-  <name xml:lang="en">Podcasts</name>
+  <name xml:lang="en">Hammond</name>
   <shortdesc xml:lang="en">
-    Podcast app for GNOME
+    Modern Podcast Client for the GNOME desktop
   </shortdesc>
   <description xml:lang="en">
-      Listen to your favorite podcasts, right from your desktop.
+    <p>
+      Hammond is a modern, reliable, and fast Podcast Client for the GNOME
+      desktop written in Rust.
+    </p>
   </description>
-  <!-- <homepage rdf:resource="https://wiki.gnome.org/Apps/Podcasts" /> -->
-  <bug-database rdf:resource="https://gitlab.gnome.org/World/podcasts/issues" />
+  <!-- <homepage rdf:resource="https://wiki.gnome.org/Apps/Hammond" /> -->
+  <bug-database rdf:resource="https://gitlab.gnome.org/World/hammond/issues" />
 
   <category rdf:resource="http://api.gnome.org/doap-extensions#apps" />
   <programming-language>Rust</programming-language>
 
   <maintainer>
     <foaf:Person>
-      <foaf:name>Jordan Petridis</foaf:name>
+      <foaf:name>Jordan petridis</foaf:name>
       <foaf:mbox rdf:resource="mailto:jpetridis@gnome.org" />
       <gnome:userid>jpetridis</gnome:userid>
     </foaf:Person>

meson.build

@@ -1,90 +1,38 @@
+# Adatped from:
+# https://gitlab.gnome.org/danigm/fractal/blob/6e2911f9d2353c99a18a6c19fab7f903c4bbb431/meson.build
+
 project(
-  'gnome-podcasts', 'rust',
-  version: '0.4.7',
+  'hammond', 'rust',
+  version: '0.3.4',
   license: 'GPLv3',
 )
 
-dependency('sqlite3', version: '>= 3.20')
-dependency('openssl', version: '>= 1.0')
-dependency('dbus-1')
+hammond_version = meson.project_version()
+version_array = hammond_version.split('.')
+hammond_major_version = version_array[0].to_int()
+hammond_minor_version = version_array[1].to_int()
+hammond_version_micro = version_array[2].to_int()
 
-dependency('glib-2.0', version: '>= 2.56')
-dependency('gio-2.0', version: '>= 2.56')
-dependency('gdk-pixbuf-2.0')
-dependency('gtk+-3.0', version: '>= 3.24.11')
-dependency('libhandy-0.0', version: '>= 0.0.13')
-
-dependency('gstreamer-1.0', version: '>= 1.16')
-dependency('gstreamer-base-1.0', version: '>= 1.16')
-dependency('gstreamer-audio-1.0', version: '>= 1.16')
-dependency('gstreamer-video-1.0', version: '>= 1.16')
-dependency('gstreamer-player-1.0', version: '>= 1.16')
-dependency('gstreamer-plugins-base-1.0', version: '>= 1.16')
-dependency('gstreamer-plugins-bad-1.0', version: '>= 1.16')
-dependency('gstreamer-bad-audio-1.0', version: '>= 1.16')
-
-cargo = find_program('cargo', required: true)
-gresource = find_program('glib-compile-resources', required: true)
-gschemas = find_program('glib-compile-schemas', required: true)
-
-if get_option('profile') == 'development'
-  profile = '.Devel'
-  vcs_tag = run_command('git', 'rev-parse', '--short', 'HEAD').stdout().strip()
-  if vcs_tag == ''
-    version_suffix = '-devel'
-  else
-    version_suffix = '-@0@'.format (vcs_tag)
-  endif
-else
-  profile = ''
-  version_suffix = ''
-endif
-
-podcast_toml = files(
-  'Cargo.toml',
-  'Cargo.lock',
-  'podcasts-data/Cargo.toml',
-  'podcasts-downloader/Cargo.toml',
-  'podcasts-gtk/Cargo.toml',
-)
-
-application_id = 'org.gnome.Podcasts@0@'.format(profile)
-i18n = import('i18n')
-gnome = import('gnome')
-
-subdir('podcasts-gtk/po')
-podir = join_paths (meson.source_root (), 'podcasts-gtk', 'po')
-
-podcasts_version = meson.project_version()
-
-podcasts_prefix = get_option('prefix')
-podcasts_bindir = join_paths(podcasts_prefix, get_option('bindir'))
-podcasts_localedir = join_paths(podcasts_prefix, get_option('localedir'))
-
-podcasts_conf = configuration_data()
-podcasts_conf.set('appid', application_id)
-podcasts_conf.set('bindir', podcasts_bindir)
+hammond_prefix = get_option('prefix')
+hammond_bindir = join_paths(hammond_prefix, get_option('bindir'))
 
 datadir = get_option('datadir')
-subdir('podcasts-gtk/resources')
+icondir = join_paths(datadir, 'icons')
+subdir('hammond-gtk/resources')
 
+cargo = find_program('cargo', required: false)
+gresource = find_program('glib-compile-resources', required: false)
+cargo_vendor = find_program('cargo-vendor', required: false)
 cargo_script = find_program('scripts/cargo.sh')
-test_script = find_program('scripts/test.sh')
 
-subdir('podcasts-data/src')
-subdir('podcasts-downloader/src')
-subdir('podcasts-gtk/src')
+cargo_release = custom_target('cargo-build',
+                        build_by_default: true,
+                        build_always: true,
+                        output: ['hammond'],
+                        install: true,
+                        install_dir: hammond_bindir,
+                        command: [cargo_script, '@CURRENT_SOURCE_DIR@', '@OUTPUT@'])
 
-meson.add_dist_script(
-  'scripts/dist-vendor.sh',
-  meson.source_root(),
-  join_paths(meson.build_root(), 'meson-dist', meson.project_name() + '-' + podcasts_version)
-)
-
-test(
-  'cargo-test',
-  test_script,
-  args: meson.build_root(),
-  workdir: meson.source_root(),
-  timeout: 3000
-)
+run_target('release', command: ['scripts/release.sh',
+                                meson.project_name() + '-' + hammond_version
+                               ])

meson_options.txt

@@ -1,9 +0,0 @@
-option (
-  'profile',
-  type: 'combo',
-  choices: [
-    'default',
-    'development'
-  ],
-  value: 'default'
-)

org.gnome.Hammond.json

@@ -0,0 +1,49 @@
+{
+    "app-id" : "org.gnome.Hammond",
+    "runtime" : "org.gnome.Platform",
+    "runtime-version" : "3.28",
+    "sdk" : "org.gnome.Sdk",
+    "sdk-extensions" : [
+        "org.freedesktop.Sdk.Extension.rust-stable"
+    ],
+    "command" : "hammond",
+    "tags" : [
+        "nightly"
+    ],
+    "desktop-file-name-prefix" : "(Nightly) ",
+    "finish-args" : [
+        "--filesystem=xdg-run/dconf",
+        "--filesystem=~/.config/dconf:ro",
+        "--talk-name=ca.desrt.dconf",
+        "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
+        "--share=network",
+        "--share=ipc",
+        "--socket=x11",
+        "--socket=wayland",
+        "--talk-name=org.freedesktop.Desktop"
+    ],
+    "build-options" : {
+        "append-path" : "/usr/lib/sdk/rust-stable/bin",
+        "build-args" : [
+            "--share=network"
+        ],
+        "env" : {
+            "CARGO_HOME" : "/run/build/Hammond/cargo",
+            "RUST_BACKTRACE" : "1",
+            "DEBUG" : "true"
+        }
+    },
+    "modules" : [
+        {
+            "name" : "hammond",
+            "buildsystem" : "meson",
+            "sources" : [
+                {
+                    "type" : "git",
+                    "url" : "https://gitlab.gnome.org/World/hammond.git",
+                    "branch" : "master"
+                }
+            ]
+        }
+    ]
+}

org.gnome.Podcasts.Devel.json

@@ -1,72 +0,0 @@
-{
-    "app-id" : "org.gnome.Podcasts.Devel",
-    "runtime" : "org.gnome.Platform",
-    "runtime-version" : "3.36",
-    "sdk" : "org.gnome.Sdk",
-    "sdk-extensions" : [
-        "org.freedesktop.Sdk.Extension.rust-stable"
-    ],
-    "command" : "gnome-podcasts",
-    "tags" : [
-        "nightly"
-    ],
-    "finish-args" : [
-        "--share=network",
-        "--share=ipc",
-        "--socket=x11",
-        "--socket=fallback-x11",
-        "--socket=wayland",
-        "--socket=pulseaudio",
-        "--env=USE_PLAYBING3=1"
-    ],
-    "build-options" : {
-        "append-path" : "/usr/lib/sdk/rust-stable/bin",
-        "build-args" : [
-            "--share=network"
-        ],
-        "env" : {
-            "CARGO_HOME" : "/run/build/Podcasts/cargo",
-            "RUSTFLAGS" : "",
-            "RUST_BACKTRACE" : "1"
-        }
-    },
-    "modules" : [
-        {
-            "name" : "libhandy",
-            "buildsystem" : "meson",
-            "config-opts" : [
-                "-Dintrospection=disabled",
-                "-Dgtk_doc=false",
-                "-Dtests=false",
-                "-Dexamples=false",
-                "-Dvapi=false",
-                "-Dglade_catalog=disabled"
-            ],
-            "cleanup" : [
-                "/include",
-                "/lib/pkgconfig"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://source.puri.sm/Librem5/libhandy.git",
-                    "tag" : "v0.0.13"
-                }
-            ]
-        },
-        {
-            "name" : "gnome-podcasts",
-            "buildsystem" : "meson",
-            "builddir" : "true",
-            "config-opts" : [
-                "-Dprofile=development"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/World/podcasts.git"
-                }
-            ]
-        }
-    ]
-}

org.gnome.Podcasts.json

@@ -1,69 +0,0 @@
-{
-    "app-id" : "org.gnome.Podcasts",
-    "runtime" : "org.gnome.Platform",
-    "runtime-version" : "3.36",
-    "sdk" : "org.gnome.Sdk",
-    "sdk-extensions" : [
-        "org.freedesktop.Sdk.Extension.rust-stable"
-    ],
-    "command" : "gnome-podcasts",
-    "tags" : [
-        "nightly"
-    ],
-    "desktop-file-name-suffix" : " ☢️",
-    "finish-args" : [
-        "--share=network",
-        "--share=ipc",
-        "--socket=x11",
-        "--socket=fallback-x11",
-        "--socket=wayland",
-        "--socket=pulseaudio",
-        "--env=USE_PLAYBING3=1"
-    ],
-    "build-options" : {
-        "append-path" : "/usr/lib/sdk/rust-stable/bin",
-        "build-args" : [
-            "--share=network"
-        ],
-        "env" : {
-            "CARGO_HOME" : "/run/build/Podcasts/cargo",
-            "RUST_BACKTRACE" : "1"
-        }
-    },
-    "modules" : [
-        {
-            "name" : "libhandy",
-            "buildsystem" : "meson",
-            "config-opts" : [
-                "-Dintrospection=disabled",
-                "-Dgtk_doc=false",
-                "-Dtests=false",
-                "-Dexamples=false",
-                "-Dvapi=false",
-                "-Dglade_catalog=disabled"
-            ],
-            "cleanup" : [
-                "/include",
-                "/lib/pkgconfig"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://source.puri.sm/Librem5/libhandy.git",
-                    "tag" : "v0.0.13"
-                }
-            ]
-        },
-        {
-            "name" : "gnome-podcasts",
-            "builddir" : "true",
-            "buildsystem" : "meson",
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/World/podcasts.git"
-                }
-            ]
-        }
-    ]
-}

podcasts-data/Cargo.toml

@@ -1,42 +0,0 @@
-[package]
-authors = ["Jordan Petridis <jpetridis@gnome.org>"]
-name = "podcasts-data"
-version = "0.1.0"
-edition = "2018"
-
-[dependencies]
-ammonia = "3.1.0"
-chrono = "0.4.11"
-derive_builder = "0.9.0"
-lazy_static = "1.4.0"
-log = "0.4.8"
-rayon = "1.3.1"
-rfc822_sanitizer = "0.3.3"
-rss = "1.9.0"
-url = "2.1.1"
-xdg = "2.2.0"
-xml-rs = "0.8.3"
-futures = "0.1.29"
-hyper = "0.12.35"
-http = "0.1.19"
-tokio = "0.1.22"
-hyper-tls = "0.3.2"
-native-tls = "0.2.3"
-num_cpus = "1.13.0"
-failure = "0.1.8"
-failure_derive = "0.1.8"
-base64 = "0.12.2"
-
-[dependencies.diesel]
-features = ["sqlite", "r2d2"]
-version = "1.4.5"
-
-[dependencies.diesel_migrations]
-features = ["sqlite"]
-version = "1.4.0"
-
-[dev-dependencies]
-rand = "0.7.2"
-tempdir = "0.3.7"
-pretty_assertions = "0.6.1"
-maplit = "1.0.2"