toxblh/podcasts
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: toxblh/podcasts:0.4.2
Branches Tags
toxblh/podcasts:master toxblh/podcasts:alatiera/new_stack_2 toxblh/podcasts:zbrown/player-changes toxblh/podcasts:alatiera/finally-a-release toxblh/podcasts:about-episode-widget toxblh/podcasts:benchmark
toxblh/podcasts:0.4.7 toxblh/podcasts:0.4.6 toxblh/podcasts:0.4.5 toxblh/podcasts:0.4.4 toxblh/podcasts:0.4.3 toxblh/podcasts:0.4.2 toxblh/podcasts:0.4.1 toxblh/podcasts:0.4.0 toxblh/podcasts:0.3.4 toxblh/podcasts:0.3.3 toxblh/podcasts:0.3.2 toxblh/podcasts:0.3.1 toxblh/podcasts:0.3 toxblh/podcasts:0.2.0 toxblh/podcasts:0.1.1 toxblh/podcasts:0.1.0
..
compare: toxblh/podcasts:about-episode-widget
Branches Tags
toxblh/podcasts:master toxblh/podcasts:alatiera/new_stack_2 toxblh/podcasts:zbrown/player-changes toxblh/podcasts:alatiera/finally-a-release toxblh/podcasts:about-episode-widget toxblh/podcasts:benchmark
toxblh/podcasts:0.4.7 toxblh/podcasts:0.4.6 toxblh/podcasts:0.4.5 toxblh/podcasts:0.4.4 toxblh/podcasts:0.4.3 toxblh/podcasts:0.4.2 toxblh/podcasts:0.4.1 toxblh/podcasts:0.4.0 toxblh/podcasts:0.3.4 toxblh/podcasts:0.3.3 toxblh/podcasts:0.3.2 toxblh/podcasts:0.3.1 toxblh/podcasts:0.3 toxblh/podcasts:0.2.0 toxblh/podcasts:0.1.1 toxblh/podcasts:0.1.0
1 Commits
0.4.2 .. about-episode-widget
Author SHA1 Message Date
Jordan Petridis cd52c5afdf AboutEpisode: Initial commit. 2018-06-06 14:13:27 +03:00
129 changed files with 2739 additions and 5752 deletions
Expand all files Collapse all files
.gitignore
+3 -4
View File
@@ -1,10 +1,9 @@
target/ target/
**/*.rs.bk **/*.rs.bk
Cargo.lock
.vscode .vscode
*.ui~ *.ui~
resources.gresource resources.gresource
_build/ _build
build/
vendor/ vendor/
.criterion/ .criterion
org.gnome.*.json~
.gitlab-ci.yml
+18 -18
View File
@@ -4,7 +4,7 @@ stages:
- review - review
variables: variables:
BUNDLE: "gnome-podcasts-dev.flatpak" BUNDLE: "hammond-dev.flatpak"
.cargo_cache_template: &cargo_cache .cargo_cache_template: &cargo_cache
cache: cache:
@@ -25,7 +25,7 @@ variables:
before_script: before_script:
- apt-get update -yqq - apt-get update -yqq
- apt-get install -yqq --no-install-recommends build-essential libgtk-3-dev meson libgstreamer1.0-dev - apt-get install -yqq --no-install-recommends build-essential libgtk-3-dev meson
- mkdir -p .cargo_cache - mkdir -p .cargo_cache
# Only stuff inside the repo directory can be cached # Only stuff inside the repo directory can be cached
@@ -34,19 +34,19 @@ variables:
script: script:
- rustc -Vv && cargo -Vv - rustc -Vv && cargo -Vv
# Force regeneration of gresources regardless of artifacts chage # Force regeneration of gresources regardless of artifacts chage
- cd podcasts-gtk/resources/ && glib-compile-resources --generate resources.xml && cd ../../ - cd hammond-gtk/resources/ && glib-compile-resources --generate resources.xml && cd ../../
- cargo build - cargo build
- cargo test -- --test-threads=1 - cargo test -- --test-threads=1
- cargo test -- --test-threads=1 --ignored - cargo test -- --test-threads=1 --ignored
<<: *cargo_cache <<: *cargo_cache
.rust:stable: rust:stable:
# https://hub.docker.com/_/rust/ # https://hub.docker.com/_/rust/
image: "rust" image: "rust"
<<: *cargo_test <<: *cargo_test
.rust:nightly: rust:nightly:
# https://hub.docker.com/r/rustlang/rust/ # https://hub.docker.com/r/rustlang/rust/
image: "rustlang/rust:nightly" image: "rustlang/rust:nightly"
<<: *cargo_test <<: *cargo_test
@@ -58,22 +58,22 @@ flatpak:
image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/rust_bundle:3.28 image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/rust_bundle:3.28
stage: test stage: test
script: script:
- flatpak-builder --stop-at=gnome-podcasts app org.gnome.Podcasts.json - flatpak-builder --stop-at=hammond app org.gnome.Hammond.json
# https://gitlab.gnome.org/World/podcasts/issues/55 # https://gitlab.gnome.org/World/hammond/issues/55
# Force regeneration of gresources regardless of artifacts chage # Force regeneration of gresources regardless of artifacts chage
- flatpak-builder --run app org.gnome.Podcasts.json glib-compile-resources --sourcedir=podcasts-gtk/resources/ podcasts-gtk/resources/resources.xml - flatpak-builder --run app org.gnome.Hammond.json glib-compile-resources --sourcedir=hammond-gtk/resources/ hammond-gtk/resources/resources.xml
# Build the flatpak repo # Build the flatpak repo
- flatpak-builder --run app org.gnome.Podcasts.json meson --prefix=/app --libdir=/app/lib _build - flatpak-builder --run app org.gnome.Hammond.json meson --prefix=/app --libdir=/app/lib _build
- flatpak-builder --run app org.gnome.Podcasts.json ninja -C _build install - flatpak-builder --run app org.gnome.Hammond.json ninja -C _build install
- flatpak-builder --finish-only app org.gnome.Podcasts.json - flatpak-builder --finish-only app org.gnome.Hammond.json
- flatpak build-export repo app - flatpak build-export repo app
# Create a flatpak bundle # Create a flatpak bundle
- flatpak build-bundle repo ${BUNDLE} org.gnome.Podcasts - flatpak build-bundle repo ${BUNDLE} org.gnome.Hammond
# Run the tests # Run the tests
# - flatpak-builder --run app org.gnome.Podcasts.json cargo test -- --test-threads=1 # - flatpak-builder --run app org.gnome.Hammond.json cargo test -- --test-threads=1
# - flatpak-builder --run app org.gnome.Podcasts.json cargo test -- --test-threads=1 --ignored # - flatpak-builder --run app org.gnome.Hammond.json cargo test -- --test-threads=1 --ignored
artifacts: artifacts:
paths: paths:
@@ -104,7 +104,7 @@ review:
url: https://gitlab.gnome.org/$CI_PROJECT_PATH/-/jobs/$CI_JOB_ID/artifacts/raw/${BUNDLE} url: https://gitlab.gnome.org/$CI_PROJECT_PATH/-/jobs/$CI_JOB_ID/artifacts/raw/${BUNDLE}
on_stop: stop_review on_stop: stop_review
except: except:
- master@World/podcasts - master@World/hammond
stop_review: stop_review:
stage: review stage: review
@@ -115,7 +115,7 @@ stop_review:
name: review/$CI_COMMIT_REF_NAME name: review/$CI_COMMIT_REF_NAME
action: stop action: stop
except: except:
- master@World/podcasts - master@World/hammond
# Configure and run rustfmt on nightly # Configure and run rustfmt on nightly
# Exits and builds fails if on bad format # Exits and builds fails if on bad format
@@ -129,7 +129,7 @@ rustfmt:
# Configure and run clippy on nightly # Configure and run clippy on nightly
# Only fails on errors atm. # Only fails on errors atm.
.clippy: clippy:
image: "registry.gitlab.gnome.org/alatiera/hammond-container-images/clippy:nightly" image: "registry.gitlab.gnome.org/alatiera/hammond-container-images/clippy:nightly"
stage: lint stage: lint
variables: variables:
@@ -139,6 +139,6 @@ rustfmt:
- rustc --version && cargo --version - rustc --version && cargo --version
- cargo clippy --version - cargo clippy --version
# Force regeneration of gresources regardless of artifacts chage # Force regeneration of gresources regardless of artifacts chage
- cd podcasts-gtk/resources/ && glib-compile-resources --generate resources.xml && cd ../../ - cd hammond-gtk/resources/ && glib-compile-resources --generate resources.xml && cd ../../
- cargo clippy --all - cargo clippy --all
<<: *cargo_cache <<: *cargo_cache
.gitlab/issue_templates/BrokenFeed.md
+1 -1
View File
@@ -18,7 +18,7 @@ Some common cases might be:
Steps to reproduce: Steps to reproduce:
1. Open GNOME Podcasts 1. Open Hammond
2. Do an action 2. Do an action
3. ... 3. ...
.gitlab/issue_templates/Bug.md
+6 -39
View File
@@ -1,42 +1,9 @@
# Steps to reproduce Detailed description of the issue. Put as much information as you can, potentially
<!-- with images showing the issue.
Explain in detail the steps on how the issue can be reproduced.
-->
1.
2.
3.
Reproducible in: Steps to reproduce:
<!--
Please test if the issue was already fixed in the unstable version of the app.
For that, follow these steps:
1. Make sure Flatpak is installed or install it following these steps https://flatpak.org/setup
2. Install the unstable version of the app following this link
https://gitlab.gnome.org/GNOME/gnome-apps-nightly/raw/master/nautilus.flatpakref and save
it as a ".flatpakref" file
If these steps failed, write in 'Other' the distribution you’re using and 1. Open Hammond
the version of the app. 2. Do an action
--> 3. ...
- Flatpak unstable: (yes or no) <!-- Write "yes" or "no" after the semicolon. -->
- Other:
# 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
+2 -1
View File
@@ -1,4 +1,4 @@
# Current problems Current problems
<!-- <!--
What are the problems that the current project has? What are the problems that the current project has?
@@ -39,3 +39,4 @@ projects, pictures, links to other code, etc.
tasks of minimum change, so they can be delivered across several releases. --> tasks of minimum change, so they can be delivered across several releases. -->
/label ~"Epic" /label ~"Epic"
.gitlab/issue_templates/Feature.md
+10 -17
View File
@@ -1,24 +1,17 @@
### Use cases Detailed description of the feature. Put as much information as you can.
<!--
Describe what problem(s) the user is experiencing and that this request
is trying to solve.
-->
Proposed Mockups:
### Desired behavior (Add mockups of the proposed feature)
<!-- Describe the desired functionality. -->
## Design Tasks
### Benefits of the solution * [ ] design tasks
<!-- List the possible benefits of the solution and how it fits in the project. -->
## Development Tasks
### Possible drawbacks * [ ] development tasks
<!--
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.
-->
<!-- Ignore the text under this line. --> ## QA Tasks
/label ~"Feature"
* [ ] qa (quality assurance) tasks
CHANGELOG.md
+18 -65
View File
@@ -6,64 +6,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
## [Unreleased] ## [Unreleased]
### Added: ### Added:
- Keyboard Shortcuts and a Shortcuts dialog were implemented. (ZanderBrown) [!33](https://gitlab.gnome.org/World/hammond/merge_requests/33)
### Changed: ### Changed:
- The `FileChooser` of the OPML import was changed to use the `FileChooserNative` widget/API. (ZanderBrown) [!33](https://gitlab.gnome.org/World/hammond/merge_requests/33)
### Fixed: - The `EpisdeWidget` was refactored. [!38](https://gitlab.gnome.org/World/hammond/merge_requests/38)
### Removed:
## [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)
- `EpisdeWidget`'s progressbar was changed to be non-blocking and should feel way more responsive now. 9b0ac5b83dadecdff51cd398293afdf0d5276012 - `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:
- 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 ## [0.3.4] - 2018-05-20
### Fixed: ### Fixed:
@@ -89,9 +42,9 @@ not being able to access any file.
### Changed: ### Changed:
- Downlaoding and loading images now is done asynchronously and is not blocking programs execution. - 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. - 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. - `Rayon` Threadpools are now used instead of unlimited one-off threads.
- `EpisdeWidget`s are now loaded asynchronously accross views. - `EpisdeWidget`s are now loaded asynchronously accross views.
- `EpisodeWidget`s no longer trigger a `View` refresh for trivial stuff 03bd95184808ccab3e0ea0e3713a52ee6b7c9ab4 - `EpisodeWidget`s no longer trigger a `View` refresh for trivial stuff 03bd95184808ccab3e0ea0e3713a52ee6b7c9ab4
@@ -99,7 +52,7 @@ not being able to access any file.
- `ShowWidget` Description is inside a scrolled window now - `ShowWidget` Description is inside a scrolled window now
### Fixed: ### 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 - Implemented a tail-recursion loop to follow-up when a feed redirects to another url. c6a24e839a8ba77d09673f299cfc1e64ba7078f3
### Removed: ### Removed:
@@ -108,27 +61,27 @@ not being able to access any file.
## [0.3.1] - 2018-03-28 ## [0.3.1] - 2018-03-28
### Added: ### Added:
- Ability to mark all episodes of a Show as watched. - 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. - 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) - 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) - 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. - 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: ### Changed:
- EpisdeWidget has been reimplemented as a compile time state machine. - 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. - 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) - 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: ### Fixed:
- Double border aroun the main window was fixed. (Rowan Lewis) - 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 ## [0.3.0] - 2018-02-11
- Tobias Bernard Redesigned the whole Gtk+ client. - Tobias Bernard Redesigned the whole Gtk+ client.
CONTRIBUTING.md
+8 -8
View File
@@ -1,18 +1,18 @@
## Contributing to GNOME Podcasts ## Contributing to Hammond
Thank you for looking in this file! 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, 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) 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](https://wiki.gnome.org/Foundation/CodeOfConduc), 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 ## Source repository
GNOME Podcasts's main source repository is at gitlab.gnome.org. You can view Hammond's main source repository is at gitlab.gnome.org. You can view
the web interface [here](https://gitlab.gnome.org/World/podcasts) the web interface [here](https://gitlab.gnome.org/World/hammond)
Development happens in the master branch. Development happens in the master branch.
@@ -50,8 +50,8 @@ In order to run the test suite use the following: `cargo test -- --test-threads=
# Issues, issues and more issues! # Issues, issues and more issues!
There are many ways you can contribute to GNOME Podcasts, and all of them involve creating issues There are many ways you can contribute to Hammond, 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. 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 To create an effective and high quality ticket, try to put the following information on your
ticket: ticket:
@@ -74,7 +74,7 @@ If it's an issue, add the steps to reproduce like this:
Steps to reproduce: Steps to reproduce:
1. Open GNOME Podcasts 1. Open Hammond
2. Do an Action 2. Do an Action
3. ... 3. ...
Cargo.lock
Generated
+539 -909
View File
File diff suppressed because it is too large Load Diff
Cargo.toml
+3 -3
View File
@@ -1,8 +1,8 @@
[workspace] [workspace]
members = [ members = [
"podcasts-data", "hammond-data",
"podcasts-downloader", "hammond-downloader",
"podcasts-gtk" "hammond-gtk"
] ]
[profile.release] [profile.release]
LICENSE
+2 -2
View File
@@ -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 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. the "copyright" line and a pointer to where the full notice is found.
GNOME Podcasts Hammond
Copyright (C) 2017 Jordan Petridis Copyright (C) 2017 Jordan Petridis
This program is free software: you can redistribute it and/or modify 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 If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode: 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 program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details. under certain conditions; type `show c' for details.
README.md
+29 -38
View File
@@ -1,26 +1,25 @@
# GNOME Podcasts # Hammond
### A Podcast application for GNOME. ### A Podcast Client for GNOME written in Rust.
Listen to your favorite podcasts, right from your desktop.
![episdes_view](./screenshots/home_view.png) ![episdes_view](./screenshots/episodes_view.png)
![shows_view](./screenshots/shows_view.png) ![shows_view](./screenshots/shows_view.png)
![show_widget](./screenshots/show_widget.png) ![show_widget](./screenshots/show_widget.png)
## Quick start ## Quick start
GNOME Podcasts can be built and run with [Gnome Builder](https://wiki.gnome.org/Apps/Builder) >= 3.28. Hammond can be built and run with [Gnome Builder](https://wiki.gnome.org/Apps/Builder) >= 3.28.
Get Builder [here](https://wiki.gnome.org/Apps/Builder/Downloads) Get Builder [here](https://wiki.gnome.org/Apps/Builder/Downloads)
## Broken Feeds ## Broken Feeds
Found a feed that does not work in GNOME Podcasts? Found a feed that does not work in Hammond?
Please [open an issue](https://gitlab.gnome.org/World/podcasts/issues/new) and choose the `BrokenFeed` template so we will know and fix it! 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 ## Getting in Touch
If you have any questions regarding the use or development of GNOME Podcasts, 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 want to discuss design or simply hang out, please join us in `#hammond` on
[irc.gnome.org.][irc] or [matrix][matrix]. [irc.gnome.org.][irc] or [matrix][matrix].
@@ -32,11 +31,11 @@ There isn't much documentation yet, so you will probably have question about par
### Flatpak ### Flatpak
Flatpak is the reccomended way of building and installing GNOME Podcasts. Flatpak is the reccomended way of building and installing Hammond.
#### Building a Flatpak #### Building a Flatpak
Download the `org.gnome.Podcasts.json` flatpak manifest from this repo. Download the `org.gnome.Hammond.json` flatpak manifest from this repo.
```bash ```bash
# Add flathub repo # Add flathub repo
@@ -47,21 +46,21 @@ flatpak --user remote-add gnome-nightly --if-not-exists https://sdk.gnome.org/gn
flatpak --user install gnome-nightly org.gnome.Sdk org.gnome.Platform flatpak --user install gnome-nightly org.gnome.Sdk org.gnome.Platform
# Install the required rust-stable extension from flathub # Install the required rust-stable extension from flathub
flatpak --user install flathub org.freedesktop.Sdk.Extension.rust-stable flatpak --user install flathub org.freedesktop.Sdk.Extension.rust-stable
flatpak-builder --user --repo=repo podcasts org.gnome.Podcasts.json --force-clean flatpak-builder --user --repo=repo hammond org.gnome.Hammond.json --force-clean
``` ```
To install the resulting flatpak you can do: To install the resulting flatpak you can do:
```bash ```bash
flatpak build-bundle repo gnome-podcasts.flatpak org.gnome.Podcasts flatpak build-bundle repo hammond.flatpak org.gnome.Hammond
flatpak install --user --bundle gnome-podcasts.flatpak flatpak install --user --bundle hammond.flatpak
``` ```
### Building from soure ### Building from soure
```sh ```sh
git clone https://gitlab.gnome.org/World/podcasts.git git clone https://gitlab.gnome.org/World/hammond.git
cd gnome-podcasts/ cd hammond/
meson --prefix=/usr build meson --prefix=/usr build
ninja -C build ninja -C build
sudo ninja -C build install sudo ninja -C build install
@@ -69,9 +68,8 @@ sudo ninja -C build install
#### Dependencies #### Dependencies
* Rust stable 1.27 or later along with cargo. * Rust stable 1.26 or later along with cargo.
* Gtk+ 3.22 or later * Gtk+ 3.22 or later
* Gstreamer 1.12 or later
* Meson * Meson
* A network connection * A network connection
@@ -80,23 +78,15 @@ Offline build are possible too, but [`cargo-vendor`][vendor] would have to be se
**Debian/Ubuntu** **Debian/Ubuntu**
```sh ```sh
apt-get install -yqq cargo rustc libsqlite3-dev libssl-dev libgtk-3-dev meson \ apt-get update -yqq
libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev \ apt-get install -yqq --no-install-recommends build-essential
gstreamer1.0-plugins-base gstreamer1.0-plugins-good \ apt-get install -yqq --no-install-recommends rustc cargo libgtk-3-dev meson
gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly \
gstreamer1.0-libav libgstrtspserver-1.0-dev ibgstreamer-plugins-bad1.0-dev
``` ```
**Fedora** **Fedora**
```sh ```sh
dnf install -y rust cargo gtk3-devel glib2-devel openssl-devel sqlite-devel meson \ dnf install -y rust cargo gtk3-devel glib2-devel openssl-devel sqlite-devel meson
gstreamer1-devel gstreamer1-plugins-base-tools gstreamer1-devel-docs \
gstreamer1-plugins-base-devel gstreamer1-plugins-base-devel-docs \
gstreamer1-plugins-good gstreamer1-plugins-good-extras \
gstreamer1-plugins-bad-free gstreamer1-plugins-bad-free-devel \
gstreamer1-plugins-bad-free-extras
``` ```
If you happen to build it on other distributions please let me know the names If you happen to build it on other distributions please let me know the names
@@ -108,11 +98,11 @@ There alot of thins yet to be done.
If you want to contribute, please check the [Contributions Guidelines][contribution-guidelines]. If you want to contribute, please check the [Contributions Guidelines][contribution-guidelines].
You can start by taking a look at [Issues](https://gitlab.gnome.org/World/podcasts/issues) or by opening a [New issue](https://gitlab.gnome.org/World/podcasts/issues/new?issue%5Bassignee_id%5D=&issue%5Bmilestone_id%5D=). 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. 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 [contribution-guidelines]: https://gitlab.gnome.org/World/hammond/blob/master/CONTRIBUTING.md
## Overview ## Overview
@@ -120,15 +110,15 @@ There are also some minor tasks tagged with `TODO:` and `FIXME:` in the source c
```sh ```sh
$ tree -d $ tree -d
├── screenshots # png's used in the README.md ├── 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. │   ├── migrations # Diesel SQL migrations.
│   │   └── ... │   │   └── ...
│   ├── src │   ├── src
│   └── tests │   └── tests
│   └── feeds # Raw RSS Feeds used for tests. │   └── feeds # Raw RSS Feeds used for tests.
├── podcasts-downloader # Really basic, Really crappy downloader. ├── hammond-downloader # Really basic, Really crappy downloader.
│   └── src │   └── src
├── podcasts-gtk # The Gtk+ Client ├── hammond-gtk # The Gtk+ Client
│   ├── resources # GResources folder │   ├── resources # GResources folder
│   │   └── gtk # Contains the glade.ui files. │   │   └── gtk # Contains the glade.ui files.
│   └── src │   └── src
@@ -138,12 +128,13 @@ $ tree -d
## A note about the project's name ## A note about the project's name
The project used to be called Hammond, after Allan Moore's character [Evey Hammond](https://en.wikipedia.org/wiki/Evey_Hammond) from the graphic novel V for Vendetta. 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 was renamed to GNOME Podcasts on 2018/07/24 shortly before its first public release.
It has nothing to do with the horrible headlines on the news.
## Acknowledgments ## Acknowledgments
GNOME Podcasts's design is heavily insired by [GNOME Music](https://wiki.gnome.org/Design/Apps/Music) and [Vocal](http://vocalproject.net/). 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](https://wiki.gnome.org/Design/Apps/Potential/News). We also copied some elements from [GNOME News](https://wiki.gnome.org/Design/Apps/Potential/News).
@@ -151,4 +142,4 @@ And almost the entirety of the build system is copied from the [Fractal](https:/
[vendor]: https://github.com/alexcrichton/cargo-vendor [vendor]: https://github.com/alexcrichton/cargo-vendor
[irc]: irc://irc.gnome.org/#hammond [irc]: irc://irc.gnome.org/#hammond
[matrix]: https://matrix.to/#/#gnome-podcasts:matrix.org [matrix]: https://matrix.to/#/#hammond:matrix.org
podcasts-data/Cargo.toml → hammond-data/Cargo.toml
+12 -12
View File
@@ -1,23 +1,23 @@
[package] [package]
authors = ["Jordan Petridis <jordanpetridis@protonmail.com>"] authors = ["Jordan Petridis <jordanpetridis@protonmail.com>"]
name = "podcasts-data" name = "hammond-data"
version = "0.1.0" version = "0.1.0"
workspace = "../" workspace = "../"
[dependencies] [dependencies]
ammonia = "1.2.0" ammonia = "1.1.0"
chrono = "0.4.4" chrono = "0.4.2"
derive_builder = "0.5.1" derive_builder = "0.5.1"
lazy_static = "1.0.2" lazy_static = "1.0.0"
log = "0.4.3" log = "0.4.1"
rayon = "1.0.2" rayon = "1.0.1"
rayon-futures = "0.1.0" rayon-futures = "0.1.0"
rfc822_sanitizer = "0.3.3" rfc822_sanitizer = "0.3.3"
rss = "1.5.0" rss = "1.5.0"
url = "1.7.1" url = "1.7.0"
xdg = "2.1.0" xdg = "2.1.0"
xml-rs = "0.8.0" xml-rs = "0.8.0"
futures = "0.1.23" futures = "0.1.21"
hyper = "0.11.27" hyper = "0.11.27"
tokio-core = "0.1.17" tokio-core = "0.1.17"
hyper-tls = "0.1.3" hyper-tls = "0.1.3"
@@ -28,16 +28,16 @@ failure_derive = "0.1.1"
[dependencies.diesel] [dependencies.diesel]
features = ["sqlite", "r2d2"] features = ["sqlite", "r2d2"]
version = "1.3.2" version = "= 1.2.2"
[dependencies.diesel_migrations] [dependencies.diesel_migrations]
features = ["sqlite"] features = ["sqlite"]
version = "1.3.0" version = "= 1.2.0"
[dev-dependencies] [dev-dependencies]
rand = "0.5.4" rand = "0.5.0"
tempdir = "0.3.7" tempdir = "0.3.7"
criterion = "0.2.4" criterion = "0.2.3"
pretty_assertions = "0.5.1" pretty_assertions = "0.5.1"
maplit = "1.0.1" maplit = "1.0.1"
podcasts-data/benches/bench.rs → hammond-data/benches/bench.rs
+6 -6
View File
@@ -5,9 +5,9 @@ extern crate criterion;
use criterion::Criterion; use criterion::Criterion;
// extern crate futures; // extern crate futures;
extern crate hammond_data;
extern crate hyper; extern crate hyper;
extern crate hyper_tls; extern crate hyper_tls;
extern crate podcasts_data;
extern crate rand; extern crate rand;
extern crate tokio_core; extern crate tokio_core;
// extern crate rayon; // extern crate rayon;
@@ -18,11 +18,11 @@ extern crate rss;
// use futures::future::*; // use futures::future::*;
use tokio_core::reactor::Core; use tokio_core::reactor::Core;
use podcasts_data::database::truncate_db; use hammond_data::database::truncate_db;
use podcasts_data::pipeline; use hammond_data::pipeline;
use podcasts_data::FeedBuilder; use hammond_data::FeedBuilder;
use podcasts_data::Source; use hammond_data::Source;
// use podcasts_data::errors::*; // use hammond_data::errors::*;
use std::io::BufReader; use std::io::BufReader;
podcasts-data/migrations/2017-09-15-001128_init_schema/down.sql → hammond-data/migrations/2017-09-15-001128_init_schema/down.sql
View File
podcasts-data/migrations/2017-09-15-001128_init_schema/up.sql → hammond-data/migrations/2017-09-15-001128_init_schema/up.sql
View File
podcasts-data/migrations/2017-12-09-125835_change_episode_pk/down.sql → hammond-data/migrations/2017-12-09-125835_change_episode_pk/down.sql
View File
podcasts-data/migrations/2017-12-09-125835_change_episode_pk/up.sql → hammond-data/migrations/2017-12-09-125835_change_episode_pk/up.sql
View File
podcasts-data/migrations/2017-12-22-145740_add_duration_column/down.sql → hammond-data/migrations/2017-12-22-145740_add_duration_column/down.sql
View File
podcasts-data/migrations/2017-12-22-145740_add_duration_column/up.sql → hammond-data/migrations/2017-12-22-145740_add_duration_column/up.sql
View File
podcasts-data/migrations/2017-12-30-201631_remove_published_date/down.sql → hammond-data/migrations/2017-12-30-201631_remove_published_date/down.sql
View File
podcasts-data/migrations/2017-12-30-201631_remove_published_date/up.sql → hammond-data/migrations/2017-12-30-201631_remove_published_date/up.sql
View File
podcasts-data/src/database.rs → hammond-data/src/database.rs
+5 -7
View File
@@ -24,9 +24,7 @@ lazy_static! {
#[cfg(not(test))] #[cfg(not(test))]
lazy_static! { lazy_static! {
static ref DB_PATH: PathBuf = xdg_dirs::PODCASTS_XDG static ref DB_PATH: PathBuf = xdg_dirs::HAMMOND_XDG.place_data_file("hammond.db").unwrap();
.place_data_file("podcasts.db")
.unwrap();
} }
#[cfg(test)] #[cfg(test)]
@@ -34,8 +32,8 @@ extern crate tempdir;
#[cfg(test)] #[cfg(test)]
lazy_static! { lazy_static! {
static ref TEMPDIR: tempdir::TempDir = { tempdir::TempDir::new("podcasts_unit_test").unwrap() }; static ref TEMPDIR: tempdir::TempDir = { tempdir::TempDir::new("hammond_unit_test").unwrap() };
static ref DB_PATH: PathBuf = TEMPDIR.path().join("podcasts.db"); static ref DB_PATH: PathBuf = TEMPDIR.path().join("hammond.db");
} }
/// Get an r2d2 `SqliteConnection`. /// Get an r2d2 `SqliteConnection`.
@@ -70,8 +68,8 @@ fn run_migration_on(connection: &SqliteConnection) -> Result<(), DataError> {
pub fn truncate_db() -> Result<(), DataError> { pub fn truncate_db() -> Result<(), DataError> {
let db = connection(); let db = connection();
let con = db.get()?; let con = db.get()?;
con.execute("DELETE FROM episodes")?; con.execute("DELETE FROM episode")?;
con.execute("DELETE FROM shows")?; con.execute("DELETE FROM podcast")?;
con.execute("DELETE FROM source")?; con.execute("DELETE FROM source")?;
Ok(()) Ok(())
} }
podcasts-data/src/dbqueries.rs → hammond-data/src/dbqueries.rs
+113 -90
View File
@@ -23,157 +23,169 @@ pub fn get_sources() -> Result<Vec<Source>, DataError> {
.map_err(From::from) .map_err(From::from)
} }
pub fn get_podcasts() -> Result<Vec<Show>, DataError> { pub fn get_podcasts() -> Result<Vec<Podcast>, DataError> {
use schema::shows::dsl::*; use schema::podcast::dsl::*;
let db = connection(); let db = connection();
let con = db.get()?; let con = db.get()?;
shows podcast
.order(title.asc()) .order(title.asc())
.load::<Show>(&con) .load::<Podcast>(&con)
.map_err(From::from) .map_err(From::from)
} }
pub fn get_podcasts_filter(filter_ids: &[i32]) -> Result<Vec<Show>, DataError> { pub fn get_podcasts_filter(filter_ids: &[i32]) -> Result<Vec<Podcast>, DataError> {
use schema::shows::dsl::*; use schema::podcast::dsl::*;
let db = connection(); let db = connection();
let con = db.get()?; let con = db.get()?;
shows podcast
.order(title.asc()) .order(title.asc())
.filter(id.ne_all(filter_ids)) .filter(id.ne_all(filter_ids))
.load::<Show>(&con) .load::<Podcast>(&con)
.map_err(From::from) .map_err(From::from)
} }
pub fn get_episodes() -> Result<Vec<Episode>, DataError> { pub fn get_episodes() -> Result<Vec<Episode>, DataError> {
use schema::episodes::dsl::*; use schema::episode::dsl::*;
let db = connection(); let db = connection();
let con = db.get()?; let con = db.get()?;
episodes episode
.order(epoch.desc()) .order(epoch.desc())
.load::<Episode>(&con) .load::<Episode>(&con)
.map_err(From::from) .map_err(From::from)
} }
pub(crate) fn get_downloaded_episodes() -> Result<Vec<EpisodeCleanerModel>, DataError> { pub(crate) fn get_downloaded_episodes() -> Result<Vec<EpisodeCleanerQuery>, DataError> {
use schema::episodes::dsl::*; use schema::episode::dsl::*;
let db = connection(); let db = connection();
let con = db.get()?; let con = db.get()?;
episodes episode
.select((rowid, local_uri, played)) .select((rowid, local_uri, played))
.filter(local_uri.is_not_null()) .filter(local_uri.is_not_null())
.load::<EpisodeCleanerModel>(&con) .load::<EpisodeCleanerQuery>(&con)
.map_err(From::from) .map_err(From::from)
} }
// pub(crate) fn get_played_episodes() -> Result<Vec<Episode>, DataError> { // pub(crate) fn get_played_episodes() -> Result<Vec<Episode>, DataError> {
// use schema::episodes::dsl::*; // use schema::episode::dsl::*;
// let db = connection(); // let db = connection();
// let con = db.get()?; // let con = db.get()?;
// episodes // episode
// .filter(played.is_not_null()) // .filter(played.is_not_null())
// .load::<Episode>(&con) // .load::<Episode>(&con)
// .map_err(From::from) // .map_err(From::from)
// } // }
pub(crate) fn get_played_cleaner_episodes() -> Result<Vec<EpisodeCleanerModel>, DataError> { pub(crate) fn get_played_cleaner_episodes() -> Result<Vec<EpisodeCleanerQuery>, DataError> {
use schema::episodes::dsl::*; use schema::episode::dsl::*;
let db = connection(); let db = connection();
let con = db.get()?; let con = db.get()?;
episodes episode
.select((rowid, local_uri, played)) .select((rowid, local_uri, played))
.filter(played.is_not_null()) .filter(played.is_not_null())
.load::<EpisodeCleanerModel>(&con) .load::<EpisodeCleanerQuery>(&con)
.map_err(From::from) .map_err(From::from)
} }
pub fn get_episode_from_rowid(ep_id: i32) -> Result<Episode, DataError> { pub fn get_episode_from_rowid(ep_id: i32) -> Result<Episode, DataError> {
use schema::episodes::dsl::*; use schema::episode::dsl::*;
let db = connection(); let db = connection();
let con = db.get()?; let con = db.get()?;
episodes episode
.filter(rowid.eq(ep_id)) .filter(rowid.eq(ep_id))
.get_result::<Episode>(&con) .get_result::<Episode>(&con)
.map_err(From::from) .map_err(From::from)
} }
pub fn get_episode_widget_from_rowid(ep_id: i32) -> Result<EpisodeWidgetModel, DataError> { pub fn get_episode_widget_from_rowid(ep_id: i32) -> Result<EpisodeWidgetQuery, DataError> {
use schema::episodes::dsl::*; use schema::episode::dsl::*;
let db = connection(); let db = connection();
let con = db.get()?; let con = db.get()?;
episodes episode
.select(( .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)) .filter(rowid.eq(ep_id))
.get_result::<EpisodeWidgetModel>(&con) .get_result::<EpisodeWidgetQuery>(&con)
.map_err(From::from) .map_err(From::from)
} }
pub fn get_episode_local_uri_from_id(ep_id: i32) -> Result<Option<String>, DataError> { pub fn get_episode_local_uri_from_id(ep_id: i32) -> Result<Option<String>, DataError> {
use schema::episodes::dsl::*; use schema::episode::dsl::*;
let db = connection(); let db = connection();
let con = db.get()?; let con = db.get()?;
episodes episode
.filter(rowid.eq(ep_id)) .filter(rowid.eq(ep_id))
.select(local_uri) .select(local_uri)
.get_result::<Option<String>>(&con) .get_result::<Option<String>>(&con)
.map_err(From::from) .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( pub fn get_episodes_widgets_filter_limit(
filter_ids: &[i32], filter_ids: &[i32],
limit: u32, limit: u32,
) -> Result<Vec<EpisodeWidgetModel>, DataError> { ) -> Result<Vec<EpisodeWidgetQuery>, DataError> {
use schema::episodes::dsl::*; use schema::episode::dsl::*;
let db = connection(); let db = connection();
let con = db.get()?; let con = db.get()?;
let columns = ( 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) .select(columns)
.order(epoch.desc()) .order(epoch.desc())
.filter(show_id.ne_all(filter_ids)) .filter(podcast_id.ne_all(filter_ids))
.limit(i64::from(limit)) .limit(i64::from(limit))
.load::<EpisodeWidgetModel>(&con) .load::<EpisodeWidgetQuery>(&con)
.map_err(From::from) .map_err(From::from)
} }
pub fn get_podcast_from_id(pid: i32) -> Result<Show, DataError> { pub fn get_podcast_from_id(pid: i32) -> Result<Podcast, DataError> {
use schema::shows::dsl::*; use schema::podcast::dsl::*;
let db = connection(); let db = connection();
let con = db.get()?; let con = db.get()?;
shows podcast
.filter(id.eq(pid)) .filter(id.eq(pid))
.get_result::<Show>(&con) .get_result::<Podcast>(&con)
.map_err(From::from) .map_err(From::from)
} }
pub fn get_podcast_cover_from_id(pid: i32) -> Result<ShowCoverModel, DataError> { pub fn get_podcast_cover_from_id(pid: i32) -> Result<PodcastCoverQuery, DataError> {
use schema::shows::dsl::*; use schema::podcast::dsl::*;
let db = connection(); let db = connection();
let con = db.get()?; let con = db.get()?;
shows podcast
.select((id, title, image_uri)) .select((id, title, image_uri))
.filter(id.eq(pid)) .filter(id.eq(pid))
.get_result::<ShowCoverModel>(&con) .get_result::<PodcastCoverQuery>(&con)
.map_err(From::from) .map_err(From::from)
} }
pub fn get_pd_episodes(parent: &Show) -> Result<Vec<Episode>, DataError> { pub fn get_pd_episodes(parent: &Podcast) -> Result<Vec<Episode>, DataError> {
use schema::episodes::dsl::*; use schema::episode::dsl::*;
let db = connection(); let db = connection();
let con = db.get()?; let con = db.get()?;
@@ -183,7 +195,7 @@ pub fn get_pd_episodes(parent: &Show) -> Result<Vec<Episode>, DataError> {
.map_err(From::from) .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 db = connection();
let con = db.get()?; let con = db.get()?;
@@ -193,24 +205,24 @@ pub fn get_pd_episodes_count(parent: &Show) -> Result<i64, DataError> {
.map_err(From::from) .map_err(From::from)
} }
pub fn get_pd_episodeswidgets(parent: &Show) -> Result<Vec<EpisodeWidgetModel>, DataError> { pub fn get_pd_episodeswidgets(parent: &Podcast) -> Result<Vec<EpisodeWidgetQuery>, DataError> {
use schema::episodes::dsl::*; use schema::episode::dsl::*;
let db = connection(); let db = connection();
let con = db.get()?; let con = db.get()?;
let columns = ( 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) .select(columns)
.filter(show_id.eq(parent.id())) .filter(podcast_id.eq(parent.id()))
.order(epoch.desc()) .order(epoch.desc())
.load::<EpisodeWidgetModel>(&con) .load::<EpisodeWidgetQuery>(&con)
.map_err(From::from) .map_err(From::from)
} }
pub fn get_pd_unplayed_episodes(parent: &Show) -> Result<Vec<Episode>, DataError> { pub fn get_pd_unplayed_episodes(parent: &Podcast) -> Result<Vec<Episode>, DataError> {
use schema::episodes::dsl::*; use schema::episode::dsl::*;
let db = connection(); let db = connection();
let con = db.get()?; let con = db.get()?;
@@ -221,8 +233,8 @@ pub fn get_pd_unplayed_episodes(parent: &Show) -> Result<Vec<Episode>, DataError
.map_err(From::from) .map_err(From::from)
} }
// pub(crate) fn get_pd_episodes_limit(parent: &Show, limit: u32) -> // pub(crate) fn get_pd_episodes_limit(parent: &Podcast, limit: u32) ->
// Result<Vec<Episode>, DataError> { use schema::episodes::dsl::*; // Result<Vec<Episode>, DataError> { use schema::episode::dsl::*;
// let db = connection(); // let db = connection();
// let con = db.get()?; // let con = db.get()?;
@@ -256,25 +268,25 @@ pub fn get_source_from_id(id_: i32) -> Result<Source, DataError> {
.map_err(From::from) .map_err(From::from)
} }
pub fn get_podcast_from_source_id(sid: i32) -> Result<Show, DataError> { pub fn get_podcast_from_source_id(sid: i32) -> Result<Podcast, DataError> {
use schema::shows::dsl::*; use schema::podcast::dsl::*;
let db = connection(); let db = connection();
let con = db.get()?; let con = db.get()?;
shows podcast
.filter(source_id.eq(sid)) .filter(source_id.eq(sid))
.get_result::<Show>(&con) .get_result::<Podcast>(&con)
.map_err(From::from) .map_err(From::from)
} }
pub fn get_episode_from_pk(title_: &str, pid: i32) -> Result<Episode, DataError> { pub fn get_episode_from_pk(title_: &str, pid: i32) -> Result<Episode, DataError> {
use schema::episodes::dsl::*; use schema::episode::dsl::*;
let db = connection(); let db = connection();
let con = db.get()?; let con = db.get()?;
episodes episode
.filter(title.eq(title_)) .filter(title.eq(title_))
.filter(show_id.eq(pid)) .filter(podcast_id.eq(pid))
.get_result::<Episode>(&con) .get_result::<Episode>(&con)
.map_err(From::from) .map_err(From::from)
} }
@@ -283,19 +295,19 @@ pub(crate) fn get_episode_minimal_from_pk(
title_: &str, title_: &str,
pid: i32, pid: i32,
) -> Result<EpisodeMinimal, DataError> { ) -> Result<EpisodeMinimal, DataError> {
use schema::episodes::dsl::*; use schema::episode::dsl::*;
let db = connection(); let db = connection();
let con = db.get()?; let con = db.get()?;
episodes episode
.select((rowid, title, uri, epoch, length, duration, guid, show_id)) .select((rowid, title, uri, epoch, duration, guid, podcast_id))
.filter(title.eq(title_)) .filter(title.eq(title_))
.filter(show_id.eq(pid)) .filter(podcast_id.eq(pid))
.get_result::<EpisodeMinimal>(&con) .get_result::<EpisodeMinimal>(&con)
.map_err(From::from) .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 db = connection();
let con = db.get()?; let con = db.get()?;
@@ -314,16 +326,16 @@ fn delete_source(con: &SqliteConnection, source_id: i32) -> QueryResult<usize> {
diesel::delete(source.filter(id.eq(source_id))).execute(con) diesel::delete(source.filter(id.eq(source_id))).execute(con)
} }
fn delete_podcast(con: &SqliteConnection, show_id: i32) -> QueryResult<usize> { fn delete_podcast(con: &SqliteConnection, podcast_id: i32) -> QueryResult<usize> {
use schema::shows::dsl::*; 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> { fn delete_podcast_episodes(con: &SqliteConnection, parent_id: i32) -> QueryResult<usize> {
use schema::episodes::dsl::*; use schema::episode::dsl::*;
diesel::delete(episodes.filter(show_id.eq(parent_id))).execute(con) diesel::delete(episode.filter(podcast_id.eq(parent_id))).execute(con)
} }
pub fn source_exists(url: &str) -> Result<bool, DataError> { pub fn source_exists(url: &str) -> Result<bool, DataError> {
@@ -338,70 +350,81 @@ pub fn source_exists(url: &str) -> Result<bool, DataError> {
} }
pub(crate) fn podcast_exists(source_id_: i32) -> Result<bool, DataError> { pub(crate) fn podcast_exists(source_id_: i32) -> Result<bool, DataError> {
use schema::shows::dsl::*; use schema::podcast::dsl::*;
let db = connection(); let db = connection();
let con = db.get()?; 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) .get_result(&con)
.map_err(From::from) .map_err(From::from)
} }
#[cfg_attr(rustfmt, rustfmt_skip)] #[cfg_attr(rustfmt, rustfmt_skip)]
pub(crate) fn episode_exists(title_: &str, show_id_: i32) -> Result<bool, DataError> { pub(crate) fn episode_exists(title_: &str, podcast_id_: i32) -> Result<bool, DataError> {
use schema::episodes::dsl::*; use schema::episode::dsl::*;
let db = connection(); let db = connection();
let con = db.get()?; 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) .get_result(&con)
.map_err(From::from) .map_err(From::from)
} }
/// Check if the `episodes table contains any rows pub fn episode_had_description(rowid_: i32) -> Result<bool, DataError> {
use schema::episode::dsl::*;
let db = connection();
let con = db.get()?;
select(exists(episode.filter(rowid.eq(rowid_))))
.get_result(&con)
.map_err(From::from)
}
/// Check if the `episode` table contains any rows
/// ///
/// Return true if `episodes` table is populated. /// Return true if `episode` table is populated.
pub fn is_episodes_populated() -> Result<bool, DataError> { pub fn is_episodes_populated() -> Result<bool, DataError> {
use schema::episodes::dsl::*; use schema::episode::dsl::*;
let db = connection(); let db = connection();
let con = db.get()?; let con = db.get()?;
select(exists(episodes.as_query())) select(exists(episode.as_query()))
.get_result(&con) .get_result(&con)
.map_err(From::from) .map_err(From::from)
} }
/// Check if the `shows` table contains any rows /// Check if the `podcast` table contains any rows
/// ///
/// Return true if `shows table is populated. /// Return true if `podcast table is populated.
pub fn is_podcasts_populated(filter_ids: &[i32]) -> Result<bool, DataError> { pub fn is_podcasts_populated(filter_ids: &[i32]) -> Result<bool, DataError> {
use schema::shows::dsl::*; use schema::podcast::dsl::*;
let db = connection(); let db = connection();
let con = db.get()?; let con = db.get()?;
select(exists(shows.filter(id.ne_all(filter_ids)))) select(exists(podcast.filter(id.ne_all(filter_ids))))
.get_result(&con) .get_result(&con)
.map_err(From::from) .map_err(From::from)
} }
pub(crate) fn index_new_episodes(eps: &[NewEpisode]) -> Result<(), DataError> { pub(crate) fn index_new_episodes(eps: &[NewEpisode]) -> Result<(), DataError> {
use schema::episodes::dsl::*; use schema::episode::dsl::*;
let db = connection(); let db = connection();
let con = db.get()?; let con = db.get()?;
diesel::insert_into(episodes) diesel::insert_into(episode)
.values(eps) .values(eps)
.execute(&*con) .execute(&*con)
.map_err(From::from) .map_err(From::from)
.map(|_| ()) .map(|_| ())
} }
pub fn update_none_to_played_now(parent: &Show) -> Result<usize, DataError> { pub fn update_none_to_played_now(parent: &Podcast) -> Result<usize, DataError> {
use schema::episodes::dsl::*; use schema::episode::dsl::*;
let db = connection(); let db = connection();
let con = db.get()?; let con = db.get()?;
podcasts-data/src/errors.rs → hammond-data/src/errors.rs
+2 -10
View File
@@ -11,12 +11,7 @@ use std::io;
use models::Source; use models::Source;
#[fail( #[fail(display = "Request to {} returned {}. Context: {}", url, status_code, context)]
display = "Request to {} returned {}. Context: {}",
url,
status_code,
context
)]
#[derive(Fail, Debug)] #[derive(Fail, Debug)]
pub struct HttpStatusError { pub struct HttpStatusError {
url: String, url: String,
@@ -63,10 +58,7 @@ pub enum DataError {
HttpStatusGeneral(HttpStatusError), HttpStatusGeneral(HttpStatusError),
#[fail(display = "FIXME: This should be better")] #[fail(display = "FIXME: This should be better")]
F301(Source), F301(Source),
#[fail( #[fail(display = "Error occured while Parsing an Episode. Reason: {}", reason)]
display = "Error occured while Parsing an Episode. Reason: {}",
reason
)]
ParseEpisodeError { reason: String, parent_id: i32 }, ParseEpisodeError { reason: String, parent_id: i32 },
#[fail(display = "Episode was not changed and thus skipped.")] #[fail(display = "Episode was not changed and thus skipped.")]
EpisodeNotChanged, EpisodeNotChanged,
podcasts-data/src/feed.rs → hammond-data/src/feed.rs
+8 -8
View File
@@ -9,7 +9,7 @@ use rss;
use dbqueries; use dbqueries;
use errors::DataError; use errors::DataError;
use models::{Index, IndexState, Update}; use models::{Index, IndexState, Update};
use models::{NewEpisode, NewEpisodeMinimal, NewShow, Show}; use models::{NewEpisode, NewEpisodeMinimal, NewPodcast, Podcast};
/// Wrapper struct that hold a `Source` id and the `rss::Channel` /// Wrapper struct that hold a `Source` id and the `rss::Channel`
/// that corresponds to the `Source.uri` field. /// that corresponds to the `Source.uri` field.
@@ -31,15 +31,15 @@ impl Feed {
.and_then(move |pd| self.index_channel_items(pd)) .and_then(move |pd| self.index_channel_items(pd))
} }
fn parse_podcast(&self) -> NewShow { fn parse_podcast(&self) -> NewPodcast {
NewShow::new(&self.channel, self.source_id) NewPodcast::new(&self.channel, self.source_id)
} }
fn parse_podcast_async(&self) -> impl Future<Item = NewShow, Error = DataError> + Send { fn parse_podcast_async(&self) -> impl Future<Item = NewPodcast, Error = DataError> + Send {
ok(self.parse_podcast()) ok(self.parse_podcast())
} }
fn index_channel_items(self, pd: Show) -> impl Future<Item = (), Error = DataError> + Send { fn index_channel_items(self, pd: Podcast) -> impl Future<Item = (), Error = DataError> + Send {
let stream = stream::iter_ok::<_, DataError>(self.channel.into_items()); let stream = stream::iter_ok::<_, DataError>(self.channel.into_items());
// Parse the episodes // Parse the episodes
@@ -65,12 +65,12 @@ fn determine_ep_state(
item: &rss::Item, item: &rss::Item,
) -> Result<IndexState<NewEpisode>, DataError> { ) -> Result<IndexState<NewEpisode>, DataError> {
// Check if feed exists // 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 { if !exists {
Ok(IndexState::Index(ep.into_new_episode(item))) Ok(IndexState::Index(ep.into_new_episode(item)))
} else { } 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(); let rowid = old.rowid();
if ep != old { if ep != old {
@@ -204,7 +204,7 @@ mod tests {
let file = fs::File::open(path).unwrap(); let file = fs::File::open(path).unwrap();
let channel = Channel::read_from(BufReader::new(file)).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); assert_eq!(feed.parse_podcast(), pd);
} }
hammond-data/src/lib.rs
+117
View File
@@ -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()
};
}
}
podcasts-data/src/models/episode.rs → hammond-data/src/models/episode.rs
+91 -55
View File
@@ -5,14 +5,14 @@ use diesel::SaveChangesDsl;
use database::connection; use database::connection;
use errors::DataError; use errors::DataError;
use models::{Save, Show}; use models::{Podcast, Save};
use schema::episodes; use schema::episode;
#[derive(Queryable, Identifiable, AsChangeset, Associations, PartialEq)] #[derive(Queryable, Identifiable, AsChangeset, Associations, PartialEq)]
#[table_name = "episodes"] #[table_name = "episode"]
#[changeset_options(treat_none_as_null = "true")] #[changeset_options(treat_none_as_null = "true")]
#[primary_key(title, show_id)] #[primary_key(title, podcast_id)]
#[belongs_to(Show, foreign_key = "show_id")] #[belongs_to(Podcast, foreign_key = "podcast_id")]
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
/// Diesel Model of the episode table. /// Diesel Model of the episode table.
pub struct Episode { pub struct Episode {
@@ -26,7 +26,9 @@ pub struct Episode {
duration: Option<i32>, duration: Option<i32>,
guid: Option<String>, guid: Option<String>,
played: Option<i32>, played: Option<i32>,
show_id: i32, favorite: bool,
archive: bool,
podcast_id: i32,
} }
impl Save<Episode> for Episode { impl Save<Episode> for Episode {
@@ -152,9 +154,32 @@ impl Episode {
self.played = value; self.played = value;
} }
/// `Show` table foreign key. /// Represents the archiving policy for the episode.
pub fn show_id(&self) -> i32 { pub fn archive(&self) -> bool {
self.show_id 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. /// Sets the `played` value with the current `epoch` timestap and save it.
@@ -166,12 +191,12 @@ impl Episode {
} }
#[derive(Queryable, AsChangeset, PartialEq)] #[derive(Queryable, AsChangeset, PartialEq)]
#[table_name = "episodes"] #[table_name = "episode"]
#[changeset_options(treat_none_as_null = "true")] #[changeset_options(treat_none_as_null = "true")]
#[primary_key(title, show_id)] #[primary_key(title, podcast_id)]
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
/// Diesel Model to be used for constructing `EpisodeWidgets`. /// Diesel Model to be used for constructing `EpisodeWidgets`.
pub struct EpisodeWidgetModel { pub struct EpisodeWidgetQuery {
rowid: i32, rowid: i32,
title: String, title: String,
uri: Option<String>, uri: Option<String>,
@@ -180,12 +205,14 @@ pub struct EpisodeWidgetModel {
length: Option<i32>, length: Option<i32>,
duration: Option<i32>, duration: Option<i32>,
played: Option<i32>, played: Option<i32>,
show_id: i32, // favorite: bool,
// archive: bool,
podcast_id: i32,
} }
impl From<Episode> for EpisodeWidgetModel { impl From<Episode> for EpisodeWidgetQuery {
fn from(e: Episode) -> EpisodeWidgetModel { fn from(e: Episode) -> EpisodeWidgetQuery {
EpisodeWidgetModel { EpisodeWidgetQuery {
rowid: e.rowid, rowid: e.rowid,
title: e.title, title: e.title,
uri: e.uri, uri: e.uri,
@@ -194,30 +221,30 @@ impl From<Episode> for EpisodeWidgetModel {
length: e.length, length: e.length,
duration: e.duration, duration: e.duration,
played: e.played, 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; type Error = DataError;
/// Helper method to easily save/"sync" current state of self to the /// Helper method to easily save/"sync" current state of self to the
/// Database. /// Database.
fn save(&self) -> Result<usize, Self::Error> { fn save(&self) -> Result<usize, Self::Error> {
use schema::episodes::dsl::*; use schema::episode::dsl::*;
let db = connection(); let db = connection();
let tempdb = db.get()?; let tempdb = db.get()?;
diesel::update(episodes.filter(rowid.eq(self.rowid))) diesel::update(episode.filter(rowid.eq(self.rowid)))
.set(self) .set(self)
.execute(&*tempdb) .execute(&*tempdb)
.map_err(From::from) .map_err(From::from)
} }
} }
impl EpisodeWidgetModel { impl EpisodeWidgetQuery {
/// Get the value of the sqlite's `ROW_ID` /// Get the value of the sqlite's `ROW_ID`
pub fn rowid(&self) -> i32 { pub fn rowid(&self) -> i32 {
self.rowid self.rowid
@@ -292,9 +319,32 @@ impl EpisodeWidgetModel {
self.played = value; self.played = value;
} }
/// `Show` table foreign key. // /// Represents the archiving policy for the episode.
pub fn show_id(&self) -> i32 { // pub fn archive(&self) -> bool {
self.show_id // 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. /// Sets the `played` value with the current `epoch` timestap and save it.
@@ -306,38 +356,38 @@ impl EpisodeWidgetModel {
} }
#[derive(Queryable, AsChangeset, PartialEq)] #[derive(Queryable, AsChangeset, PartialEq)]
#[table_name = "episodes"] #[table_name = "episode"]
#[changeset_options(treat_none_as_null = "true")] #[changeset_options(treat_none_as_null = "true")]
#[primary_key(title, show_id)] #[primary_key(title, podcast_id)]
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
/// Diesel Model to be used internal with the `utils::checkup` function. /// Diesel Model to be used internal with the `utils::checkup` function.
pub struct EpisodeCleanerModel { pub struct EpisodeCleanerQuery {
rowid: i32, rowid: i32,
local_uri: Option<String>, local_uri: Option<String>,
played: Option<i32>, played: Option<i32>,
} }
impl Save<usize> for EpisodeCleanerModel { impl Save<usize> for EpisodeCleanerQuery {
type Error = DataError; type Error = DataError;
/// Helper method to easily save/"sync" current state of self to the /// Helper method to easily save/"sync" current state of self to the
/// Database. /// Database.
fn save(&self) -> Result<usize, Self::Error> { fn save(&self) -> Result<usize, Self::Error> {
use schema::episodes::dsl::*; use schema::episode::dsl::*;
let db = connection(); let db = connection();
let tempdb = db.get()?; let tempdb = db.get()?;
diesel::update(episodes.filter(rowid.eq(self.rowid))) diesel::update(episode.filter(rowid.eq(self.rowid)))
.set(self) .set(self)
.execute(&*tempdb) .execute(&*tempdb)
.map_err(From::from) .map_err(From::from)
} }
} }
impl From<Episode> for EpisodeCleanerModel { impl From<Episode> for EpisodeCleanerQuery {
fn from(e: Episode) -> EpisodeCleanerModel { fn from(e: Episode) -> EpisodeCleanerQuery {
EpisodeCleanerModel { EpisodeCleanerQuery {
rowid: e.rowid(), rowid: e.rowid(),
local_uri: e.local_uri, local_uri: e.local_uri,
played: e.played, played: e.played,
@@ -345,7 +395,7 @@ impl From<Episode> for EpisodeCleanerModel {
} }
} }
impl EpisodeCleanerModel { impl EpisodeCleanerQuery {
/// Get the value of the sqlite's `ROW_ID` /// Get the value of the sqlite's `ROW_ID`
pub fn rowid(&self) -> i32 { pub fn rowid(&self) -> i32 {
self.rowid self.rowid
@@ -378,9 +428,9 @@ impl EpisodeCleanerModel {
} }
#[derive(Queryable, AsChangeset, PartialEq)] #[derive(Queryable, AsChangeset, PartialEq)]
#[table_name = "episodes"] #[table_name = "episode"]
#[changeset_options(treat_none_as_null = "true")] #[changeset_options(treat_none_as_null = "true")]
#[primary_key(title, show_id)] #[primary_key(title, podcast_id)]
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
/// Diesel Model to be used for FIXME. /// Diesel Model to be used for FIXME.
pub struct EpisodeMinimal { pub struct EpisodeMinimal {
@@ -388,10 +438,9 @@ pub struct EpisodeMinimal {
title: String, title: String,
uri: Option<String>, uri: Option<String>,
epoch: i32, epoch: i32,
length: Option<i32>,
duration: Option<i32>, duration: Option<i32>,
guid: Option<String>, guid: Option<String>,
show_id: i32, podcast_id: i32,
} }
impl From<Episode> for EpisodeMinimal { impl From<Episode> for EpisodeMinimal {
@@ -400,11 +449,10 @@ impl From<Episode> for EpisodeMinimal {
rowid: e.rowid, rowid: e.rowid,
title: e.title, title: e.title,
uri: e.uri, uri: e.uri,
length: e.length,
guid: e.guid, guid: e.guid,
epoch: e.epoch, epoch: e.epoch,
duration: e.duration, duration: e.duration,
show_id: e.show_id, podcast_id: e.podcast_id,
} }
} }
} }
@@ -440,18 +488,6 @@ impl EpisodeMinimal {
self.epoch self.epoch
} }
/// Get the `length`.
///
/// The number represents the size of the file in bytes.
pub fn length(&self) -> Option<i32> {
self.length
}
/// Set the `length`.
pub fn set_length(&mut self, value: Option<i32>) {
self.length = value;
}
/// Get the `duration` value. /// Get the `duration` value.
/// ///
/// The number represents the duration of the item/episode in seconds. /// The number represents the duration of the item/episode in seconds.
@@ -459,8 +495,8 @@ impl EpisodeMinimal {
self.duration self.duration
} }
/// `Show` table foreign key. /// `Podcast` table foreign key.
pub fn show_id(&self) -> i32 { pub fn podcast_id(&self) -> i32 {
self.show_id self.podcast_id
} }
} }
podcasts-data/src/models/mod.rs → hammond-data/src/models/mod.rs
+7 -7
View File
@@ -1,26 +1,26 @@
mod new_episode; mod new_episode;
mod new_show; mod new_podcast;
mod new_source; mod new_source;
mod episode; mod episode;
mod show; mod podcast;
mod source; mod source;
// use futures::prelude::*; // use futures::prelude::*;
// use futures::future::*; // use futures::future::*;
pub(crate) use self::episode::EpisodeCleanerModel; pub(crate) use self::episode::EpisodeCleanerQuery;
pub(crate) use self::new_episode::{NewEpisode, NewEpisodeMinimal}; pub(crate) use self::new_episode::{NewEpisode, NewEpisodeMinimal};
pub(crate) use self::new_show::NewShow; pub(crate) use self::new_podcast::NewPodcast;
pub(crate) use self::new_source::NewSource; pub(crate) use self::new_source::NewSource;
#[cfg(test)] #[cfg(test)]
pub(crate) use self::new_episode::NewEpisodeBuilder; pub(crate) use self::new_episode::NewEpisodeBuilder;
#[cfg(test)] #[cfg(test)]
pub(crate) use self::new_show::NewShowBuilder; pub(crate) use self::new_podcast::NewPodcastBuilder;
pub use self::episode::{Episode, EpisodeMinimal, EpisodeWidgetModel}; pub use self::episode::{Episode, EpisodeMinimal, EpisodeWidgetQuery};
pub use self::show::{Show, ShowCoverModel}; pub use self::podcast::{Podcast, PodcastCoverQuery};
pub use self::source::Source; pub use self::source::Source;
#[derive(Debug, Clone, PartialEq)] #[derive(Debug, Clone, PartialEq)]
podcasts-data/src/models/new_episode.rs → hammond-data/src/models/new_episode.rs
+65 -66
View File
@@ -9,11 +9,11 @@ use dbqueries;
use errors::DataError; use errors::DataError;
use models::{Episode, EpisodeMinimal, Index, Insert, Update}; use models::{Episode, EpisodeMinimal, Index, Insert, Update};
use parser; use parser;
use schema::episodes; use schema::episode;
use utils::url_cleaner; use utils::url_cleaner;
#[derive(Insertable, AsChangeset)] #[derive(Insertable, AsChangeset)]
#[table_name = "episodes"] #[table_name = "episode"]
#[derive(Debug, Clone, Default, Builder, PartialEq)] #[derive(Debug, Clone, Default, Builder, PartialEq)]
#[builder(default)] #[builder(default)]
#[builder(derive(Debug))] #[builder(derive(Debug))]
@@ -26,7 +26,7 @@ pub(crate) struct NewEpisode {
duration: Option<i32>, duration: Option<i32>,
guid: Option<String>, guid: Option<String>,
epoch: i32, epoch: i32,
show_id: i32, podcast_id: i32,
} }
impl From<NewEpisodeMinimal> for NewEpisode { impl From<NewEpisodeMinimal> for NewEpisode {
@@ -36,7 +36,7 @@ impl From<NewEpisodeMinimal> for NewEpisode {
.uri(e.uri) .uri(e.uri)
.duration(e.duration) .duration(e.duration)
.epoch(e.epoch) .epoch(e.epoch)
.show_id(e.show_id) .podcast_id(e.podcast_id)
.guid(e.guid) .guid(e.guid)
.build() .build()
.unwrap() .unwrap()
@@ -47,12 +47,12 @@ impl Insert<()> for NewEpisode {
type Error = DataError; type Error = DataError;
fn insert(&self) -> Result<(), DataError> { fn insert(&self) -> Result<(), DataError> {
use schema::episodes::dsl::*; use schema::episode::dsl::*;
let db = connection(); let db = connection();
let con = db.get()?; let con = db.get()?;
info!("Inserting {:?}", self.title); info!("Inserting {:?}", self.title);
diesel::insert_into(episodes) diesel::insert_into(episode)
.values(self) .values(self)
.execute(&con) .execute(&con)
.map_err(From::from) .map_err(From::from)
@@ -64,12 +64,12 @@ impl Update<()> for NewEpisode {
type Error = DataError; type Error = DataError;
fn update(&self, episode_id: i32) -> Result<(), DataError> { fn update(&self, episode_id: i32) -> Result<(), DataError> {
use schema::episodes::dsl::*; use schema::episode::dsl::*;
let db = connection(); let db = connection();
let con = db.get()?; let con = db.get()?;
info!("Updating {:?}", self.title); info!("Updating {:?}", self.title);
diesel::update(episodes.filter(rowid.eq(episode_id))) diesel::update(episode.filter(rowid.eq(episode_id)))
.set(self) .set(self)
.execute(&con) .execute(&con)
.map_err(From::from) .map_err(From::from)
@@ -83,10 +83,10 @@ impl Index<()> for NewEpisode {
// Does not update the episode description if it's the only thing that has // Does not update the episode description if it's the only thing that has
// changed. // changed.
fn index(&self) -> Result<(), DataError> { 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 { 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 { if self != &other {
self.update(other.rowid()) self.update(other.rowid())
@@ -106,7 +106,7 @@ impl PartialEq<EpisodeMinimal> for NewEpisode {
&& (self.duration() == other.duration()) && (self.duration() == other.duration())
&& (self.epoch() == other.epoch()) && (self.epoch() == other.epoch())
&& (self.guid() == other.guid()) && (self.guid() == other.guid())
&& (self.show_id() == other.show_id()) && (self.podcast_id() == other.podcast_id())
} }
} }
@@ -117,7 +117,7 @@ impl PartialEq<Episode> for NewEpisode {
&& (self.duration() == other.duration()) && (self.duration() == other.duration())
&& (self.epoch() == other.epoch()) && (self.epoch() == other.epoch())
&& (self.guid() == other.guid()) && (self.guid() == other.guid())
&& (self.show_id() == other.show_id()) && (self.podcast_id() == other.podcast_id())
&& (self.description() == other.description()) && (self.description() == other.description())
&& (self.length() == other.length()) && (self.length() == other.length())
} }
@@ -126,14 +126,14 @@ impl PartialEq<Episode> for NewEpisode {
impl NewEpisode { impl NewEpisode {
/// Parses an `rss::Item` into a `NewEpisode` Struct. /// Parses an `rss::Item` into a `NewEpisode` Struct.
#[allow(dead_code)] #[allow(dead_code)]
pub(crate) fn new(item: &rss::Item, show_id: i32) -> Result<Self, DataError> { pub(crate) fn new(item: &rss::Item, podcast_id: i32) -> Result<Self, DataError> {
NewEpisodeMinimal::new(item, show_id).map(|ep| ep.into_new_episode(item)) NewEpisodeMinimal::new(item, podcast_id).map(|ep| ep.into_new_episode(item))
} }
#[allow(dead_code)] #[allow(dead_code)]
pub(crate) fn to_episode(&self) -> Result<Episode, DataError> { pub(crate) fn to_episode(&self) -> Result<Episode, DataError> {
self.index()?; self.index()?;
dbqueries::get_episode_from_pk(&self.title, self.show_id).map_err(From::from) dbqueries::get_episode_from_pk(&self.title, self.podcast_id).map_err(From::from)
} }
} }
@@ -167,24 +167,23 @@ impl NewEpisode {
self.length self.length
} }
pub(crate) fn show_id(&self) -> i32 { pub(crate) fn podcast_id(&self) -> i32 {
self.show_id self.podcast_id
} }
} }
#[derive(Insertable, AsChangeset)] #[derive(Insertable, AsChangeset)]
#[table_name = "episodes"] #[table_name = "episode"]
#[derive(Debug, Clone, Builder, PartialEq)] #[derive(Debug, Clone, Builder, PartialEq)]
#[builder(derive(Debug))] #[builder(derive(Debug))]
#[builder(setter(into))] #[builder(setter(into))]
pub(crate) struct NewEpisodeMinimal { pub(crate) struct NewEpisodeMinimal {
title: String, title: String,
uri: Option<String>, uri: Option<String>,
length: Option<i32>,
duration: Option<i32>, duration: Option<i32>,
epoch: i32, epoch: i32,
guid: Option<String>, guid: Option<String>,
show_id: i32, podcast_id: i32,
} }
impl PartialEq<EpisodeMinimal> for NewEpisodeMinimal { impl PartialEq<EpisodeMinimal> for NewEpisodeMinimal {
@@ -194,7 +193,7 @@ impl PartialEq<EpisodeMinimal> for NewEpisodeMinimal {
&& (self.duration() == other.duration()) && (self.duration() == other.duration())
&& (self.epoch() == other.epoch()) && (self.epoch() == other.epoch())
&& (self.guid() == other.guid()) && (self.guid() == other.guid())
&& (self.show_id() == other.show_id()) && (self.podcast_id() == other.podcast_id())
} }
} }
@@ -212,19 +211,12 @@ impl NewEpisodeMinimal {
let title = item.title().unwrap().trim().to_owned(); let title = item.title().unwrap().trim().to_owned();
let guid = item.guid().map(|s| s.value().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 let uri = item.enclosure()
// http://www.rssboard.org/rss-specification#ltenclosuregtSubelementOfLtitemgt .map(|s| url_cleaner(s.url().trim()))
let enc = item.enclosure();
// Get the url
let uri = enc.map(|s| url_cleaner(s.url().trim()))
// Fallback to Rss.Item.link if enclosure is None. // Fallback to Rss.Item.link if enclosure is None.
.or_else(|| item.link().map(|s| url_cleaner(s.trim()))); .or_else(|| item.link().map(|s| url_cleaner(s.trim())));
// Get the size of the content, it should be in bytes // If url is still None return an Error as this behaviour is
let length = enc.and_then(|x| x.length().parse().ok());
// If url is still None return an Error as this behaviour is not
// compliant with the RSS Spec. // compliant with the RSS Spec.
if uri.is_none() { if uri.is_none() {
let err = DataError::ParseEpisodeError { let err = DataError::ParseEpisodeError {
@@ -246,18 +238,17 @@ impl NewEpisodeMinimal {
NewEpisodeMinimalBuilder::default() NewEpisodeMinimalBuilder::default()
.title(title) .title(title)
.uri(uri) .uri(uri)
.length(length)
.duration(duration) .duration(duration)
.epoch(epoch) .epoch(epoch)
.guid(guid) .guid(guid)
.show_id(parent_id) .podcast_id(parent_id)
.build() .build()
.map_err(From::from) .map_err(From::from)
} }
// TODO: TryInto is stabilizing in rustc v1.26! // TODO: TryInto is stabilizing in rustc v1.26!
// ^ Jokes on you past self!
pub(crate) fn into_new_episode(self, item: &rss::Item) -> NewEpisode { 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 description = item.description().and_then(|s| {
let sanitized_html = ammonia::Builder::new() let sanitized_html = ammonia::Builder::new()
// Remove `rel` attributes from `<a>` tags // Remove `rel` attributes from `<a>` tags
@@ -272,9 +263,9 @@ impl NewEpisodeMinimal {
.uri(self.uri) .uri(self.uri)
.duration(self.duration) .duration(self.duration)
.epoch(self.epoch) .epoch(self.epoch)
.show_id(self.show_id) .podcast_id(self.podcast_id)
.guid(self.guid) .guid(self.guid)
.length(self.length) .length(length)
.description(description) .description(description)
.build() .build()
.unwrap() .unwrap()
@@ -303,11 +294,10 @@ impl NewEpisodeMinimal {
self.epoch self.epoch
} }
pub(crate) fn show_id(&self) -> i32 { pub(crate) fn podcast_id(&self) -> i32 {
self.show_id self.podcast_id
} }
} }
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use database::truncate_db; use database::truncate_db;
@@ -333,9 +323,8 @@ mod tests {
))) )))
.guid(Some(String::from("7df4070a-9832-11e7-adac-cb37b05d5e24"))) .guid(Some(String::from("7df4070a-9832-11e7-adac-cb37b05d5e24")))
.epoch(1505296800) .epoch(1505296800)
.length(Some(66738886))
.duration(Some(4171)) .duration(Some(4171))
.show_id(42) .podcast_id(42)
.build() .build()
.unwrap() .unwrap()
}; };
@@ -347,9 +336,8 @@ mod tests {
))) )))
.guid(Some(String::from("7c207a24-e33f-11e6-9438-eb45dcf36a1d"))) .guid(Some(String::from("7c207a24-e33f-11e6-9438-eb45dcf36a1d")))
.epoch(1502272800) .epoch(1502272800)
.length(Some(67527575))
.duration(Some(4415)) .duration(Some(4415))
.show_id(42) .podcast_id(42)
.build() .build()
.unwrap() .unwrap()
}; };
@@ -370,7 +358,7 @@ mod tests {
.length(Some(66738886)) .length(Some(66738886))
.epoch(1505296800) .epoch(1505296800)
.duration(Some(4171)) .duration(Some(4171))
.show_id(42) .podcast_id(42)
.build() .build()
.unwrap() .unwrap()
}; };
@@ -394,7 +382,7 @@ mod tests {
.length(Some(67527575)) .length(Some(67527575))
.epoch(1502272800) .epoch(1502272800)
.duration(Some(4415)) .duration(Some(4415))
.show_id(42) .podcast_id(42)
.build() .build()
.unwrap() .unwrap()
}; };
@@ -409,7 +397,7 @@ mod tests {
.length(Some(66738886)) .length(Some(66738886))
.epoch(1505296800) .epoch(1505296800)
.duration(Some(424242)) .duration(Some(424242))
.show_id(42) .podcast_id(42)
.build() .build()
.unwrap() .unwrap()
}; };
@@ -420,10 +408,9 @@ mod tests {
"http://www.podtrac.com/pts/redirect.mp3/traffic.libsyn.com/jnite/lup-0214.mp3", "http://www.podtrac.com/pts/redirect.mp3/traffic.libsyn.com/jnite/lup-0214.mp3",
))) )))
.guid(Some(String::from("78A682B4-73E8-47B8-88C0-1BE62DD4EF9D"))) .guid(Some(String::from("78A682B4-73E8-47B8-88C0-1BE62DD4EF9D")))
.length(Some(46479789))
.epoch(1505280282) .epoch(1505280282)
.duration(Some(5733)) .duration(Some(5733))
.show_id(42) .podcast_id(42)
.build() .build()
.unwrap() .unwrap()
}; };
@@ -435,9 +422,8 @@ mod tests {
))) )))
.guid(Some(String::from("1CE57548-B36C-4F14-832A-5D5E0A24E35B"))) .guid(Some(String::from("1CE57548-B36C-4F14-832A-5D5E0A24E35B")))
.epoch(1504670247) .epoch(1504670247)
.length(Some(36544272))
.duration(Some(4491)) .duration(Some(4491))
.show_id(42) .podcast_id(42)
.build() .build()
.unwrap() .unwrap()
}; };
@@ -457,7 +443,7 @@ mod tests {
.length(Some(46479789)) .length(Some(46479789))
.epoch(1505280282) .epoch(1505280282)
.duration(Some(5733)) .duration(Some(5733))
.show_id(42) .podcast_id(42)
.build() .build()
.unwrap() .unwrap()
}; };
@@ -479,7 +465,7 @@ mod tests {
.length(Some(36544272)) .length(Some(36544272))
.epoch(1504670247) .epoch(1504670247)
.duration(Some(4491)) .duration(Some(4491))
.show_id(42) .podcast_id(42)
.build() .build()
.unwrap() .unwrap()
}; };
@@ -553,10 +539,6 @@ mod tests {
let ep = EXPECTED_MINIMAL_INTERCEPTED_1 let ep = EXPECTED_MINIMAL_INTERCEPTED_1
.clone() .clone()
.into_new_episode(&item); .into_new_episode(&item);
println!(
"EPISODE: {:#?}\nEXPECTED: {:#?}",
ep, *EXPECTED_INTERCEPTED_1
);
assert_eq!(ep, *EXPECTED_INTERCEPTED_1); assert_eq!(ep, *EXPECTED_INTERCEPTED_1);
let item = channel.items().iter().nth(15).unwrap(); let item = channel.items().iter().nth(15).unwrap();
@@ -576,7 +558,7 @@ mod tests {
let episode = channel.items().iter().nth(14).unwrap(); let episode = channel.items().iter().nth(14).unwrap();
let new_ep = NewEpisode::new(&episode, 42).unwrap(); let new_ep = NewEpisode::new(&episode, 42).unwrap();
new_ep.insert().unwrap(); new_ep.insert().unwrap();
let ep = dbqueries::get_episode_from_pk(new_ep.title(), new_ep.show_id()).unwrap(); let ep = dbqueries::get_episode_from_pk(new_ep.title(), new_ep.podcast_id()).unwrap();
assert_eq!(new_ep, ep); assert_eq!(new_ep, ep);
assert_eq!(&new_ep, &*EXPECTED_INTERCEPTED_1); assert_eq!(&new_ep, &*EXPECTED_INTERCEPTED_1);
@@ -585,7 +567,7 @@ mod tests {
let episode = channel.items().iter().nth(15).unwrap(); let episode = channel.items().iter().nth(15).unwrap();
let new_ep = NewEpisode::new(&episode, 42).unwrap(); let new_ep = NewEpisode::new(&episode, 42).unwrap();
new_ep.insert().unwrap(); new_ep.insert().unwrap();
let ep = dbqueries::get_episode_from_pk(new_ep.title(), new_ep.show_id()).unwrap(); let ep = dbqueries::get_episode_from_pk(new_ep.title(), new_ep.podcast_id()).unwrap();
assert_eq!(new_ep, ep); assert_eq!(new_ep, ep);
assert_eq!(&new_ep, &*EXPECTED_INTERCEPTED_2); assert_eq!(&new_ep, &*EXPECTED_INTERCEPTED_2);
@@ -599,15 +581,21 @@ mod tests {
let updated = &*UPDATED_DURATION_INTERCEPTED_1; let updated = &*UPDATED_DURATION_INTERCEPTED_1;
updated.update(old.rowid()).unwrap(); updated.update(old.rowid()).unwrap();
let new = dbqueries::get_episode_from_pk(old.title(), old.show_id()).unwrap(); let mut new = dbqueries::get_episode_from_pk(old.title(), old.podcast_id()).unwrap();
// Assert that updating does not change the rowid and show_id // Assert that updating does not change the rowid and podcast_id
assert_ne!(old, new); assert_ne!(old, new);
assert_eq!(old.rowid(), new.rowid()); 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_eq!(updated, &new);
assert_ne!(updated, &old); assert_ne!(updated, &old);
new.set_archive(true);
new.save().unwrap();
let new2 = dbqueries::get_episode_from_pk(old.title(), old.podcast_id()).unwrap();
assert_eq!(true, new2.archive());
} }
#[test] #[test]
@@ -620,7 +608,7 @@ mod tests {
// Second identical, This should take the early return path // Second identical, This should take the early return path
assert!(expected.index().is_ok()); assert!(expected.index().is_ok());
// Get the episode // Get the episode
let old = dbqueries::get_episode_from_pk(expected.title(), expected.show_id()).unwrap(); let old = dbqueries::get_episode_from_pk(expected.title(), expected.podcast_id()).unwrap();
// Assert that NewPodcast is equal to the Indexed one // Assert that NewPodcast is equal to the Indexed one
assert_eq!(*expected, old); assert_eq!(*expected, old);
@@ -629,22 +617,23 @@ mod tests {
// Update the podcast // Update the podcast
assert!(updated.index().is_ok()); assert!(updated.index().is_ok());
// Get the new Podcast // Get the new Podcast
let new = dbqueries::get_episode_from_pk(expected.title(), expected.show_id()).unwrap(); let new = dbqueries::get_episode_from_pk(expected.title(), expected.podcast_id()).unwrap();
// Assert it's diff from the old one. // Assert it's diff from the old one.
assert_ne!(new, old); assert_ne!(new, old);
assert_eq!(*updated, new); assert_eq!(*updated, new);
assert_eq!(new.rowid(), old.rowid()); assert_eq!(new.rowid(), old.rowid());
assert_eq!(new.show_id(), old.show_id()); assert_eq!(new.podcast_id(), old.podcast_id());
} }
#[test] #[test]
fn test_new_episode_to_episode() { fn test_new_episode_to_episode() {
let expected = &*EXPECTED_INTERCEPTED_1; let expected = &*EXPECTED_INTERCEPTED_1;
let updated = &*UPDATED_DURATION_INTERCEPTED_1;
// Assert insert() produces the same result that you would get with to_podcast() // Assert insert() produces the same result that you would get with to_podcast()
truncate_db().unwrap(); truncate_db().unwrap();
expected.insert().unwrap(); expected.insert().unwrap();
let old = dbqueries::get_episode_from_pk(expected.title(), expected.show_id()).unwrap(); let old = dbqueries::get_episode_from_pk(expected.title(), expected.podcast_id()).unwrap();
let ep = expected.to_episode().unwrap(); let ep = expected.to_episode().unwrap();
assert_eq!(old, ep); assert_eq!(old, ep);
@@ -653,7 +642,17 @@ mod tests {
let ep = expected.to_episode().unwrap(); let ep = expected.to_episode().unwrap();
// This should error as a unique constrain violation // This should error as a unique constrain violation
assert!(expected.insert().is_err()); assert!(expected.insert().is_err());
let old = dbqueries::get_episode_from_pk(expected.title(), expected.show_id()).unwrap(); let mut old =
dbqueries::get_episode_from_pk(expected.title(), expected.podcast_id()).unwrap();
assert_eq!(old, ep); assert_eq!(old, ep);
old.set_archive(true);
old.save().unwrap();
// Assert that it does not mess with user preferences
let ep = updated.to_episode().unwrap();
let old = dbqueries::get_episode_from_pk(expected.title(), expected.podcast_id()).unwrap();
assert_eq!(old, ep);
assert_eq!(old.archive(), true);
} }
} }
podcasts-data/src/models/new_show.rs → hammond-data/src/models/new_podcast.rs
+62 -46
View File
@@ -4,21 +4,21 @@ use diesel::prelude::*;
use rss; use rss;
use errors::DataError; use errors::DataError;
use models::Show; use models::Podcast;
use models::{Index, Insert, Update}; use models::{Index, Insert, Update};
use schema::shows; use schema::podcast;
use database::connection; use database::connection;
use dbqueries; use dbqueries;
use utils::url_cleaner; use utils::url_cleaner;
#[derive(Insertable, AsChangeset)] #[derive(Insertable, AsChangeset)]
#[table_name = "shows"] #[table_name = "podcast"]
#[derive(Debug, Clone, Default, Builder, PartialEq)] #[derive(Debug, Clone, Default, Builder, PartialEq)]
#[builder(default)] #[builder(default)]
#[builder(derive(Debug))] #[builder(derive(Debug))]
#[builder(setter(into))] #[builder(setter(into))]
pub(crate) struct NewShow { pub(crate) struct NewPodcast {
title: String, title: String,
link: String, link: String,
description: String, description: String,
@@ -26,15 +26,15 @@ pub(crate) struct NewShow {
source_id: i32, source_id: i32,
} }
impl Insert<()> for NewShow { impl Insert<()> for NewPodcast {
type Error = DataError; type Error = DataError;
fn insert(&self) -> Result<(), Self::Error> { fn insert(&self) -> Result<(), Self::Error> {
use schema::shows::dsl::*; use schema::podcast::dsl::*;
let db = connection(); let db = connection();
let con = db.get()?; let con = db.get()?;
diesel::insert_into(shows) diesel::insert_into(podcast)
.values(self) .values(self)
.execute(&con) .execute(&con)
.map(|_| ()) .map(|_| ())
@@ -42,16 +42,16 @@ impl Insert<()> for NewShow {
} }
} }
impl Update<()> for NewShow { impl Update<()> for NewPodcast {
type Error = DataError; type Error = DataError;
fn update(&self, show_id: i32) -> Result<(), Self::Error> { fn update(&self, podcast_id: i32) -> Result<(), Self::Error> {
use schema::shows::dsl::*; use schema::podcast::dsl::*;
let db = connection(); let db = connection();
let con = db.get()?; let con = db.get()?;
info!("Updating {}", self.title); info!("Updating {}", self.title);
diesel::update(shows.filter(id.eq(show_id))) diesel::update(podcast.filter(id.eq(podcast_id)))
.set(self) .set(self)
.execute(&con) .execute(&con)
.map(|_| ()) .map(|_| ())
@@ -61,7 +61,7 @@ impl Update<()> for NewShow {
// TODO: Maybe return an Enum<Action(Resut)> Instead. // TODO: Maybe return an Enum<Action(Resut)> Instead.
// It would make unti testing better too. // It would make unti testing better too.
impl Index<()> for NewShow { impl Index<()> for NewPodcast {
type Error = DataError; type Error = DataError;
fn index(&self) -> Result<(), DataError> { fn index(&self) -> Result<(), DataError> {
@@ -81,8 +81,8 @@ impl Index<()> for NewShow {
} }
} }
impl PartialEq<Show> for NewShow { impl PartialEq<Podcast> for NewPodcast {
fn eq(&self, other: &Show) -> bool { fn eq(&self, other: &Podcast) -> bool {
(self.link() == other.link()) (self.link() == other.link())
&& (self.title() == other.title()) && (self.title() == other.title())
&& (self.image_uri() == other.image_uri()) && (self.image_uri() == other.image_uri())
@@ -91,9 +91,9 @@ impl PartialEq<Show> for NewShow {
} }
} }
impl NewShow { impl NewPodcast {
/// Parses a `rss::Channel` into a `NewShow` Struct. /// Parses a `rss::Channel` into a `NewPodcast` Struct.
pub(crate) fn new(chan: &rss::Channel, source_id: i32) -> NewShow { pub(crate) fn new(chan: &rss::Channel, source_id: i32) -> NewPodcast {
let title = chan.title().trim(); let title = chan.title().trim();
let link = url_cleaner(chan.link().trim()); let link = url_cleaner(chan.link().trim());
@@ -111,7 +111,7 @@ impl NewShow {
// If itunes is None, try to get the channel.image from the rss spec // 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())); let image_uri = itunes_img.or_else(|| chan.image().map(|s| s.url().trim().to_owned()));
NewShowBuilder::default() NewPodcastBuilder::default()
.title(title) .title(title)
.description(description) .description(description)
.link(link) .link(link)
@@ -122,14 +122,14 @@ impl NewShow {
} }
// Look out for when tryinto lands into stable. // 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()?; self.index()?;
dbqueries::get_podcast_from_source_id(self.source_id).map_err(From::from) dbqueries::get_podcast_from_source_id(self.source_id).map_err(From::from)
} }
} }
// Ignore the following geters. They are used in unit tests mainly. // Ignore the following geters. They are used in unit tests mainly.
impl NewShow { impl NewPodcast {
#[allow(dead_code)] #[allow(dead_code)]
pub(crate) fn source_id(&self) -> i32 { pub(crate) fn source_id(&self) -> i32 {
self.source_id self.source_id
@@ -160,14 +160,14 @@ mod tests {
use rss::Channel; use rss::Channel;
use database::truncate_db; use database::truncate_db;
use models::NewShowBuilder; use models::{NewPodcastBuilder, Save};
use std::fs::File; use std::fs::File;
use std::io::BufReader; use std::io::BufReader;
// Pre-built expected NewShow structs. // Pre-built expected NewPodcast structs.
lazy_static! { lazy_static! {
static ref EXPECTED_INTERCEPTED: NewShow = { static ref EXPECTED_INTERCEPTED: NewPodcast = {
let descr = "The people behind The Intercept’s fearless reporting and incisive \ let descr = "The people behind The Intercept’s fearless reporting and incisive \
commentary—Jeremy Scahill, Glenn Greenwald, Betsy Reed and \ commentary—Jeremy Scahill, Glenn Greenwald, Betsy Reed and \
others—discuss the crucial issues of our time: national security, civil \ others—discuss the crucial issues of our time: national security, civil \
@@ -175,7 +175,7 @@ mod tests {
artists, thinkers, and newsmakers who challenge our preconceptions about \ artists, thinkers, and newsmakers who challenge our preconceptions about \
the world we live in."; the world we live in.";
NewShowBuilder::default() NewPodcastBuilder::default()
.title("Intercepted with Jeremy Scahill") .title("Intercepted with Jeremy Scahill")
.link("https://theintercept.com/podcasts") .link("https://theintercept.com/podcasts")
.description(descr) .description(descr)
@@ -188,12 +188,12 @@ mod tests {
.build() .build()
.unwrap() .unwrap()
}; };
static ref EXPECTED_LUP: NewShow = { static ref EXPECTED_LUP: NewPodcast = {
let descr = "An open show powered by community LINUX Unplugged takes the best \ let descr = "An open show powered by community LINUX Unplugged takes the best \
attributes of open collaboration and focuses them into a weekly \ attributes of open collaboration and focuses them into a weekly \
lifestyle show about Linux."; lifestyle show about Linux.";
NewShowBuilder::default() NewPodcastBuilder::default()
.title("LINUX Unplugged Podcast") .title("LINUX Unplugged Podcast")
.link("http://www.jupiterbroadcasting.com/") .link("http://www.jupiterbroadcasting.com/")
.description(descr) .description(descr)
@@ -204,7 +204,7 @@ mod tests {
.build() .build()
.unwrap() .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 \ 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. \ scenes of some of the best investigative journalism from recent years. \
Each episode we’ll be digging into an investigative scoop- hearing from \ Each episode we’ll be digging into an investigative scoop- hearing from \
@@ -215,7 +215,7 @@ mod tests {
complicated detective work that goes into doing great investigative \ complicated detective work that goes into doing great investigative \
journalism- then this is the podcast for you.</p>"; journalism- then this is the podcast for you.</p>";
NewShowBuilder::default() NewPodcastBuilder::default()
.title("The Tip Off") .title("The Tip Off")
.link("http://www.acast.com/thetipoff") .link("http://www.acast.com/thetipoff")
.description(desc) .description(desc)
@@ -227,7 +227,7 @@ mod tests {
.build() .build()
.unwrap() .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 \ 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 \ is a gripping noir science fiction thriller in 14 episodes: Forbidden \
love, a crashed UFO, an alien body, and an impossible heist unlike any \ love, a crashed UFO, an alien body, and an impossible heist unlike any \
@@ -237,7 +237,7 @@ mod tests {
b183-7311d2e436c3/b3a4aa57a576bb662191f2a6bc2a436c8c4ae256ecffaff5c4c54fd42e\ b183-7311d2e436c3/b3a4aa57a576bb662191f2a6bc2a436c8c4ae256ecffaff5c4c54fd42e\
923914941c264d01efb1833234b52c9530e67d28a8cebbe3d11a4bc0fbbdf13ecdf1c3.jpeg"; 923914941c264d01efb1833234b52c9530e67d28a8cebbe3d11a4bc0fbbdf13ecdf1c3.jpeg";
NewShowBuilder::default() NewPodcastBuilder::default()
.title("Steal the Stars") .title("Steal the Stars")
.link("http://tor-labs.com/") .link("http://tor-labs.com/")
.description(descr) .description(descr)
@@ -246,12 +246,12 @@ mod tests {
.build() .build()
.unwrap() .unwrap()
}; };
static ref EXPECTED_CODE: NewShow = { static ref EXPECTED_CODE: NewPodcast = {
let descr = "A podcast about humans and technology. Panelists: Coraline Ada Ehmke, \ let descr = "A podcast about humans and technology. Panelists: Coraline Ada Ehmke, \
David Brady, Jessica Kerr, Jay Bobo, Astrid Countee and Sam \ David Brady, Jessica Kerr, Jay Bobo, Astrid Countee and Sam \
Livingston-Gray. Brought to you by @therubyrep."; Livingston-Gray. Brought to you by @therubyrep.";
NewShowBuilder::default() NewPodcastBuilder::default()
.title("Greater Than Code") .title("Greater Than Code")
.link("https://www.greaterthancode.com/") .link("https://www.greaterthancode.com/")
.description(descr) .description(descr)
@@ -262,8 +262,8 @@ mod tests {
.build() .build()
.unwrap() .unwrap()
}; };
static ref EXPECTED_ELLINOFRENEIA: NewShow = { static ref EXPECTED_ELLINOFRENEIA: NewPodcast = {
NewShowBuilder::default() NewPodcastBuilder::default()
.title("Ελληνοφρένεια") .title("Ελληνοφρένεια")
.link("https://ellinofreneia.sealabs.net/feed.rss") .link("https://ellinofreneia.sealabs.net/feed.rss")
.description("Ανεπίσημο feed της Ελληνοφρένειας") .description("Ανεπίσημο feed της Ελληνοφρένειας")
@@ -272,8 +272,8 @@ mod tests {
.build() .build()
.unwrap() .unwrap()
}; };
static ref UPDATED_DESC_INTERCEPTED: NewShow = { static ref UPDATED_DESC_INTERCEPTED: NewPodcast = {
NewShowBuilder::default() NewPodcastBuilder::default()
.title("Intercepted with Jeremy Scahill") .title("Intercepted with Jeremy Scahill")
.link("https://theintercept.com/podcasts") .link("https://theintercept.com/podcasts")
.description("New Description") .description("New Description")
@@ -293,7 +293,7 @@ mod tests {
let file = File::open("tests/feeds/2018-01-20-Intercepted.xml").unwrap(); let file = File::open("tests/feeds/2018-01-20-Intercepted.xml").unwrap();
let channel = Channel::read_from(BufReader::new(file)).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); assert_eq!(*EXPECTED_INTERCEPTED, pd);
} }
@@ -302,7 +302,7 @@ mod tests {
let file = File::open("tests/feeds/2018-01-20-LinuxUnplugged.xml").unwrap(); let file = File::open("tests/feeds/2018-01-20-LinuxUnplugged.xml").unwrap();
let channel = Channel::read_from(BufReader::new(file)).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); assert_eq!(*EXPECTED_LUP, pd);
} }
@@ -311,7 +311,7 @@ mod tests {
let file = File::open("tests/feeds/2018-01-20-TheTipOff.xml").unwrap(); let file = File::open("tests/feeds/2018-01-20-TheTipOff.xml").unwrap();
let channel = Channel::read_from(BufReader::new(file)).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); assert_eq!(*EXPECTED_TIPOFF, pd);
} }
@@ -320,7 +320,7 @@ mod tests {
let file = File::open("tests/feeds/2018-01-20-StealTheStars.xml").unwrap(); let file = File::open("tests/feeds/2018-01-20-StealTheStars.xml").unwrap();
let channel = Channel::read_from(BufReader::new(file)).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); assert_eq!(*EXPECTED_STARS, pd);
} }
@@ -329,7 +329,7 @@ mod tests {
let file = File::open("tests/feeds/2018-01-20-GreaterThanCode.xml").unwrap(); let file = File::open("tests/feeds/2018-01-20-GreaterThanCode.xml").unwrap();
let channel = Channel::read_from(BufReader::new(file)).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); assert_eq!(*EXPECTED_CODE, pd);
} }
@@ -338,7 +338,7 @@ mod tests {
let file = File::open("tests/feeds/2018-03-28-Ellinofreneia.xml").unwrap(); let file = File::open("tests/feeds/2018-03-28-Ellinofreneia.xml").unwrap();
let channel = Channel::read_from(BufReader::new(file)).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); assert_eq!(*EXPECTED_ELLINOFRENEIA, pd);
} }
@@ -349,7 +349,7 @@ mod tests {
let file = File::open("tests/feeds/2018-01-20-Intercepted.xml").unwrap(); let file = File::open("tests/feeds/2018-01-20-Intercepted.xml").unwrap();
let channel = Channel::read_from(BufReader::new(file)).unwrap(); let channel = Channel::read_from(BufReader::new(file)).unwrap();
let npd = NewShow::new(&channel, 42); let npd = NewPodcast::new(&channel, 42);
npd.insert().unwrap(); npd.insert().unwrap();
let pd = dbqueries::get_podcast_from_source_id(42).unwrap(); let pd = dbqueries::get_podcast_from_source_id(42).unwrap();
@@ -369,13 +369,20 @@ mod tests {
let updated = &*UPDATED_DESC_INTERCEPTED; let updated = &*UPDATED_DESC_INTERCEPTED;
updated.update(old.id()).unwrap(); updated.update(old.id()).unwrap();
let new = dbqueries::get_podcast_from_source_id(42).unwrap(); let mut new = dbqueries::get_podcast_from_source_id(42).unwrap();
assert_ne!(old, new); assert_ne!(old, new);
assert_eq!(old.id(), new.id()); assert_eq!(old.id(), new.id());
assert_eq!(old.source_id(), new.source_id()); assert_eq!(old.source_id(), new.source_id());
assert_eq!(updated, &new); assert_eq!(updated, &new);
assert_ne!(updated, &old); assert_ne!(updated, &old);
// Chech that the update does not override user preferences.
new.set_archive(true);
new.save().unwrap();
let new2 = dbqueries::get_podcast_from_source_id(42).unwrap();
assert_eq!(true, new2.archive());
} }
#[test] #[test]
@@ -388,14 +395,14 @@ mod tests {
assert!(EXPECTED_INTERCEPTED.index().is_ok()); assert!(EXPECTED_INTERCEPTED.index().is_ok());
// Get the podcast // Get the podcast
let old = dbqueries::get_podcast_from_source_id(42).unwrap(); let old = dbqueries::get_podcast_from_source_id(42).unwrap();
// Assert that NewShow is equal to the Indexed one // Assert that NewPodcast is equal to the Indexed one
assert_eq!(&*EXPECTED_INTERCEPTED, &old); assert_eq!(&*EXPECTED_INTERCEPTED, &old);
let updated = &*UPDATED_DESC_INTERCEPTED; let updated = &*UPDATED_DESC_INTERCEPTED;
// Update the podcast // Update the podcast
assert!(updated.index().is_ok()); assert!(updated.index().is_ok());
// Get the new Show // Get the new Podcast
let new = dbqueries::get_podcast_from_source_id(42).unwrap(); let new = dbqueries::get_podcast_from_source_id(42).unwrap();
// Assert it's diff from the old one. // Assert it's diff from the old one.
assert_ne!(new, old); assert_ne!(new, old);
@@ -417,7 +424,16 @@ mod tests {
let pd = EXPECTED_INTERCEPTED.to_podcast().unwrap(); let pd = EXPECTED_INTERCEPTED.to_podcast().unwrap();
// This should error as a unique constrain violation // This should error as a unique constrain violation
assert!(EXPECTED_INTERCEPTED.insert().is_err()); assert!(EXPECTED_INTERCEPTED.insert().is_err());
let mut old = dbqueries::get_podcast_from_source_id(42).unwrap();
assert_eq!(old, pd);
old.set_archive(true);
old.save().unwrap();
// Assert that it does not mess with user preferences
let pd = UPDATED_DESC_INTERCEPTED.to_podcast().unwrap();
let old = dbqueries::get_podcast_from_source_id(42).unwrap(); let old = dbqueries::get_podcast_from_source_id(42).unwrap();
assert_eq!(old, pd); assert_eq!(old, pd);
assert_eq!(old.archive(), true);
} }
} }
podcasts-data/src/models/new_source.rs → hammond-data/src/models/new_source.rs
View File
podcasts-data/src/models/show.rs → hammond-data/src/models/podcast.rs
+66 -16
View File
@@ -3,37 +3,42 @@ use diesel::SaveChangesDsl;
use database::connection; use database::connection;
use errors::DataError; use errors::DataError;
use models::{Save, Source}; use models::{Save, Source};
use schema::shows; use schema::podcast;
use std::sync::Arc;
#[derive(Queryable, Identifiable, AsChangeset, Associations, PartialEq)] #[derive(Queryable, Identifiable, AsChangeset, Associations, PartialEq)]
#[belongs_to(Source, foreign_key = "source_id")] #[belongs_to(Source, foreign_key = "source_id")]
#[changeset_options(treat_none_as_null = "true")] #[changeset_options(treat_none_as_null = "true")]
#[table_name = "shows"] #[table_name = "podcast"]
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
/// Diesel Model of the shows table. /// Diesel Model of the podcast table.
pub struct Show { pub struct Podcast {
id: i32, id: i32,
title: String, title: String,
link: String, link: String,
description: String, description: String,
image_uri: Option<String>, image_uri: Option<String>,
favorite: bool,
archive: bool,
always_dl: bool,
source_id: i32, source_id: i32,
} }
impl Save<Show> for Show { impl Save<Podcast> for Podcast {
type Error = DataError; type Error = DataError;
/// Helper method to easily save/"sync" current state of self to the /// Helper method to easily save/"sync" current state of self to the
/// Database. /// Database.
fn save(&self) -> Result<Show, Self::Error> { fn save(&self) -> Result<Podcast, Self::Error> {
let db = connection(); let db = connection();
let tempdb = db.get()?; let tempdb = db.get()?;
self.save_changes::<Show>(&*tempdb).map_err(From::from) self.save_changes::<Podcast>(&*tempdb).map_err(From::from)
} }
} }
impl Show { impl Podcast {
/// Get the Feed `id`. /// Get the Feed `id`.
pub fn id(&self) -> i32 { pub fn id(&self) -> i32 {
self.id self.id
@@ -51,7 +56,7 @@ impl Show {
&self.link &self.link
} }
/// Set the Show/Feed `link`. /// Set the Podcast/Feed `link`.
pub fn set_link(&mut self, value: &str) { pub fn set_link(&mut self, value: &str) {
self.link = value.to_string(); self.link = value.to_string();
} }
@@ -78,6 +83,41 @@ impl Show {
self.image_uri = value.map(|x| x.to_string()); 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. /// `Source` table foreign key.
pub fn source_id(&self) -> i32 { pub fn source_id(&self) -> i32 {
self.source_id self.source_id
@@ -85,17 +125,17 @@ impl Show {
} }
#[derive(Queryable, Debug, Clone)] #[derive(Queryable, Debug, Clone)]
/// Diesel Model of the Show cover query. /// Diesel Model of the podcast cover query.
/// Used for fetching information about a Show's cover. /// Used for fetching information about a Podcast's cover.
pub struct ShowCoverModel { pub struct PodcastCoverQuery {
id: i32, id: i32,
title: String, title: String,
image_uri: Option<String>, image_uri: Option<String>,
} }
impl From<Show> for ShowCoverModel { impl From<Podcast> for PodcastCoverQuery {
fn from(p: Show) -> ShowCoverModel { fn from(p: Podcast) -> PodcastCoverQuery {
ShowCoverModel { PodcastCoverQuery {
id: p.id(), id: p.id(),
title: p.title, title: p.title,
image_uri: p.image_uri, image_uri: p.image_uri,
@@ -103,7 +143,17 @@ impl From<Show> for ShowCoverModel {
} }
} }
impl ShowCoverModel { impl From<Arc<Podcast>> for PodcastCoverQuery {
fn from(p: Arc<Podcast>) -> PodcastCoverQuery {
PodcastCoverQuery {
id: p.id(),
title: p.title.clone(),
image_uri: p.image_uri.clone(),
}
}
}
impl PodcastCoverQuery {
/// Get the Feed `id`. /// Get the Feed `id`.
pub fn id(&self) -> i32 { pub fn id(&self) -> i32 {
self.id self.id
podcasts-data/src/models/source.rs → hammond-data/src/models/source.rs
View File
podcasts-data/src/opml.rs → hammond-data/src/opml.rs
+1 -1
View File
@@ -35,7 +35,7 @@ pub fn import_to_db<R: Read>(reader: R) -> Result<Vec<Source>, reader::Error> {
.filter_map(|s| { .filter_map(|s| {
if let Err(ref err) = s { if let Err(ref err) = s {
let txt = "If you think this might be a bug please consider filling a report over \ let txt = "If you think this might be a bug please consider filling a report over \
at https://gitlab.gnome.org/World/podcasts/issues/new"; at https://gitlab.gnome.org/World/hammond/issues/new";
error!("Failed to import a Show: {}", err); error!("Failed to import a Show: {}", err);
error!("{}", txt); error!("{}", txt);
podcasts-data/src/parser.rs → hammond-data/src/parser.rs
View File
podcasts-data/src/pipeline.rs → hammond-data/src/pipeline.rs
+1 -1
View File
@@ -103,7 +103,7 @@ mod tests {
/// Insert feeds and update/index them. /// Insert feeds and update/index them.
fn test_pipeline() { fn test_pipeline() {
truncate_db().unwrap(); truncate_db().unwrap();
let bad_url = "https://gitlab.gnome.org/World/podcasts.atom"; let bad_url = "https://gitlab.gnome.org/World/hammond.atom";
// if a stream returns error/None it stops // if a stream returns error/None it stops
// bad we want to parse all feeds regardless if one fails // bad we want to parse all feeds regardless if one fails
Source::from_url(bad_url).unwrap(); Source::from_url(bad_url).unwrap();
podcasts-data/src/schema.rs → hammond-data/src/schema.rs
+9 -6
View File
@@ -1,7 +1,5 @@
#![allow(warnings)]
table! { table! {
episodes (title, show_id) { episode (title, podcast_id) {
rowid -> Integer, rowid -> Integer,
title -> Text, title -> Text,
uri -> Nullable<Text>, uri -> Nullable<Text>,
@@ -12,17 +10,22 @@ table! {
duration -> Nullable<Integer>, duration -> Nullable<Integer>,
guid -> Nullable<Text>, guid -> Nullable<Text>,
played -> Nullable<Integer>, played -> Nullable<Integer>,
show_id -> Integer, favorite -> Bool,
archive -> Bool,
podcast_id -> Integer,
} }
} }
table! { table! {
shows (id) { podcast (id) {
id -> Integer, id -> Integer,
title -> Text, title -> Text,
link -> Text, link -> Text,
description -> Text, description -> Text,
image_uri -> Nullable<Text>, image_uri -> Nullable<Text>,
favorite -> Bool,
archive -> Bool,
always_dl -> Bool,
source_id -> Integer, 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,);
podcasts-data/src/utils.rs → hammond-data/src/utils.rs
+11 -11
View File
@@ -7,7 +7,7 @@ use url::{Position, Url};
use dbqueries; use dbqueries;
use errors::DataError; use errors::DataError;
use models::{EpisodeCleanerModel, Save, Show}; use models::{EpisodeCleanerQuery, Podcast, Save};
use xdg_dirs::DL_DIR; use xdg_dirs::DL_DIR;
use std::fs; use std::fs;
@@ -59,7 +59,7 @@ fn played_cleaner(cleanup_date: DateTime<Utc>) -> Result<(), DataError> {
} }
/// Check `ep.local_uri` field and delete the file it points to. /// 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() { if ep.local_uri().is_some() {
let uri = ep.local_uri().unwrap().to_owned(); let uri = ep.local_uri().unwrap().to_owned();
if Path::new(&uri).exists() { if Path::new(&uri).exists() {
@@ -108,9 +108,9 @@ pub fn url_cleaner(s: &str) -> String {
} }
} }
/// Returns the URI of a Show Downloads given it's title. /// Returns the URI of a Podcast Downloads given it's title.
pub fn get_download_folder(pd_title: &str) -> Result<String, DataError> { 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); let download_fold = format!("{}/{}", DL_DIR.to_str().unwrap(), pd_title);
// Create the folder // Create the folder
@@ -123,7 +123,7 @@ pub fn get_download_folder(pd_title: &str) -> Result<String, DataError> {
/// Removes all the entries associated with the given show from the database, /// Removes all the entries associated with the given show from the database,
/// and deletes all of the downloaded content. /// and deletes all of the downloaded content.
// TODO: Write Tests // TODO: Write Tests
pub fn delete_show(pd: &Show) -> Result<(), DataError> { pub fn delete_show(pd: &Podcast) -> Result<(), DataError> {
dbqueries::remove_feed(pd)?; dbqueries::remove_feed(pd)?;
info!("{} was removed succesfully.", pd.title()); info!("{} was removed succesfully.", pd.title());
@@ -174,7 +174,7 @@ mod tests {
// Clean the db // Clean the db
truncate_db().unwrap(); truncate_db().unwrap();
// Setup tmp file stuff // Setup tmp file stuff
let tmp_dir = TempDir::new("podcasts_test").unwrap(); let tmp_dir = TempDir::new("hammond_test").unwrap();
let valid_path = tmp_dir.path().join("virtual_dl.mp3"); let valid_path = tmp_dir.path().join("virtual_dl.mp3");
let bad_path = tmp_dir.path().join("invalid_thing.mp3"); let bad_path = tmp_dir.path().join("invalid_thing.mp3");
let mut tmp_file = File::create(&valid_path).unwrap(); let mut tmp_file = File::create(&valid_path).unwrap();
@@ -183,7 +183,7 @@ mod tests {
// Setup episodes // Setup episodes
let n1 = NewEpisodeBuilder::default() let n1 = NewEpisodeBuilder::default()
.title("foo_bar".to_string()) .title("foo_bar".to_string())
.show_id(0) .podcast_id(0)
.build() .build()
.unwrap() .unwrap()
.to_episode() .to_episode()
@@ -191,14 +191,14 @@ mod tests {
let n2 = NewEpisodeBuilder::default() let n2 = NewEpisodeBuilder::default()
.title("bar_baz".to_string()) .title("bar_baz".to_string())
.show_id(1) .podcast_id(1)
.build() .build()
.unwrap() .unwrap()
.to_episode() .to_episode()
.unwrap(); .unwrap();
let mut ep1 = dbqueries::get_episode_from_pk(n1.title(), n1.show_id()).unwrap(); let mut ep1 = dbqueries::get_episode_from_pk(n1.title(), n1.podcast_id()).unwrap();
let mut ep2 = dbqueries::get_episode_from_pk(n2.title(), n2.show_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())); ep1.set_local_uri(Some(valid_path.to_str().unwrap()));
ep2.set_local_uri(Some(bad_path.to_str().unwrap())); ep2.set_local_uri(Some(bad_path.to_str().unwrap()));
@@ -230,7 +230,7 @@ mod tests {
#[test] #[test]
fn test_download_cleaner() { fn test_download_cleaner() {
let _tmp_dir = helper_db(); let _tmp_dir = helper_db();
let mut episode: EpisodeCleanerModel = let mut episode: EpisodeCleanerQuery =
dbqueries::get_episode_from_pk("foo_bar", 0).unwrap().into(); dbqueries::get_episode_from_pk("foo_bar", 0).unwrap().into();
let valid_path = episode.local_uri().unwrap().to_owned(); let valid_path = episode.local_uri().unwrap().to_owned();
podcasts-data/tests/feeds/2018-01-20-GreaterThanCode.xml → hammond-data/tests/feeds/2018-01-20-GreaterThanCode.xml
View File
podcasts-data/tests/feeds/2018-01-20-Intercepted.xml → hammond-data/tests/feeds/2018-01-20-Intercepted.xml
View File
podcasts-data/tests/feeds/2018-01-20-LinuxUnplugged.xml → hammond-data/tests/feeds/2018-01-20-LinuxUnplugged.xml
View File
podcasts-data/tests/feeds/2018-01-20-StealTheStars.xml → hammond-data/tests/feeds/2018-01-20-StealTheStars.xml
View File
podcasts-data/tests/feeds/2018-01-20-TheTipOff.xml → hammond-data/tests/feeds/2018-01-20-TheTipOff.xml
View File
podcasts-data/tests/feeds/2018-02-03-Intercepted.xml → hammond-data/tests/feeds/2018-02-03-Intercepted.xml
View File
podcasts-data/tests/feeds/2018-03-28-Ellinofreneia.xml → hammond-data/tests/feeds/2018-03-28-Ellinofreneia.xml
View File
podcasts-data/tests/feeds/notes.md → hammond-data/tests/feeds/notes.md
View File
podcasts-downloader/Cargo.toml → hammond-downloader/Cargo.toml
+7 -7
View File
@@ -1,22 +1,22 @@
[package] [package]
authors = ["Jordan Petridis <jordanpetridis@protonmail.com>"] authors = ["Jordan Petridis <jordanpetridis@protonmail.com>"]
name = "podcasts-downloader" name = "hammond-downloader"
version = "0.1.0" version = "0.1.0"
workspace = "../" workspace = "../"
[dependencies] [dependencies]
error-chain = "0.12.0" error-chain = "0.11.0"
hyper = "0.11.27" hyper = "0.11.27"
log = "0.4.3" log = "0.4.1"
mime_guess = "1.8.6" mime_guess = "1.8.4"
reqwest = "0.8.6" reqwest = "0.8.5"
tempdir = "0.3.7" tempdir = "0.3.7"
glob = "0.2.11" glob = "0.2.11"
failure = "0.1.1" failure = "0.1.1"
failure_derive = "0.1.1" failure_derive = "0.1.1"
[dependencies.podcasts-data] [dependencies.hammond-data]
path = "../podcasts-data" path = "../hammond-data"
[dev-dependencies] [dev-dependencies]
pretty_assertions = "0.5.1" pretty_assertions = "0.5.1"
podcasts-downloader/src/downloader.rs → hammond-downloader/src/downloader.rs
+12 -12
View File
@@ -11,8 +11,8 @@ use std::io::{BufWriter, Read, Write};
use std::path::Path; use std::path::Path;
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
use podcasts_data::xdg_dirs::PODCASTS_CACHE; use hammond_data::xdg_dirs::HAMMOND_CACHE;
use podcasts_data::{EpisodeWidgetModel, Save, ShowCoverModel}; use hammond_data::{EpisodeWidgetQuery, PodcastCoverQuery, Save};
// use failure::Error; // use failure::Error;
use errors::DownloadError; use errors::DownloadError;
@@ -78,7 +78,7 @@ fn download_into(
// Construct a temp file to save desired content. // Construct a temp file to save desired content.
// It has to be a `new_in` instead of new cause rename can't move cross // It has to be a `new_in` instead of new cause rename can't move cross
// filesystems. // 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(),); let out_file = format!("{}/temp.part", tempdir.path().to_str().unwrap(),);
ct_len.map(|x| { ct_len.map(|x| {
@@ -127,7 +127,7 @@ fn save_io(
info!("Downloading into: {}", file); info!("Downloading into: {}", file);
let chunk_size = match content_lenght { let chunk_size = match content_lenght {
Some(x) => x as usize / 99, 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)?); let mut writer = BufWriter::new(File::create(&file)?);
@@ -161,7 +161,7 @@ fn save_io(
// TODO: Refactor // TODO: Refactor
pub fn get_episode( pub fn get_episode(
ep: &mut EpisodeWidgetModel, ep: &mut EpisodeWidgetQuery,
download_folder: &str, download_folder: &str,
progress: Option<Arc<Mutex<DownloadProgress>>>, progress: Option<Arc<Mutex<DownloadProgress>>>,
) -> Result<(), DownloadError> { ) -> Result<(), DownloadError> {
@@ -196,7 +196,7 @@ pub fn get_episode(
Ok(()) Ok(())
} }
pub fn cache_image(pd: &ShowCoverModel) -> Result<String, DownloadError> { pub fn cache_image(pd: &PodcastCoverQuery) -> Result<String, DownloadError> {
let url = pd let url = pd
.image_uri() .image_uri()
.ok_or_else(|| DownloadError::NoImageLocation)? .ok_or_else(|| DownloadError::NoImageLocation)?
@@ -206,7 +206,7 @@ pub fn cache_image(pd: &ShowCoverModel) -> Result<String, DownloadError> {
return Err(DownloadError::NoImageLocation); return Err(DownloadError::NoImageLocation);
} }
let cache_path = PODCASTS_CACHE let cache_path = HAMMOND_CACHE
.to_str() .to_str()
.ok_or_else(|| DownloadError::InvalidCacheLocation)?; .ok_or_else(|| DownloadError::InvalidCacheLocation)?;
let cache_download_fold = format!("{}{}", cache_path, pd.title().to_owned()); let cache_download_fold = format!("{}{}", cache_path, pd.title().to_owned());
@@ -236,14 +236,14 @@ pub fn cache_image(pd: &ShowCoverModel) -> Result<String, DownloadError> {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;
use podcasts_data::dbqueries; use hammond_data::dbqueries;
use podcasts_data::pipeline; use hammond_data::pipeline;
use podcasts_data::Source; use hammond_data::Source;
use std::fs; use std::fs;
#[test] #[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. // to run it.
#[ignore] #[ignore]
fn test_cache_image() { fn test_cache_image() {
@@ -261,7 +261,7 @@ mod tests {
let img_path = cache_image(&pd); let img_path = cache_image(&pd);
let foo_ = format!( let foo_ = format!(
"{}{}/cover.jpeg", "{}{}/cover.jpeg",
PODCASTS_CACHE.to_str().unwrap(), HAMMOND_CACHE.to_str().unwrap(),
pd.title() pd.title()
); );
assert_eq!(img_path.unwrap(), foo_); assert_eq!(img_path.unwrap(), foo_);
podcasts-downloader/src/errors.rs → hammond-downloader/src/errors.rs
+1 -1
View File
@@ -1,4 +1,4 @@
use podcasts_data::errors::DataError; use hammond_data::errors::DataError;
use reqwest; use reqwest;
use std::io; use std::io;
hammond-downloader/src/lib.rs
+25
View File
@@ -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;
podcasts-gtk/Cargo.toml → hammond-gtk/Cargo.toml
+16 -18
View File
@@ -1,32 +1,30 @@
[package] [package]
authors = ["Jordan Petridis <jordanpetridis@protonmail.com>"] authors = ["Jordan Petridis <jordanpetridis@protonmail.com>"]
build = "build.rs" build = "build.rs"
name = "podcasts-gtk" name = "hammond-gtk"
version = "0.1.0" version = "0.1.0"
workspace = "../" workspace = "../"
[dependencies] [dependencies]
chrono = "0.4.4" chrono = "0.4.2"
crossbeam-channel = "0.2.3" crossbeam-channel = "0.1.2"
gdk = "0.8.0" gdk = "0.8.0"
gdk-pixbuf = "0.4.0" gdk-pixbuf = "0.4.0"
glib = "0.5.0" glib = "0.5.0"
gstreamer = "0.11.4"
gstreamer-player = "0.11.3"
humansize = "1.1.0" humansize = "1.1.0"
lazy_static = "1.0.2" lazy_static = "1.0.0"
log = "0.4.3" log = "0.4.1"
loggerv = "0.7.1" loggerv = "0.7.1"
open = "1.2.1" open = "1.2.1"
rayon = "1.0.2" rayon = "1.0.1"
send-cell = "0.1.3" send-cell = "0.1.3"
url = "1.7.1" url = "1.7.0"
failure = "0.1.1" failure = "0.1.1"
failure_derive = "0.1.1" failure_derive = "0.1.1"
regex = "1.0.2" regex = "1.0.0"
reqwest = "0.8.6" reqwest = "0.8.5"
serde_json = "1.0.24" serde_json = "1.0.17"
html2text = "0.1.8" html2pango = { git = "https://gitlab.gnome.org/World/html2pango" }
[dependencies.gtk] [dependencies.gtk]
features = ["v3_22"] features = ["v3_22"]
@@ -34,13 +32,13 @@ version = "0.4.1"
[dependencies.gio] [dependencies.gio]
features = ["v2_50"] features = ["v2_50"]
version = "0.4.1" version = "0.4.0"
[dependencies.podcasts-data] [dependencies.hammond-data]
path = "../podcasts-data" path = "../hammond-data"
[dependencies.podcasts-downloader] [dependencies.hammond-downloader]
path = "../podcasts-downloader" path = "../hammond-downloader"
[dev-dependencies] [dev-dependencies]
pretty_assertions = "0.5.1" pretty_assertions = "0.5.1"
podcasts-gtk/build.rs → hammond-gtk/build.rs
-4
View File
@@ -1,10 +1,6 @@
use std::process::Command; use std::process::Command;
fn main() { fn main() {
// Rerun the build script when files in the resources folder are changed.
println!("cargo:rerun-if-changed=resources");
println!("cargo:rerun-if-changed=resources/*");
Command::new("glib-compile-resources") Command::new("glib-compile-resources")
.args(&["--generate", "resources.xml"]) .args(&["--generate", "resources.xml"])
.current_dir("resources") .current_dir("resources")
podcasts-gtk/resources/gtk/empty_show.ui → hammond-gtk/resources/gtk/empty_show.ui
View File
hammond-gtk/resources/gtk/empty_view.ui
+91
View File
@@ -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>
podcasts-gtk/resources/gtk/episode_widget.ui → hammond-gtk/resources/gtk/episode_widget.ui
+45 -25
View File
@@ -35,8 +35,6 @@ Tobias Bernard
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="valign">center</property> <property name="valign">center</property>
<property name="margin_left">6</property>
<property name="margin_right">6</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
@@ -175,7 +173,7 @@ Tobias Bernard
<object class="GtkLabel" id="total_size"> <object class="GtkLabel" id="total_size">
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="no_show_all">True</property> <property name="no_show_all">True</property>
<property name="label" translatable="yes">Calculating episode size...</property> <property name="label" translatable="yes">XX MB</property>
<property name="single_line_mode">True</property> <property name="single_line_mode">True</property>
<property name="track_visited_links">False</property> <property name="track_visited_links">False</property>
<style> <style>
@@ -209,41 +207,24 @@ Tobias Bernard
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="layout_style">center</property> <property name="layout_style">center</property>
<child> <child>
<object class="GtkButton" id="cancel_button"> <object class="GtkButton" id="desc_button">
<property name="label" translatable="yes">Cancel</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="download_button">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Download this episode</property>
<property name="halign">center</property> <property name="halign">center</property>
<property name="valign">center</property> <property name="valign">center</property>
<property name="always_show_image">True</property>
<child> <child>
<object class="GtkImage"> <object class="GtkImage">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="icon_name">document-save-symbolic</property> <property name="icon_name">view-paged-symbolic</property>
</object> </object>
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">False</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">0</property>
<property name="non_homogeneous">True</property> <property name="non_homogeneous">True</property>
</packing> </packing>
</child> </child>
@@ -270,6 +251,45 @@ Tobias Bernard
<property name="non_homogeneous">True</property> <property name="non_homogeneous">True</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkButton" id="download_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Download this episode</property>
<property name="halign">center</property>
<property name="valign">center</property>
<property name="always_show_image">True</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">document-save-symbolic</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">3</property>
<property name="non_homogeneous">True</property>
</packing>
</child>
<child>
<object class="GtkButton" id="cancel_button">
<property name="label" translatable="yes">Cancel</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="pack_type">end</property>
<property name="position">3</property>
</packing>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
podcasts-gtk/resources/gtk/home_view.ui → hammond-gtk/resources/gtk/episodes_view.ui
+2 -2
View File
@@ -32,8 +32,8 @@ Tobias Bernard
<!-- interface-authors Jordan Petridis\nTobias Bernard --> <!-- interface-authors Jordan Petridis\nTobias Bernard -->
<object class="GtkBox" id="container"> <object class="GtkBox" id="container">
<property name="name">container</property> <property name="name">container</property>
<property name="width_request">290</property> <property name="width_request">400</property>
<property name="height_request">420</property> <property name="height_request">600</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
podcasts-gtk/resources/gtk/home_episode.ui → hammond-gtk/resources/gtk/episodes_view_widget.ui
+2 -1
View File
@@ -36,11 +36,12 @@ Tobias Bernard
<property name="valign">center</property> <property name="valign">center</property>
<property name="margin_top">6</property> <property name="margin_top">6</property>
<property name="margin_bottom">6</property> <property name="margin_bottom">6</property>
<property name="spacing">6</property>
<child> <child>
<object class="GtkImage" id="cover"> <object class="GtkImage" id="cover">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">8</property> <property name="margin_left">6</property>
<property name="pixel_size">64</property> <property name="pixel_size">64</property>
<property name="icon_name">image-x-generic-symbolic</property> <property name="icon_name">image-x-generic-symbolic</property>
</object> </object>
podcasts-gtk/resources/gtk/headerbar.ui → hammond-gtk/resources/gtk/headerbar.ui
+3 -26
View File
@@ -151,10 +151,9 @@ Tobias Bernard
<object class="GtkMenuButton" id="add_toggle"> <object class="GtkMenuButton" id="add_toggle">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">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="tooltip_text" translatable="yes">Add a new feed</property>
<property name="valign">center</property> <property name="valign">center</property>
<property name="popover">add_popover</property>
<child> <child>
<object class="GtkImage" id="add-button-image2"> <object class="GtkImage" id="add-button-image2">
<property name="visible">True</property> <property name="visible">True</property>
@@ -258,11 +257,12 @@ Tobias Bernard
</object> </object>
</child> </child>
<child> <child>
<object class="GtkMenuButton" id="hamburger"> <object class="GtkMenuButton" id="menu_button">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="valign">center</property> <property name="valign">center</property>
<property name="use_popover">True</property>
<child> <child>
<object class="GtkImage"> <object class="GtkImage">
<property name="visible">True</property> <property name="visible">True</property>
@@ -280,28 +280,5 @@ Tobias Bernard
<property name="position">2</property> <property name="position">2</property>
</packing> </packing>
</child> </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> </object>
</interface> </interface>
podcasts-gtk/resources/gtk/help-overlay.ui → hammond-gtk/resources/gtk/help-overlay.ui
-7
View File
@@ -18,13 +18,6 @@
<property name="title" translatable="yes" context="shortcut window">Check for new episodes</property> <property name="title" translatable="yes" context="shortcut window">Check for new episodes</property>
</object> </object>
</child> </child>
<child>
<object class="GtkShortcutsShortcut">
<property name="visible">True</property>
<property name="accelerator">&lt;primary&gt;e</property>
<property name="title" translatable="yes" context="shortcut window">Preferences</property>
</object>
</child>
<child> <child>
<object class="GtkShortcutsShortcut"> <object class="GtkShortcutsShortcut">
<property name="visible">True</property> <property name="visible">True</property>
podcasts-gtk/resources/gtk/inapp_notif.ui → hammond-gtk/resources/gtk/inapp_notif.ui
View File
podcasts-gtk/resources/gtk/hamburger.ui → hammond-gtk/resources/gtk/menus.ui
+12 -13
View File
@@ -5,23 +5,22 @@
<section> <section>
<item> <item>
<attribute name="label" translatable="yes">_Check for new episodes</attribute> <attribute name="label" translatable="yes">_Check for new episodes</attribute>
<attribute name="action">win.refresh</attribute> <attribute name="action">app.refresh</attribute>
<attribute name="accel">&lt;primary&gt;r</attribute> <attribute name="accel">&lt;primary&gt;r</attribute>
</item> </item>
<item> <item>
<attribute name="label" translatable="yes">_Import Shows</attribute> <attribute name="label" translatable="yes">_Import Shows</attribute>
<attribute name="action">win.import</attribute> <attribute name="action">app.import</attribute>
</item>
<item>
<attribute name="label" translatable="yes">_Export Shows</attribute>
<attribute name="action">app.export</attribute>
</item> </item>
<!-- <item> -->
<!-- <attribute name="label" translatable="yes">_Export Shows</attribute> -->
<!-- <attribute name="action">win.export</attribute> -->
<!-- </item> -->
</section> </section>
<section> <section>
<item> <item>
<attribute name="label" translatable="yes">_Preferences</attribute> <attribute name="label" translatable="yes">_Preferences</attribute>
<attribute name="action">win.preferences</attribute> <attribute name="action">app.preferences</attribute>
<attribute name="accel">&lt;primary&gt;e</attribute>
</item> </item>
</section> </section>
<section> <section>
@@ -29,13 +28,13 @@
<attribute name="label" translatable="yes">_Keyboard Shortcuts</attribute> <attribute name="label" translatable="yes">_Keyboard Shortcuts</attribute>
<attribute name="action">win.show-help-overlay</attribute> <attribute name="action">win.show-help-overlay</attribute>
</item> </item>
<!-- <item> --> <item>
<!-- <attribute name="label" translatable="yes">_Help</attribute> --> <attribute name="label" translatable="yes">_Help</attribute>
<!-- <attribute name="action">win.help</attribute> --> <attribute name="action">app.help</attribute>
<!-- </item> --> </item>
<item> <item>
<attribute name="label" translatable="yes">_About</attribute> <attribute name="label" translatable="yes">_About</attribute>
<attribute name="action">win.about</attribute> <attribute name="action">app.about</attribute>
</item> </item>
</section> </section>
</menu> </menu>
podcasts-gtk/resources/gtk/show_widget.ui → hammond-gtk/resources/gtk/show_widget.ui
+72 -4
View File
@@ -31,8 +31,8 @@ Tobias Bernard
<!-- interface-copyright 2017 - 2018 --> <!-- interface-copyright 2017 - 2018 -->
<!-- interface-authors Jordan Petridis\nTobias Bernard --> <!-- interface-authors Jordan Petridis\nTobias Bernard -->
<object class="GtkBox" id="container"> <object class="GtkBox" id="container">
<property name="width_request">290</property> <property name="width_request">400</property>
<property name="height_request">420</property> <property name="height_request">600</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
@@ -79,7 +79,7 @@ Tobias Bernard
<property name="margin_bottom">32</property> <property name="margin_bottom">32</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">6</property> <property name="spacing">24</property>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
@@ -133,11 +133,79 @@ Sorry, we could not find a description for this Show.</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </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> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">False</property> <property name="fill">False</property>
<property name="padding">6</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
podcasts-gtk/resources/gtk/shows_child.ui → hammond-gtk/resources/gtk/shows_child.ui
View File
podcasts-gtk/resources/gtk/shows_view.ui → hammond-gtk/resources/gtk/shows_view.ui
+1 -3
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.0 <!-- Generated with glade 3.21.0
Copyright (C) 2017 - 2018 Copyright (C) 2017 - 2018
@@ -32,8 +32,6 @@ Tobias Bernard
<!-- interface-authors Jordan Petridis\nTobias Bernard --> <!-- interface-authors Jordan Petridis\nTobias Bernard -->
<object class="GtkBox" id="fb_parent"> <object class="GtkBox" id="fb_parent">
<property name="name">fb_parent</property> <property name="name">fb_parent</property>
<property name="width_request">290</property>
<property name="height_request">420</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
podcasts-gtk/resources/gtk/style.css → hammond-gtk/resources/gtk/style.css
-9
View File
@@ -9,12 +9,3 @@ row:last-child {
list, border { list, border {
border-radius: 4px; border-radius: 4px;
} }
.player-episode-label {
font-weight: bold;
font-size: smaller;
}
.player-show-label {
font-size: smaller;
}
hammond-gtk/resources/meson.build
+6
View File
@@ -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
+36
View File
@@ -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
+11
View File
@@ -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
podcasts-gtk/resources/org.gnome.Podcasts.gschema.xml → hammond-gtk/resources/org.gnome.Hammond.gschema.xml
+4 -4
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<schemalist> <schemalist>
<enum id="org.gnome.Podcasts.timePeriods"> <enum id="org.gnome.Hammond.timePeriods">
<value nick="seconds" value="1"/> <value nick="seconds" value="1"/>
<value nick="minutes" value="2"/> <value nick="minutes" value="2"/>
<value nick="hours" value="3"/> <value nick="hours" value="3"/>
@@ -9,7 +9,7 @@
<value nick="months" value="6"/> <value nick="months" value="6"/>
</enum> </enum>
<schema path="/org/gnome/Podcasts/" id="org.gnome.Podcasts"> <schema path="/org/gnome/hammond/" id="org.gnome.Hammond">
<key name="persist-window-geometry-top" type="i"> <key name="persist-window-geometry-top" type="i">
<default>-1</default> <default>-1</default>
<summary>Top position of the last open main window</summary> <summary>Top position of the last open main window</summary>
@@ -45,7 +45,7 @@
<default>1</default> <default>1</default>
<summary>How many periods of time to wait between automatic refreshes</summary> <summary>How many periods of time to wait between automatic refreshes</summary>
</key> </key>
<key name="refresh-interval-period" enum="org.gnome.Podcasts.timePeriods"> <key name="refresh-interval-period" enum="org.gnome.Hammond.timePeriods">
<default>'hours'</default> <default>'hours'</default>
<summary>What period of time to wait between automatic refreshes</summary> <summary>What period of time to wait between automatic refreshes</summary>
</key> </key>
@@ -59,7 +59,7 @@
<default>2</default> <default>2</default>
<summary>How many periods of time to wait between automatic cleanups</summary> <summary>How many periods of time to wait between automatic cleanups</summary>
</key> </key>
<key name="cleanup-age-period" enum="org.gnome.Podcasts.timePeriods"> <key name="cleanup-age-period" enum="org.gnome.Hammond.timePeriods">
<default>'days'</default> <default>'days'</default>
<summary>What period of time to wait between automatic cleanups</summary> <summary>What period of time to wait between automatic cleanups</summary>
</key> </key>
podcasts-gtk/resources/resources.xml → hammond-gtk/resources/resources.xml
+4 -9
View File
@@ -1,23 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<gresources> <gresources>
<gresource prefix="/org/gnome/Podcasts/"> <gresource prefix="/org/gnome/Hammond/">
<file compressed="true" preprocess="xml-stripblanks">gtk/episode_widget.ui</file> <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/show_widget.ui</file>
<file compressed="true" preprocess="xml-stripblanks">gtk/empty_view.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/empty_show.ui</file>
<file compressed="true" preprocess="xml-stripblanks">gtk/home_view.ui</file> <file compressed="true" preprocess="xml-stripblanks">gtk/episodes_view.ui</file>
<file compressed="true" preprocess="xml-stripblanks">gtk/home_episode.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_view.ui</file>
<file compressed="true" preprocess="xml-stripblanks">gtk/shows_child.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/headerbar.ui</file>
<file compressed="true" preprocess="xml-stripblanks">gtk/inapp_notif.ui</file> <file compressed="true" preprocess="xml-stripblanks">gtk/inapp_notif.ui</file>
<file compressed="true" preprocess="xml-stripblanks">gtk/hamburger.ui</file> <file compressed="true" preprocess="xml-stripblanks">gtk/menus.ui</file>
<file compressed="true" preprocess="xml-stripblanks">gtk/show_menu.ui</file>
<file compressed="true" preprocess="xml-stripblanks">gtk/help-overlay.ui</file> <file compressed="true" preprocess="xml-stripblanks">gtk/help-overlay.ui</file>
<file compressed="true" preprocess="xml-stripblanks">gtk/player_toolbar.ui</file>
<file compressed="true" preprocess="xml-stripblanks">icons/skip-back-symbolic.svg</file>
<file compressed="true" preprocess="xml-stripblanks">icons/skip-forward-symbolic.svg</file>
<file compressed="true" preprocess="xml-stripblanks">gtk/prefs.ui</file>
<file compressed="true">gtk/style.css</file> <file compressed="true">gtk/style.css</file>
</gresource> </gresource>
</gresources> </gresources>
hammond-gtk/src/app.rs
+299
View File
@@ -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
+223
View File
@@ -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(())
}
}
}
podcasts-gtk/src/main.rs → hammond-gtk/src/main.rs
+7 -42
View File
@@ -1,48 +1,15 @@
#![cfg_attr( #![cfg_attr(
feature = "cargo-clippy", feature = "cargo-clippy",
allow( allow(clone_on_ref_ptr, blacklisted_name, match_same_arms, option_map_unit_fn)
clone_on_ref_ptr,
blacklisted_name,
match_same_arms,
option_map_unit_fn
)
)] )]
#![allow(unknown_lints)] #![allow(unknown_lints)]
// Enable lint group collections #![warn(unused_extern_crates, unused)]
#![warn(
nonstandard_style,
edition_2018,
rust_2018_idioms,
bad_style,
unused
)]
// standalone lints
#![warn(
const_err,
improper_ctypes,
non_shorthand_field_patterns,
no_mangle_generic_items,
overflowing_literals,
plugin_as_library,
private_no_mangle_fns,
private_no_mangle_statics,
unconditional_recursion,
unions_with_drop_fields,
while_true,
missing_debug_implementations,
trivial_casts,
trivial_numeric_casts,
elided_lifetime_in_paths,
missing_copy_implementations
)]
#![deny(warnings)] #![deny(warnings)]
extern crate gdk; extern crate gdk;
extern crate gdk_pixbuf; extern crate gdk_pixbuf;
extern crate gio; extern crate gio;
extern crate glib; extern crate glib;
extern crate gstreamer as gst;
extern crate gstreamer_player as gst_player;
extern crate gtk; extern crate gtk;
#[macro_use] #[macro_use]
@@ -60,12 +27,12 @@ extern crate pretty_assertions;
extern crate chrono; extern crate chrono;
extern crate crossbeam_channel; extern crate crossbeam_channel;
extern crate html2text; extern crate hammond_data;
extern crate hammond_downloader;
extern crate html2pango;
extern crate humansize; extern crate humansize;
extern crate loggerv; extern crate loggerv;
extern crate open; extern crate open;
extern crate podcasts_data;
extern crate podcasts_downloader;
extern crate rayon; extern crate rayon;
extern crate regex; extern crate regex;
extern crate reqwest; extern crate reqwest;
@@ -101,7 +68,6 @@ mod widgets;
mod app; mod app;
mod headerbar; mod headerbar;
mod prefs;
mod manager; mod manager;
mod settings; mod settings;
@@ -114,17 +80,16 @@ fn main() {
// TODO: make the the logger a cli -vv option // TODO: make the the logger a cli -vv option
loggerv::init_with_level(Level::Info).expect("Error initializing loggerv."); loggerv::init_with_level(Level::Info).expect("Error initializing loggerv.");
gtk::init().expect("Error initializing gtk."); gtk::init().expect("Error initializing gtk.");
gst::init().expect("Error initializing gstreamer");
static_resource::init().expect("Something went wrong with the resource file initialization."); static_resource::init().expect("Something went wrong with the resource file initialization.");
// Add custom style // Add custom style
let provider = gtk::CssProvider::new(); let provider = gtk::CssProvider::new();
gtk::CssProvider::load_from_resource(&provider, "/org/gnome/Podcasts/gtk/style.css"); gtk::CssProvider::load_from_resource(&provider, "/org/gnome/Hammond/gtk/style.css");
gtk::StyleContext::add_provider_for_screen( gtk::StyleContext::add_provider_for_screen(
&gdk::Screen::get_default().expect("Error initializing gtk css provider."), &gdk::Screen::get_default().expect("Error initializing gtk css provider."),
&provider, &provider,
600, 600,
); );
App::run(); App::new().run();
} }
podcasts-gtk/src/manager.rs → hammond-gtk/src/manager.rs
+9 -9
View File
@@ -1,9 +1,9 @@
use failure::Error; use failure::Error;
use rayon; use rayon;
// use podcasts_data::Episode; // use hammond_data::Episode;
use podcasts_data::dbqueries; use hammond_data::dbqueries;
use podcasts_downloader::downloader::{get_episode, DownloadProgress}; use hammond_downloader::downloader::{get_episode, DownloadProgress};
use std::collections::HashMap; use std::collections::HashMap;
use std::sync::{Arc, Mutex, RwLock}; use std::sync::{Arc, Mutex, RwLock};
@@ -110,19 +110,19 @@ pub fn add(id: i32, directory: String) -> Result<(), Error> {
mod tests { mod tests {
use super::*; use super::*;
use podcasts_data::dbqueries; use hammond_data::dbqueries;
use podcasts_data::pipeline; use hammond_data::pipeline;
use podcasts_data::utils::get_download_folder; use hammond_data::utils::get_download_folder;
use podcasts_data::{Episode, Source}; use hammond_data::{Episode, Source};
use podcasts_downloader::downloader::get_episode; use hammond_downloader::downloader::get_episode;
use std::fs; use std::fs;
use std::path::Path; use std::path::Path;
use std::{thread, time}; use std::{thread, time};
#[test] #[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. // to run it.
#[ignore] #[ignore]
// THIS IS NOT A RELIABLE TEST // THIS IS NOT A RELIABLE TEST
podcasts-gtk/src/settings.rs → hammond-gtk/src/settings.rs
View File
podcasts-gtk/src/stacks/content.rs → hammond-gtk/src/stacks/content.rs
+10 -7
View File
@@ -19,21 +19,20 @@ pub struct Content {
} }
impl Content { impl Content {
pub fn new(sender: &Sender<Action>) -> Result<Rc<Content>, Error> { pub fn new(sender: Sender<Action>) -> Result<Content, Error> {
let stack = gtk::Stack::new(); let stack = gtk::Stack::new();
let home = Rc::new(RefCell::new(HomeStack::new(sender.clone())?)); let home = Rc::new(RefCell::new(HomeStack::new(sender.clone())?));
let shows = Rc::new(RefCell::new(ShowStack::new(sender.clone()))); let shows = Rc::new(RefCell::new(ShowStack::new(sender.clone())?));
stack.add_titled(&home.borrow().get_stack(), "home", "New"); stack.add_titled(&home.borrow().get_stack(), "home", "Recent");
stack.add_titled(&shows.borrow().get_stack(), "shows", "Shows"); stack.add_titled(&shows.borrow().get_stack(), "shows", "Shows");
let con = Content { Ok(Content {
stack, stack,
shows, shows,
home, home,
sender: sender.clone(), sender,
}; })
Ok(Rc::new(con))
} }
pub fn update(&self) { pub fn update(&self) {
@@ -86,4 +85,8 @@ impl Content {
pub fn get_shows(&self) -> Rc<RefCell<ShowStack>> { pub fn get_shows(&self) -> Rc<RefCell<ShowStack>> {
self.shows.clone() 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())
}
} }
podcasts-gtk/src/stacks/home.rs → hammond-gtk/src/stacks/home.rs
+2 -2
View File
@@ -4,8 +4,8 @@ use gtk::StackTransitionType;
use crossbeam_channel::Sender; use crossbeam_channel::Sender;
use failure::Error; use failure::Error;
use podcasts_data::dbqueries::is_episodes_populated; use hammond_data::dbqueries::is_episodes_populated;
use podcasts_data::errors::DataError; use hammond_data::errors::DataError;
use app::Action; use app::Action;
use widgets::{EmptyView, HomeView}; use widgets::{EmptyView, HomeView};
podcasts-gtk/src/stacks/mod.rs → hammond-gtk/src/stacks/mod.rs
View File
podcasts-gtk/src/stacks/populated.rs → hammond-gtk/src/stacks/populated.rs
+16 -12
View File
@@ -5,8 +5,8 @@ use gtk::StackTransitionType;
use crossbeam_channel::Sender; use crossbeam_channel::Sender;
use failure::Error; use failure::Error;
use podcasts_data::dbqueries; use hammond_data::dbqueries;
use podcasts_data::Show; use hammond_data::Podcast;
use app::Action; use app::Action;
use widgets::{ShowWidget, ShowsView}; use widgets::{ShowWidget, ShowsView};
@@ -31,10 +31,10 @@ pub struct PopulatedStack {
} }
impl PopulatedStack { impl PopulatedStack {
pub fn new(sender: Sender<Action>) -> PopulatedStack { pub fn new(sender: Sender<Action>) -> Result<PopulatedStack, Error> {
let stack = gtk::Stack::new(); let stack = gtk::Stack::new();
let state = PopulatedState::View; let state = PopulatedState::View;
let populated = ShowsView::new(sender.clone()); let populated = ShowsView::new(sender.clone())?;
let show = Rc::new(ShowWidget::default()); let show = Rc::new(ShowWidget::default());
let container = gtk::Box::new(gtk::Orientation::Horizontal, 0); let container = gtk::Box::new(gtk::Orientation::Horizontal, 0);
@@ -43,14 +43,16 @@ impl PopulatedStack {
container.add(&stack); container.add(&stack);
container.show_all(); container.show_all();
PopulatedStack { let show = PopulatedStack {
container, container,
stack, stack,
populated, populated,
show, show,
state, state,
sender, sender,
} };
Ok(show)
} }
pub fn update(&mut self) { pub fn update(&mut self) {
@@ -78,7 +80,7 @@ impl PopulatedStack {
.map_err(|err| error!("Failed to set episodes_view allignment: {}", err)) .map_err(|err| error!("Failed to set episodes_view allignment: {}", err))
.ok(); .ok();
let pop = ShowsView::new(self.sender.clone()); let pop = ShowsView::new(self.sender.clone())?;
self.populated = pop; self.populated = pop;
self.stack.remove(old); self.stack.remove(old);
self.stack.add_named(&self.populated.container, "shows"); self.stack.add_named(&self.populated.container, "shows");
@@ -87,11 +89,13 @@ impl PopulatedStack {
Ok(()) Ok(())
} }
pub fn replace_widget(&mut self, pd: Arc<Show>) -> Result<(), Error> { pub fn replace_widget(&mut self, pd: Arc<Podcast>) -> Result<(), Error> {
let old = self.show.container.clone(); let old = self.show.container.clone();
// save the ShowWidget vertical scrollabar alignment // save the ShowWidget vertical scrollabar alignment
self.show.show_id().map(|id| self.show.save_vadjustment(id)); self.show
.podcast_id()
.map(|id| self.show.save_vadjustment(id));
let new = ShowWidget::new(pd, self.sender.clone()); let new = ShowWidget::new(pd, self.sender.clone());
self.show = new; self.show = new;
@@ -109,7 +113,7 @@ impl PopulatedStack {
pub fn update_widget(&mut self) -> Result<(), Error> { pub fn update_widget(&mut self) -> Result<(), Error> {
let old = self.show.container.clone(); let old = self.show.container.clone();
let id = self.show.show_id(); let id = self.show.podcast_id();
if id.is_none() { if id.is_none() {
return Ok(()); return Ok(());
} }
@@ -127,9 +131,9 @@ impl PopulatedStack {
Ok(()) Ok(())
} }
// Only update widget if its show_id is equal to pid. // Only update widget if its podcast_id is equal to pid.
pub fn update_widget_if_same(&mut self, pid: i32) -> Result<(), Error> { pub fn update_widget_if_same(&mut self, pid: i32) -> Result<(), Error> {
if self.show.show_id() != Some(pid) { if self.show.podcast_id() != Some(pid) {
debug!("Different widget. Early return"); debug!("Different widget. Early return");
return Ok(()); return Ok(());
} }
podcasts-gtk/src/stacks/show.rs → hammond-gtk/src/stacks/show.rs
+5 -6
View File
@@ -3,7 +3,7 @@ use gtk::prelude::*;
use crossbeam_channel::Sender; use crossbeam_channel::Sender;
use failure::Error; use failure::Error;
use podcasts_data::dbqueries::is_podcasts_populated; use hammond_data::dbqueries::is_podcasts_populated;
use app::Action; use app::Action;
use stacks::PopulatedStack; use stacks::PopulatedStack;
@@ -29,8 +29,8 @@ pub struct ShowStack {
} }
impl ShowStack { impl ShowStack {
pub fn new(sender: Sender<Action>) -> Self { pub fn new(sender: Sender<Action>) -> Result<Self, Error> {
let populated = Rc::new(RefCell::new(PopulatedStack::new(sender.clone()))); let populated = Rc::new(RefCell::new(PopulatedStack::new(sender.clone())?));
let empty = EmptyView::new(); let empty = EmptyView::new();
let stack = gtk::Stack::new(); let stack = gtk::Stack::new();
let state = ShowState::Empty; let state = ShowState::Empty;
@@ -46,9 +46,8 @@ impl ShowStack {
sender, sender,
}; };
let res = show.determine_state(); show.determine_state()?;
debug_assert!(res.is_ok()); Ok(show)
show
} }
pub fn get_stack(&self) -> gtk::Stack { pub fn get_stack(&self) -> gtk::Stack {
podcasts-gtk/src/static_resource.rs → hammond-gtk/src/static_resource.rs
View File
podcasts-gtk/src/utils.rs → hammond-gtk/src/utils.rs
+50 -29
View File
@@ -8,7 +8,7 @@ use gtk::prelude::*;
use gtk::{IsA, Widget}; use gtk::{IsA, Widget};
use chrono::prelude::*; use chrono::prelude::*;
use crossbeam_channel::{unbounded, Sender}; use crossbeam_channel::Sender;
use failure::Error; use failure::Error;
use rayon; use rayon;
use regex::Regex; use regex::Regex;
@@ -16,15 +16,16 @@ use reqwest;
use send_cell::SendCell; use send_cell::SendCell;
use serde_json::Value; use serde_json::Value;
// use podcasts_data::feed; // use hammond_data::feed;
use podcasts_data::dbqueries; use hammond_data::dbqueries;
use podcasts_data::opml; use hammond_data::opml;
use podcasts_data::pipeline; use hammond_data::pipeline;
use podcasts_data::utils::checkup; use hammond_data::utils::checkup;
use podcasts_data::Source; use hammond_data::Source;
use podcasts_downloader::downloader; use hammond_downloader::downloader;
use std::collections::{HashMap, HashSet}; use std::collections::{HashMap, HashSet};
use std::sync::mpsc::channel;
use std::sync::{Arc, Mutex, RwLock}; use std::sync::{Arc, Mutex, RwLock};
use app::Action; use app::Action;
@@ -188,7 +189,10 @@ fn refresh_feed<S>(source: Option<S>, sender: Sender<Action>) -> Result<(), Erro
where where
S: IntoIterator<Item = Source> + Send + 'static, S: IntoIterator<Item = Source> + Send + 'static,
{ {
sender.send(Action::HeaderBarShowUpdateIndicator); sender
.send(Action::HeaderBarShowUpdateIndicator)
.map_err(|err| error!("Action Sender: {}", err))
.ok();
rayon::spawn(move || { rayon::spawn(move || {
if let Some(s) = source { if let Some(s) = source {
@@ -206,8 +210,14 @@ where
.ok(); .ok();
}; };
sender.send(Action::HeaderBarHideUpdateIndicator); sender
sender.send(Action::RefreshAllViews); .send(Action::HeaderBarHideUpdateIndicator)
.map_err(|err| error!("Action Sender: {}", err))
.ok();
sender
.send(Action::RefreshAllViews)
.map_err(|err| error!("Action Sender: {}", err))
.ok();
}); });
Ok(()) Ok(())
} }
@@ -226,15 +236,15 @@ lazy_static! {
// GObjects do not implement Send trait, so SendCell is a way around that. // 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. // Also lazy_static requires Sync trait, so that's what the mutexes are.
// TODO: maybe use something that would just scale to requested size? // TODO: maybe use something that would just scale to requested size?
pub fn set_image_from_path(image: &gtk::Image, show_id: i32, size: u32) -> Result<(), Error> { pub fn set_image_from_path(image: &gtk::Image, podcast_id: i32, size: u32) -> Result<(), Error> {
// Check if there's an active download about this show cover. // 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 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 the download succedes, there should be a quick return from the pixbuf cache_image
// If it fails another download will be scheduled. // If it fails another download will be scheduled.
if let Ok(guard) = COVER_DL_REGISTRY.read() { if let Ok(guard) = COVER_DL_REGISTRY.read() {
if guard.contains(&show_id) { if guard.contains(&podcast_id) {
let callback = clone!(image => move || { let callback = clone!(image => move || {
let _ = set_image_from_path(&image, show_id, size); let _ = set_image_from_path(&image, podcast_id, size);
glib::Continue(false) glib::Continue(false)
}); });
gtk::timeout_add(250, callback); gtk::timeout_add(250, callback);
@@ -245,7 +255,7 @@ pub fn set_image_from_path(image: &gtk::Image, show_id: i32, size: u32) -> Resul
if let Ok(hashmap) = CACHED_PIXBUFS.read() { if let Ok(hashmap) = CACHED_PIXBUFS.read() {
// Check if the requested (cover + size) is already in the chache // Check if the requested (cover + size) is already in the chache
// and if so do an early return after that. // and if so do an early return after that.
if let Some(guard) = hashmap.get(&(show_id, size)) { if let Some(guard) = hashmap.get(&(podcast_id, size)) {
guard guard
.lock() .lock()
.map_err(|err| format_err!("SendCell Mutex: {}", err)) .map_err(|err| format_err!("SendCell Mutex: {}", err))
@@ -260,25 +270,32 @@ pub fn set_image_from_path(image: &gtk::Image, show_id: i32, size: u32) -> Resul
} }
} }
let (sender, receiver) = unbounded(); let (sender, receiver) = channel();
THREADPOOL.spawn(move || { THREADPOOL.spawn(move || {
if let Ok(mut guard) = COVER_DL_REGISTRY.write() { if let Ok(mut guard) = COVER_DL_REGISTRY.write() {
guard.insert(show_id); guard.insert(podcast_id);
if let Ok(pd) = dbqueries::get_podcast_cover_from_id(show_id) {
sender.send(downloader::cache_image(&pd));
} }
guard.remove(&show_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 image = image.clone();
let s = size as i32; let s = size as i32;
gtk::timeout_add(25, move || { gtk::timeout_add(25, move || {
if let Some(path) = receiver.try_recv() { if let Ok(path) = receiver.try_recv() {
if let Ok(path) = path { if let Ok(path) = path {
if let Ok(px) = Pixbuf::new_from_file_at_scale(&path, s, s, true) { if let Ok(px) = Pixbuf::new_from_file_at_scale(&path, s, s, true) {
if let Ok(mut hashmap) = CACHED_PIXBUFS.write() { if let Ok(mut hashmap) = CACHED_PIXBUFS.write() {
hashmap.insert((show_id, size), Mutex::new(SendCell::new(px.clone()))); hashmap.insert((podcast_id, size), Mutex::new(SendCell::new(px.clone())));
image.set_from_pixbuf(&px); image.set_from_pixbuf(&px);
} }
} }
@@ -317,7 +334,7 @@ fn lookup_id(id: u32) -> Result<String, Error> {
.ok_or_else(|| format_err!("Failed to get url from itunes response")) .ok_or_else(|| format_err!("Failed to get url from itunes response"))
} }
pub fn on_import_clicked(window: &gtk::ApplicationWindow, sender: &Sender<Action>) { pub fn on_import_clicked(window: &gtk::Window, sender: &Sender<Action>) {
use glib::translate::ToGlib; use glib::translate::ToGlib;
use gtk::{FileChooserAction, FileChooserNative, FileFilter, ResponseType}; use gtk::{FileChooserAction, FileChooserNative, FileFilter, ResponseType};
@@ -356,12 +373,16 @@ pub fn on_import_clicked(window: &gtk::ApplicationWindow, sender: &Sender<Action
refresh(Some(sources), sender) refresh(Some(sources), sender)
} else { } else {
let text = String::from("Failed to parse the Imported file"); let text = String::from("Failed to parse the Imported file");
sender.send(Action::ErrorNotification(text)); sender.send(Action::ErrorNotification(text))
.map_err(|err| error!("Action Sender: {}", err))
.ok();
} }
})) }))
} else { } else {
let text = String::from("Selected File could not be accessed."); let text = String::from("Selected File could not be accessed.");
sender.send(Action::ErrorNotification(text)); sender.send(Action::ErrorNotification(text))
.map_err(|err| error!("Action Sender: {}", err))
.ok();
} }
} }
@@ -374,14 +395,14 @@ pub fn on_import_clicked(window: &gtk::ApplicationWindow, sender: &Sender<Action
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;
// use podcasts_data::Source; // use hammond_data::Source;
// use podcasts_data::dbqueries; // use hammond_data::dbqueries;
// #[test] // #[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. // to run it.
// #[ignore] // #[ignore]
// Disabled till https://gitlab.gnome.org/World/podcasts/issues/56 // Disabled till https://gitlab.gnome.org/World/hammond/issues/56
// fn test_set_image_from_path() { // fn test_set_image_from_path() {
// let url = "https://web.archive.org/web/20180120110727if_/https://rss.acast.com/thetipoff"; // let url = "https://web.archive.org/web/20180120110727if_/https://rss.acast.com/thetipoff";
// Create and index a source // Create and index a source
podcasts-gtk/src/widgets/aboutdialog.rs → hammond-gtk/src/widgets/aboutdialog.rs
+8 -9
View File
@@ -1,17 +1,14 @@
use app::APP_ID;
use gtk; use gtk;
use gtk::prelude::*; use gtk::prelude::*;
// Totally copied it from fractal. // Totally copied it from fractal.
// https://gitlab.gnome.org/danigm/fractal/blob/503e311e22b9d7540089d735b92af8e8f93560c5/fractal-gtk/src/app.rs#L1883-1912 // 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. /// Given a `window` create and attach an `gtk::AboutDialog` to it.
pub fn about_dialog(window: &gtk::ApplicationWindow) { pub fn about_dialog(window: &gtk::Window) {
// Feel free to add yourself if you contribured. // Feel free to add yourself if you contribured.
let authors = &[ let authors = &[
"Carlos Soriano",
"Constantin Nickel", "Constantin Nickel",
"Gabriele Musco", "Gabriele Musco",
"Ivan Augusto",
"James Wykeham-Martin", "James Wykeham-Martin",
"Jordan Petridis", "Jordan Petridis",
"Julian Sparber", "Julian Sparber",
@@ -20,21 +17,23 @@ pub fn about_dialog(window: &gtk::ApplicationWindow) {
]; ];
let dialog = gtk::AboutDialog::new(); let dialog = gtk::AboutDialog::new();
dialog.set_logo_icon_name(APP_ID); // 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_comments("Podcast Client for the GNOME Desktop.");
dialog.set_copyright("© 2017, 2018 Jordan Petridis"); dialog.set_copyright("© 2017, 2018 Jordan Petridis");
dialog.set_license_type(gtk::License::Gpl30); dialog.set_license_type(gtk::License::Gpl30);
dialog.set_modal(true); dialog.set_modal(true);
// TODO: make it show it fetches the commit hash from which it was built // TODO: make it show it fetches the commit hash from which it was built
// and the version number is kept in sync automaticly // and the version number is kept in sync automaticly
dialog.set_version("0.4.2"); dialog.set_version("0.3.4");
dialog.set_program_name("Podcasts"); dialog.set_program_name("Hammond");
// TODO: Need a wiki page first. // TODO: Need a wiki page first.
// dialog.set_website("https://wiki.gnome.org/Design/Apps/Potential/Podcasts"); // dialog.set_website("https://wiki.gnome.org/Design/Apps/Potential/Podcasts");
// dialog.set_website_label("Learn more about GNOME Podcasts"); // dialog.set_website_label("Learn more about Hammond");
dialog.set_transient_for(window); dialog.set_transient_for(window);
dialog.set_artists(&["Tobias Bernard", "Sam Hewitt"]); dialog.set_artists(&["Tobias Bernard"]);
dialog.set_authors(authors); dialog.set_authors(authors);
dialog.connect_response(|dlg, _| dlg.destroy()); dialog.connect_response(|dlg, _| dlg.destroy());
podcasts-gtk/src/widgets/appnotif.rs → hammond-gtk/src/widgets/appnotif.rs
+1 -1
View File
@@ -21,7 +21,7 @@ pub struct InAppNotification {
impl Default for InAppNotification { impl Default for InAppNotification {
fn default() -> Self { fn default() -> Self {
let builder = gtk::Builder::new_from_resource("/org/gnome/Podcasts/gtk/inapp_notif.ui"); let builder = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/inapp_notif.ui");
let revealer: gtk::Revealer = builder.get_object("revealer").unwrap(); let revealer: gtk::Revealer = builder.get_object("revealer").unwrap();
let text: gtk::Label = builder.get_object("text").unwrap(); let text: gtk::Label = builder.get_object("text").unwrap();
podcasts-gtk/src/widgets/empty.rs → hammond-gtk/src/widgets/empty.rs
+1 -1
View File
@@ -7,7 +7,7 @@ pub struct EmptyView {
impl Default for EmptyView { impl Default for EmptyView {
fn default() -> Self { fn default() -> Self {
let builder = gtk::Builder::new_from_resource("/org/gnome/Podcasts/gtk/empty_view.ui"); let builder = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/empty_view.ui");
let view: gtk::Box = builder.get_object("empty_view").unwrap(); let view: gtk::Box = builder.get_object("empty_view").unwrap();
EmptyView { container: view } EmptyView { container: view }
podcasts-gtk/src/widgets/episode.rs → hammond-gtk/src/widgets/episode.rs
+82 -84
View File
@@ -7,18 +7,17 @@ use chrono::prelude::*;
use crossbeam_channel::Sender; use crossbeam_channel::Sender;
use failure::Error; use failure::Error;
use humansize::{file_size_opts as size_opts, FileSize}; use humansize::{file_size_opts as size_opts, FileSize};
#[allow(unused_imports)]
use open; use open;
use podcasts_data::dbqueries; use hammond_data::dbqueries;
use podcasts_data::utils::get_download_folder; use hammond_data::utils::get_download_folder;
use podcasts_data::EpisodeWidgetModel; use hammond_data::EpisodeWidgetQuery;
use app::Action; use app::Action;
use manager; use manager;
use std::cell::RefCell; use std::path::Path;
use std::rc::{Rc, Weak}; use std::rc::Rc;
use std::sync::{Arc, Mutex, TryLockError}; use std::sync::{Arc, Mutex, TryLockError};
lazy_static! { lazy_static! {
@@ -66,10 +65,11 @@ struct Buttons {
play: gtk::Button, play: gtk::Button,
download: gtk::Button, download: gtk::Button,
cancel: gtk::Button, cancel: gtk::Button,
desc: gtk::Button,
} }
impl InfoLabels { impl InfoLabels {
fn init(&self, episode: &EpisodeWidgetModel) { fn init(&self, episode: &EpisodeWidgetQuery) {
// Set the title label state. // Set the title label state.
self.set_title(episode); self.set_title(episode);
@@ -83,7 +83,7 @@ impl InfoLabels {
self.set_size(episode.length()) self.set_size(episode.length())
} }
fn set_title(&self, episode: &EpisodeWidgetModel) { fn set_title(&self, episode: &EpisodeWidgetQuery) {
self.title.set_text(episode.title()); self.title.set_text(episode.title());
if episode.played().is_some() { if episode.played().is_some() {
@@ -160,7 +160,7 @@ impl InfoLabels {
impl Default for EpisodeWidget { impl Default for EpisodeWidget {
fn default() -> Self { 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 container = builder.get_object("episode_container").unwrap();
let progressbar = builder.get_object("progress_bar").unwrap(); let progressbar = builder.get_object("progress_bar").unwrap();
@@ -169,6 +169,7 @@ impl Default for EpisodeWidget {
let download = builder.get_object("download_button").unwrap(); let download = builder.get_object("download_button").unwrap();
let play = builder.get_object("play_button").unwrap(); let play = builder.get_object("play_button").unwrap();
let cancel = builder.get_object("cancel_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 info_container = builder.get_object("info_container").unwrap();
let title = builder.get_object("title_label").unwrap(); let title = builder.get_object("title_label").unwrap();
@@ -199,6 +200,7 @@ impl Default for EpisodeWidget {
play, play,
download, download,
cancel, cancel,
desc: desc_button,
}, },
progressbar, progressbar,
container, container,
@@ -207,38 +209,39 @@ impl Default for EpisodeWidget {
} }
impl EpisodeWidget { impl EpisodeWidget {
pub fn new(episode: EpisodeWidgetModel, sender: &Sender<Action>) -> Rc<Self> { pub fn new(episode: &EpisodeWidgetQuery, sender: &Sender<Action>) -> Rc<Self> {
let widget = Rc::new(Self::default()); let widget = Rc::new(Self::default());
let episode = RefCell::new(Some(episode)); widget.info.init(episode);
let weak = Rc::downgrade(&widget); Self::determine_buttons_state(&widget, episode, sender)
widget.container.connect_draw(clone!(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)) .map_err(|err| error!("Error: {}", err))
.ok(); .ok();
});
gtk::Inhibit(false)
}));
// When the widget is attached to a parent,
// since it's a rust struct and not a widget the
// compiler drops the refference to it at the end of
// scope. That's cause we only attach the `self.container`
// to the parent.
//
// So this callback keeps a refference to the Rust Struct
// so the compiler won't drop it.
//
// When the widget is detached from it's parent view this
// callback runs freeing the last refference we were holding.
let foo = RefCell::new(Some(widget.clone()));
widget.container.connect_remove(move |_, _| {
foo.borrow_mut().take();
});
widget widget
.on_desc_clicked(episode, sender)
.map_err(|err| error!("Error: {}", err))
.ok();
widget
}
fn on_desc_clicked(
&self,
episode: &EpisodeWidgetQuery,
sender: &Sender<Action>,
) -> Result<(), Error> {
let id = episode.rowid();
if dbqueries::episode_had_description(id)? {
self.buttons.desc.show();
self.buttons
.desc
.connect_clicked(clone!(sender => move |_| {
sender.send(Action::AboutWidget(id))
.map_err(|err| error!("Action Sender: {}", err))
.ok();
}));
Ok(())
} else {
self.buttons.desc.hide();
Ok(())
}
} }
// fn init(widget: Rc<Self>, sender: &Sender<Action>) {} // fn init(widget: Rc<Self>, sender: &Sender<Action>) {}
@@ -322,13 +325,10 @@ impl EpisodeWidget {
/// | ToDownload | /// | ToDownload |
/// ------------------- /// -------------------
fn determine_buttons_state( fn determine_buttons_state(
weak: &Weak<Self>, widget: &Rc<Self>,
episode: &EpisodeWidgetModel, episode: &EpisodeWidgetQuery,
sender: &Sender<Action>, sender: &Sender<Action>,
) -> Result<(), Error> { ) -> Result<(), Error> {
let widget = weak
.upgrade()
.ok_or_else(|| format_err!("Widget is already dropped"))?;
// Reset the buttons state no matter the glade file. // Reset the buttons state no matter the glade file.
// This is just to make it easier to port to relm in the future. // This is just to make it easier to port to relm in the future.
widget.buttons.cancel.hide(); widget.buttons.cancel.hide();
@@ -348,11 +348,11 @@ impl EpisodeWidget {
// State: InProggress // State: InProggress
if let Some(prog) = active_dl()? { if let Some(prog) = active_dl()? {
// set a callback that will update the state when the download finishes // set a callback that will update the state when the download finishes
let callback = clone!(weak, sender => move || { let callback = clone!(widget, sender => move || {
if let Ok(guard) = manager::ACTIVE_DOWNLOADS.read() { if let Ok(guard) = manager::ACTIVE_DOWNLOADS.read() {
if !guard.contains_key(&id) { if !guard.contains_key(&id) {
if let Ok(ep) = dbqueries::get_episode_widget_from_rowid(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)) .map_err(|err| error!("Error: {}", err))
.ok(); .ok();
@@ -369,20 +369,20 @@ impl EpisodeWidget {
widget widget
.buttons .buttons
.cancel .cancel
.connect_clicked(clone!(prog, weak, sender => move |_| { .connect_clicked(clone!(prog, widget, sender => move |_| {
// Cancel the download // Cancel the download
if let Ok(mut m) = prog.lock() { if let Ok(mut m) = prog.lock() {
m.cancel(); m.cancel();
} }
// Cancel is not instant so we have to wait a bit // Cancel is not instant so we have to wait a bit
timeout_add(50, clone!(weak, sender => move || { timeout_add(50, clone!(widget, sender => move || {
if let Ok(thing) = active_dl() { if let Ok(thing) = active_dl() {
if thing.is_none() { if thing.is_none() {
// Recalculate the widget state // Recalculate the widget state
dbqueries::get_episode_widget_from_rowid(id) dbqueries::get_episode_widget_from_rowid(id)
.map_err(From::from) .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)) .map_err(|err| error!("Error: {}", err))
.ok(); .ok();
@@ -397,10 +397,10 @@ impl EpisodeWidget {
// Setup a callback that will update the total_size label // Setup a callback that will update the total_size label
// with the http ContentLength header number rather than // with the http ContentLength header number rather than
// relying to the RSS feed. // 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. // 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 // Change the widget layout/state
widget.state_prog(); widget.state_prog();
@@ -417,9 +417,9 @@ impl EpisodeWidget {
widget widget
.buttons .buttons
.play .play
.connect_clicked(clone!(weak, sender => move |_| { .connect_clicked(clone!(widget, sender => move |_| {
if let Ok(mut ep) = dbqueries::get_episode_widget_from_rowid(id) { 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)) .map_err(|err| error!("Error: {}", err))
.ok(); .ok();
} }
@@ -433,14 +433,14 @@ impl EpisodeWidget {
widget widget
.buttons .buttons
.download .download
.connect_clicked(clone!(weak, sender => move |dl| { .connect_clicked(clone!(widget, sender => move |dl| {
// Make the button insensitive so it won't be pressed twice // Make the button insensitive so it won't be pressed twice
dl.set_sensitive(false); dl.set_sensitive(false);
if let Ok(ep) = dbqueries::get_episode_widget_from_rowid(id) { if let Ok(ep) = dbqueries::get_episode_widget_from_rowid(id) {
on_download_clicked(&ep, &sender) on_download_clicked(&ep, &sender)
.and_then(|_| { .and_then(|_| {
info!("Donwload started succesfully."); info!("Donwload started succesfully.");
Self::determine_buttons_state(&weak, &ep, &sender) Self::determine_buttons_state(&widget, &ep, &sender)
}) })
.map_err(|err| error!("Error: {}", err)) .map_err(|err| error!("Error: {}", err))
.ok(); .ok();
@@ -457,36 +457,44 @@ impl EpisodeWidget {
} }
} }
fn on_download_clicked(ep: &EpisodeWidgetModel, sender: &Sender<Action>) -> Result<(), Error> { fn on_download_clicked(ep: &EpisodeWidgetQuery, sender: &Sender<Action>) -> Result<(), Error> {
let pd = dbqueries::get_podcast_from_id(ep.show_id())?; let pd = dbqueries::get_podcast_from_id(ep.podcast_id())?;
let download_fold = get_download_folder(&pd.title())?; let download_fold = get_download_folder(&pd.title())?;
// Start a new download. // Start a new download.
manager::add(ep.rowid(), download_fold)?; manager::add(ep.rowid(), download_fold)?;
// Update Views // Update Views
sender.send(Action::RefreshEpisodesViewBGR); sender
Ok(()) .send(Action::RefreshEpisodesViewBGR)
.map_err(From::from)
} }
fn on_play_bttn_clicked( fn on_play_bttn_clicked(
widget: &Weak<EpisodeWidget>, widget: &Rc<EpisodeWidget>,
episode: &mut EpisodeWidgetModel, episode: &mut EpisodeWidgetQuery,
sender: &Sender<Action>, sender: &Sender<Action>,
) -> Result<(), Error> { ) -> Result<(), Error> {
let widget = widget open_uri(episode.rowid())?;
.upgrade()
.ok_or_else(|| format_err!("Widget is already dropped"))?;
// Mark played
episode.set_played_now()?; episode.set_played_now()?;
// Grey out the title
widget.info.set_title(&episode);
// Play the episode widget.info.set_title(&episode);
sender.send(Action::InitEpisode(episode.rowid())); sender
// Refresh background views to match the normal/greyout title state .send(Action::RefreshEpisodesViewBGR)
sender.send(Action::RefreshEpisodesViewBGR); .map_err(From::from)
}
fn open_uri(rowid: i32) -> Result<(), Error> {
let uri = dbqueries::get_episode_local_uri_from_id(rowid)?
.ok_or_else(|| format_err!("Expected Some found None."))?;
if Path::new(&uri).exists() {
info!("Opening {}", uri);
open::that(&uri)?;
} else {
bail!("File \"{}\" does not exist.", uri);
}
Ok(()) Ok(())
} }
@@ -494,7 +502,7 @@ fn on_play_bttn_clicked(
#[inline] #[inline]
#[cfg_attr(feature = "cargo-clippy", allow(if_same_then_else))] #[cfg_attr(feature = "cargo-clippy", allow(if_same_then_else))]
fn update_progressbar_callback( fn update_progressbar_callback(
widget: &Weak<EpisodeWidget>, widget: &Rc<EpisodeWidget>,
prog: &Arc<Mutex<manager::Progress>>, prog: &Arc<Mutex<manager::Progress>>,
episode_rowid: i32, episode_rowid: i32,
) { ) {
@@ -507,15 +515,10 @@ fn update_progressbar_callback(
#[allow(if_same_then_else)] #[allow(if_same_then_else)]
fn progress_bar_helper( fn progress_bar_helper(
widget: &Weak<EpisodeWidget>, widget: &Rc<EpisodeWidget>,
prog: &Arc<Mutex<manager::Progress>>, prog: &Arc<Mutex<manager::Progress>>,
episode_rowid: i32, episode_rowid: i32,
) -> Result<glib::Continue, Error> { ) -> Result<glib::Continue, Error> {
let widget = match widget.upgrade() {
Some(w) => w,
None => return Ok(glib::Continue(false)),
};
let (fraction, downloaded) = match prog.try_lock() { let (fraction, downloaded) = match prog.try_lock() {
Ok(guard) => (guard.get_fraction(), guard.get_downloaded()), Ok(guard) => (guard.get_fraction(), guard.get_downloaded()),
Err(TryLockError::WouldBlock) => return Ok(glib::Continue(true)), Err(TryLockError::WouldBlock) => return Ok(glib::Continue(true)),
@@ -555,7 +558,7 @@ fn progress_bar_helper(
// with the http ContentLength header number rather than // with the http ContentLength header number rather than
// relying to the RSS feed. // relying to the RSS feed.
#[inline] #[inline]
fn update_total_size_callback(widget: &Weak<EpisodeWidget>, prog: &Arc<Mutex<manager::Progress>>) { fn update_total_size_callback(widget: &Rc<EpisodeWidget>, prog: &Arc<Mutex<manager::Progress>>) {
let callback = clone!(prog, widget => move || { let callback = clone!(prog, widget => move || {
total_size_helper(&widget, &prog).unwrap_or(glib::Continue(true)) total_size_helper(&widget, &prog).unwrap_or(glib::Continue(true))
}); });
@@ -563,14 +566,9 @@ fn update_total_size_callback(widget: &Weak<EpisodeWidget>, prog: &Arc<Mutex<man
} }
fn total_size_helper( fn total_size_helper(
widget: &Weak<EpisodeWidget>, widget: &Rc<EpisodeWidget>,
prog: &Arc<Mutex<manager::Progress>>, prog: &Arc<Mutex<manager::Progress>>,
) -> Result<glib::Continue, Error> { ) -> Result<glib::Continue, Error> {
let widget = match widget.upgrade() {
Some(w) => w,
None => return Ok(glib::Continue(false)),
};
// Get the total_bytes. // Get the total_bytes.
let total_bytes = match prog.try_lock() { let total_bytes = match prog.try_lock() {
Ok(guard) => guard.get_total_size(), Ok(guard) => guard.get_total_size(),
podcasts-gtk/src/widgets/home_view.rs → hammond-gtk/src/widgets/home_view.rs
+19 -31
View File
@@ -5,15 +5,14 @@ use gtk;
use gtk::prelude::*; use gtk::prelude::*;
use crossbeam_channel::Sender; use crossbeam_channel::Sender;
use podcasts_data::dbqueries; use hammond_data::dbqueries;
use podcasts_data::EpisodeWidgetModel; use hammond_data::EpisodeWidgetQuery;
use send_cell::SendCell; use send_cell::SendCell;
use app::Action; use app::Action;
use utils::{self, lazy_load_full}; use utils::{self, lazy_load_full};
use widgets::EpisodeWidget; use widgets::EpisodeWidget;
use std::cell::Cell;
use std::rc::Rc; use std::rc::Rc;
use std::sync::Mutex; use std::sync::Mutex;
@@ -50,7 +49,7 @@ pub struct HomeView {
impl Default for HomeView { impl Default for HomeView {
fn default() -> Self { fn default() -> Self {
let builder = gtk::Builder::new_from_resource("/org/gnome/Podcasts/gtk/home_view.ui"); let builder = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/episodes_view.ui");
let container: gtk::Box = builder.get_object("container").unwrap(); let container: gtk::Box = builder.get_object("container").unwrap();
let scrolled_window: gtk::ScrolledWindow = builder.get_object("scrolled_window").unwrap(); let scrolled_window: gtk::ScrolledWindow = builder.get_object("scrolled_window").unwrap();
let frame_parent: gtk::Box = builder.get_object("frame_parent").unwrap(); let frame_parent: gtk::Box = builder.get_object("frame_parent").unwrap();
@@ -94,9 +93,9 @@ impl HomeView {
let now_utc = Utc::now(); let now_utc = Utc::now();
let view_ = view.clone(); let view_ = view.clone();
let func = move |ep: EpisodeWidgetModel| { let func = move |ep: EpisodeWidgetQuery| {
let epoch = ep.epoch(); let epoch = ep.epoch();
let widget = HomeEpisode::new(ep, &sender); let widget = HomeEpisode::new(&ep, &sender);
match split(&now_utc, i64::from(epoch)) { match split(&now_utc, i64::from(epoch)) {
Today => add_to_box(&widget, &view_.today_list, &view_.today_box), Today => add_to_box(&widget, &view_.today_list, &view_.today_box),
@@ -182,11 +181,12 @@ struct HomeEpisode {
impl Default for HomeEpisode { impl Default for HomeEpisode {
fn default() -> Self { fn default() -> Self {
let builder = gtk::Builder::new_from_resource("/org/gnome/Podcasts/gtk/home_episode.ui"); 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 container: gtk::Box = builder.get_object("container").unwrap();
let image: gtk::Image = builder.get_object("cover").unwrap(); let image: gtk::Image = builder.get_object("cover").unwrap();
let ep = EpisodeWidget::default(); let ep = EpisodeWidget::default();
container.pack_start(&ep.container, true, true, 0); container.pack_start(&ep.container, true, true, 6);
HomeEpisode { HomeEpisode {
container, container,
@@ -197,11 +197,12 @@ impl Default for HomeEpisode {
} }
impl HomeEpisode { impl HomeEpisode {
fn new(episode: EpisodeWidgetModel, sender: &Sender<Action>) -> HomeEpisode { fn new(episode: &EpisodeWidgetQuery, sender: &Sender<Action>) -> HomeEpisode {
let builder = gtk::Builder::new_from_resource("/org/gnome/Podcasts/gtk/home_episode.ui"); 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 container: gtk::Box = builder.get_object("container").unwrap();
let image: gtk::Image = builder.get_object("cover").unwrap(); let image: gtk::Image = builder.get_object("cover").unwrap();
let pid = episode.show_id(); let pid = episode.podcast_id();
let ep = EpisodeWidget::new(episode, sender); let ep = EpisodeWidget::new(episode, sender);
let view = HomeEpisode { let view = HomeEpisode {
@@ -214,28 +215,15 @@ impl HomeEpisode {
view view
} }
fn init(&self, show_id: i32) { fn init(&self, podcast_id: i32) {
self.set_cover(show_id); self.set_cover(podcast_id)
self.container.pack_start(&self.episode, true, true, 0);
}
fn set_cover(&self, show_id: i32) {
// The closure above is a regular `Fn` closure.
// which means we can't mutate stuff inside it easily,
// so Cell is used.
//
// `Option<T>` along with the `.take()` method ensure
// that the function will only be run once, during the first execution.
let show_id = Cell::new(Some(show_id));
self.image.connect_draw(move |image, _| {
show_id.take().map(|id| {
utils::set_image_from_path(image, id, 64)
.map_err(|err| error!("Failed to set a cover: {}", err)) .map_err(|err| error!("Failed to set a cover: {}", err))
.ok(); .ok();
});
gtk::Inhibit(false) 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)
} }
} }
podcasts-gtk/src/widgets/mod.rs → hammond-gtk/src/widgets/mod.rs
+1 -3
View File
@@ -3,9 +3,7 @@ pub mod appnotif;
mod empty; mod empty;
mod episode; mod episode;
mod home_view; mod home_view;
pub mod player;
mod show; mod show;
pub mod show_menu;
mod shows_view; mod shows_view;
pub use self::aboutdialog::about_dialog; pub use self::aboutdialog::about_dialog;
@@ -13,5 +11,5 @@ pub use self::empty::EmptyView;
pub use self::episode::EpisodeWidget; pub use self::episode::EpisodeWidget;
pub use self::home_view::HomeView; pub use self::home_view::HomeView;
pub use self::show::ShowWidget; pub use self::show::ShowWidget;
pub use self::show_menu::ShowMenu; pub use self::show::{mark_all_notif, remove_show_notif};
pub use self::shows_view::ShowsView; pub use self::shows_view::ShowsView;
hammond-gtk/src/widgets/show.rs
+347
View File
@@ -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(())
}
podcasts-gtk/src/widgets/shows_view.rs → hammond-gtk/src/widgets/shows_view.rs
+20 -34
View File
@@ -5,13 +5,12 @@ use crossbeam_channel::Sender;
use failure::Error; use failure::Error;
use send_cell::SendCell; use send_cell::SendCell;
use podcasts_data::dbqueries; use hammond_data::dbqueries;
use podcasts_data::Show; use hammond_data::Podcast;
use app::Action; use app::Action;
use utils::{self, get_ignored_shows, lazy_load, set_image_from_path}; use utils::{self, get_ignored_shows, lazy_load, set_image_from_path};
use std::cell::Cell;
use std::rc::Rc; use std::rc::Rc;
use std::sync::Arc; use std::sync::Arc;
use std::sync::Mutex; use std::sync::Mutex;
@@ -29,7 +28,7 @@ pub struct ShowsView {
impl Default for ShowsView { impl Default for ShowsView {
fn default() -> Self { fn default() -> Self {
let builder = gtk::Builder::new_from_resource("/org/gnome/Podcasts/gtk/shows_view.ui"); let builder = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/shows_view.ui");
let container: gtk::Box = builder.get_object("fb_parent").unwrap(); let container: gtk::Box = builder.get_object("fb_parent").unwrap();
let scrolled_window: gtk::ScrolledWindow = builder.get_object("scrolled_window").unwrap(); let scrolled_window: gtk::ScrolledWindow = builder.get_object("scrolled_window").unwrap();
let flowbox: gtk::FlowBox = builder.get_object("flowbox").unwrap(); let flowbox: gtk::FlowBox = builder.get_object("flowbox").unwrap();
@@ -43,23 +42,24 @@ impl Default for ShowsView {
} }
impl ShowsView { impl ShowsView {
pub fn new(sender: Sender<Action>) -> Rc<Self> { pub fn new(sender: Sender<Action>) -> Result<Rc<Self>, Error> {
let pop = Rc::new(ShowsView::default()); let pop = Rc::new(ShowsView::default());
pop.init(sender); pop.init(sender);
// Populate the flowbox with the Shows. // Populate the flowbox with the Podcasts.
let res = populate_flowbox(&pop); populate_flowbox(&pop)?;
debug_assert!(res.is_ok()); Ok(pop)
pop
} }
pub fn init(&self, sender: Sender<Action>) { pub fn init(&self, sender: Sender<Action>) {
self.flowbox.connect_child_activated(move |_, child| { self.flowbox.connect_child_activated(move |_, child| {
let res = on_child_activate(child, &sender); on_child_activate(child, &sender)
debug_assert!(res.is_ok()); .map_err(|err| error!("Error along flowbox child activation: {}", err))
.ok();
}); });
} }
/// Set scrolled window vertical adjustment. /// Set scrolled window vertical adjustment.
#[allow(unused)]
fn set_vadjustment(&self) -> Result<(), Error> { fn set_vadjustment(&self) -> Result<(), Error> {
let guard = SHOWS_VIEW_VALIGNMENT let guard = SHOWS_VIEW_VALIGNMENT
.lock() .lock()
@@ -115,9 +115,9 @@ fn on_child_activate(child: &gtk::FlowBoxChild, sender: &Sender<Action>) -> Resu
.parse::<i32>()?; .parse::<i32>()?;
let pd = Arc::new(dbqueries::get_podcast_from_id(id)?); let pd = Arc::new(dbqueries::get_podcast_from_id(id)?);
sender.send(Action::HeaderBarShowTile(pd.title().into())); sender.send(Action::HeaderBarShowTile(pd.title().into()))?;
sender.send(Action::ReplaceWidget(pd)); sender.send(Action::ReplaceWidget(pd))?;
sender.send(Action::ShowWidgetAnimated); sender.send(Action::ShowWidgetAnimated)?;
Ok(()) Ok(())
} }
@@ -130,7 +130,7 @@ struct ShowsChild {
impl Default for ShowsChild { impl Default for ShowsChild {
fn default() -> Self { fn default() -> Self {
let builder = gtk::Builder::new_from_resource("/org/gnome/Podcasts/gtk/shows_child.ui"); let builder = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/shows_child.ui");
let container: gtk::Box = builder.get_object("fb_child").unwrap(); let container: gtk::Box = builder.get_object("fb_child").unwrap();
let cover: gtk::Image = builder.get_object("pd_cover").unwrap(); let cover: gtk::Image = builder.get_object("pd_cover").unwrap();
@@ -147,36 +147,22 @@ impl Default for ShowsChild {
} }
impl ShowsChild { impl ShowsChild {
pub fn new(pd: &Show) -> ShowsChild { pub fn new(pd: &Podcast) -> ShowsChild {
let child = ShowsChild::default(); let child = ShowsChild::default();
child.init(pd); child.init(pd);
child child
} }
fn init(&self, pd: &Show) { fn init(&self, pd: &Podcast) {
self.container.set_tooltip_text(pd.title()); self.container.set_tooltip_text(pd.title());
WidgetExt::set_name(&self.child, &pd.id().to_string()); WidgetExt::set_name(&self.child, &pd.id().to_string());
self.set_cover(pd.id()) self.set_cover(pd.id())
}
fn set_cover(&self, show_id: i32) {
// The closure above is a regular `Fn` closure.
// which means we can't mutate stuff inside it easily,
// so Cell is used.
//
// `Option<T>` along with the `.take()` method ensure
// that the function will only be run once, during the first execution.
let show_id = Cell::new(Some(show_id));
self.cover.connect_draw(move |cover, _| {
show_id.take().map(|id| {
set_image_from_path(cover, id, 256)
.map_err(|err| error!("Failed to set a cover: {}", err)) .map_err(|err| error!("Failed to set a cover: {}", err))
.ok(); .ok();
}); }
gtk::Inhibit(false) fn set_cover(&self, podcast_id: i32) -> Result<(), Error> {
}); set_image_from_path(&self.cover, podcast_id, 256)
} }
} }
podcasts.doap → hammond.doap
+9 -6
View File
@@ -5,22 +5,25 @@
xmlns:gnome="http://api.gnome.org/doap-extensions#" xmlns:gnome="http://api.gnome.org/doap-extensions#"
xmlns="http://usefulinc.com/ns/doap#"> xmlns="http://usefulinc.com/ns/doap#">
<name xml:lang="en">Podcasts</name> <name xml:lang="en">Hammond</name>
<shortdesc xml:lang="en"> <shortdesc xml:lang="en">
Podcast app for GNOME Modern Podcast Client for the GNOME desktop
</shortdesc> </shortdesc>
<description xml:lang="en"> <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> </description>
<!-- <homepage rdf:resource="https://wiki.gnome.org/Apps/Podcasts" /> --> <!-- <homepage rdf:resource="https://wiki.gnome.org/Apps/Hammond" /> -->
<bug-database rdf:resource="https://gitlab.gnome.org/World/podcasts/issues" /> <bug-database rdf:resource="https://gitlab.gnome.org/World/hammond/issues" />
<category rdf:resource="http://api.gnome.org/doap-extensions#apps" /> <category rdf:resource="http://api.gnome.org/doap-extensions#apps" />
<programming-language>Rust</programming-language> <programming-language>Rust</programming-language>
<maintainer> <maintainer>
<foaf:Person> <foaf:Person>
<foaf:name>Jordan Petridis</foaf:name> <foaf:name>Jordan petridis</foaf:name>
<foaf:mbox rdf:resource="mailto:jpetridis@gnome.org" /> <foaf:mbox rdf:resource="mailto:jpetridis@gnome.org" />
<gnome:userid>jpetridis</gnome:userid> <gnome:userid>jpetridis</gnome:userid>
</foaf:Person> </foaf:Person>
meson.build
+13 -16
View File
@@ -2,26 +2,23 @@
# https://gitlab.gnome.org/danigm/fractal/blob/6e2911f9d2353c99a18a6c19fab7f903c4bbb431/meson.build # https://gitlab.gnome.org/danigm/fractal/blob/6e2911f9d2353c99a18a6c19fab7f903c4bbb431/meson.build
project( project(
'gnome-podcasts', 'rust', 'hammond', 'rust',
version: '0.4.2', version: '0.3.4',
license: 'GPLv3', license: 'GPLv3',
) )
podcasts_version = meson.project_version() hammond_version = meson.project_version()
version_array = podcasts_version.split('.') version_array = hammond_version.split('.')
podcasts_major_version = version_array[0].to_int() hammond_major_version = version_array[0].to_int()
podcasts_minor_version = version_array[1].to_int() hammond_minor_version = version_array[1].to_int()
podcasts_version_micro = version_array[2].to_int() hammond_version_micro = version_array[2].to_int()
podcasts_prefix = get_option('prefix') hammond_prefix = get_option('prefix')
podcasts_bindir = join_paths(podcasts_prefix, get_option('bindir')) hammond_bindir = join_paths(hammond_prefix, get_option('bindir'))
podcasts_conf = configuration_data()
podcasts_conf.set('BINDIR', podcasts_bindir)
datadir = get_option('datadir') datadir = get_option('datadir')
icondir = join_paths(datadir, 'icons') icondir = join_paths(datadir, 'icons')
subdir('podcasts-gtk/resources') subdir('hammond-gtk/resources')
cargo = find_program('cargo', required: false) cargo = find_program('cargo', required: false)
gresource = find_program('glib-compile-resources', required: false) gresource = find_program('glib-compile-resources', required: false)
@@ -31,11 +28,11 @@ cargo_script = find_program('scripts/cargo.sh')
cargo_release = custom_target('cargo-build', cargo_release = custom_target('cargo-build',
build_by_default: true, build_by_default: true,
build_always: true, build_always: true,
output: ['gnome-podcasts'], output: ['hammond'],
install: true, install: true,
install_dir: podcasts_bindir, install_dir: hammond_bindir,
command: [cargo_script, '@CURRENT_SOURCE_DIR@', '@OUTPUT@']) command: [cargo_script, '@CURRENT_SOURCE_DIR@', '@OUTPUT@'])
run_target('release', command: ['scripts/release.sh', run_target('release', command: ['scripts/release.sh',
meson.project_name() + '-' + podcasts_version meson.project_name() + '-' + hammond_version
]) ])
org.gnome.Podcasts.json → org.gnome.Hammond.json
+5 -6
View File
@@ -1,12 +1,12 @@
{ {
"app-id" : "org.gnome.Podcasts", "app-id" : "org.gnome.Hammond",
"runtime" : "org.gnome.Platform", "runtime" : "org.gnome.Platform",
"runtime-version" : "3.28", "runtime-version" : "3.28",
"sdk" : "org.gnome.Sdk", "sdk" : "org.gnome.Sdk",
"sdk-extensions" : [ "sdk-extensions" : [
"org.freedesktop.Sdk.Extension.rust-stable" "org.freedesktop.Sdk.Extension.rust-stable"
], ],
"command" : "gnome-podcasts", "command" : "hammond",
"tags" : [ "tags" : [
"nightly" "nightly"
], ],
@@ -20,7 +20,6 @@
"--share=ipc", "--share=ipc",
"--socket=x11", "--socket=x11",
"--socket=wayland", "--socket=wayland",
"--socket=pulseaudio",
"--talk-name=org.freedesktop.Desktop" "--talk-name=org.freedesktop.Desktop"
], ],
"build-options" : { "build-options" : {
@@ -29,19 +28,19 @@
"--share=network" "--share=network"
], ],
"env" : { "env" : {
"CARGO_HOME" : "/run/build/Podcasts/cargo", "CARGO_HOME" : "/run/build/Hammond/cargo",
"RUST_BACKTRACE" : "1", "RUST_BACKTRACE" : "1",
"DEBUG" : "true" "DEBUG" : "true"
} }
}, },
"modules" : [ "modules" : [
{ {
"name" : "gnome-podcasts", "name" : "hammond",
"buildsystem" : "meson", "buildsystem" : "meson",
"sources" : [ "sources" : [
{ {
"type" : "git", "type" : "git",
"url" : "https://gitlab.gnome.org/World/podcasts.git", "url" : "https://gitlab.gnome.org/World/hammond.git",
"branch" : "master" "branch" : "master"
} }
] ]
podcasts-data/diesel.toml
-6
View File
@@ -1,6 +0,0 @@
# For documentation on how to configure this file,
# see diesel.rs/guides/configuring-diesel-cli
[print_schema]
file = "src/schema.rs"
patch_file = "src/schema.patch"
podcasts-data/migrations/2018-06-30-141659_remove_dead_fields/down.sql
-53
View File
@@ -1,53 +0,0 @@
ALTER TABLE episode RENAME TO old_table;
CREATE TABLE episode (
title TEXT NOT NULL,
uri TEXT,
local_uri TEXT,
description TEXT,
epoch INTEGER NOT NULL DEFAULT 0,
length INTEGER,
duration INTEGER,
guid TEXT,
played INTEGER,
podcast_id INTEGER NOT NULL,
favorite INTEGER DEFAULT 0,
archive INTEGER DEFAULT 0,
PRIMARY KEY (title, podcast_id)
);
INSERT INTO episode (title, uri, local_uri, description, epoch, length, duration, guid, played, podcast_id, favorite, archive)
SELECT title, uri, local_uri, description, epoch, length, duration, guid, played, podcast_id, 0, 0
FROM old_table;
Drop table old_table;
ALTER TABLE podcast RENAME TO old_table;
CREATE TABLE `podcast` (
`id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT UNIQUE,
`title` TEXT NOT NULL,
`link` TEXT NOT NULL,
`description` TEXT NOT NULL,
`image_uri` TEXT,
`source_id` INTEGER NOT NULL UNIQUE,
`favorite` INTEGER NOT NULL DEFAULT 0,
`archive` INTEGER NOT NULL DEFAULT 0,
`always_dl` INTEGER NOT NULL DEFAULT 0
);
INSERT INTO podcast (
id,
title,
link,
description,
image_uri,
source_id
) SELECT id,
title,
link,
description,
image_uri,
source_id
FROM old_table;
Drop table old_table;
podcasts-data/migrations/2018-06-30-141659_remove_dead_fields/up.sql
-66
View File
@@ -1,66 +0,0 @@
ALTER TABLE episode RENAME TO old_table;
CREATE TABLE episode (
title TEXT NOT NULL,
uri TEXT,
local_uri TEXT,
description TEXT,
epoch INTEGER NOT NULL DEFAULT 0,
length INTEGER,
duration INTEGER,
guid TEXT,
played INTEGER,
podcast_id INTEGER NOT NULL,
PRIMARY KEY (title, podcast_id)
);
INSERT INTO episode (
title,
uri,
local_uri,
description,
epoch,
length,
duration,
guid,
played,
podcast_id
) SELECT title,
uri,
local_uri,
description,
epoch, length,
duration,
guid,
played,
podcast_id
FROM old_table;
Drop table old_table;
ALTER TABLE podcast RENAME TO old_table;
CREATE TABLE `podcast` (
`id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT UNIQUE,
`title` TEXT NOT NULL,
`link` TEXT NOT NULL,
`description` TEXT NOT NULL,
`image_uri` TEXT,
`source_id` INTEGER NOT NULL UNIQUE
);
INSERT INTO podcast (
id,
title,
link,
description,
image_uri,
source_id
) SELECT id,
title,
link,
description,
image_uri,
source_id
FROM old_table;
Drop table old_table;
podcasts-data/migrations/2018-06-30-150717_rename_tables/down.sql
-40
View File
@@ -1,40 +0,0 @@
ALTER TABLE episodes RENAME TO old_table;
ALTER TABLE shows RENAME TO podcast;
CREATE TABLE episode (
title TEXT NOT NULL,
uri TEXT,
local_uri TEXT,
description TEXT,
epoch INTEGER NOT NULL DEFAULT 0,
length INTEGER,
duration INTEGER,
guid TEXT,
played INTEGER,
podcast_id INTEGER NOT NULL,
PRIMARY KEY (title, podcast_id)
);
INSERT INTO episode (
title,
uri,
local_uri,
description,
epoch,
length,
duration,
guid,
played,
podcast_id
) SELECT title,
uri,
local_uri,
description,
epoch, length,
duration,
guid,
played,
show_id
FROM old_table;
Drop table old_table;
podcasts-data/migrations/2018-06-30-150717_rename_tables/up.sql
-40
View File
@@ -1,40 +0,0 @@
ALTER TABLE episode RENAME TO old_table;
ALTER TABLE podcast RENAME TO shows;
CREATE TABLE episodes (
title TEXT NOT NULL,
uri TEXT,
local_uri TEXT,
description TEXT,
epoch INTEGER NOT NULL DEFAULT 0,
length INTEGER,
duration INTEGER,
guid TEXT,
played INTEGER,
show_id INTEGER NOT NULL,
PRIMARY KEY (title, show_id)
);
INSERT INTO episodes (
title,
uri,
local_uri,
description,
epoch,
length,
duration,
guid,
played,
show_id
) SELECT title,
uri,
local_uri,
description,
epoch, length,
duration,
guid,
played,
podcast_id
FROM old_table;
Drop table old_table;
podcasts-data/src/lib.rs
-152
View File
@@ -1,152 +0,0 @@
#![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
)
)]
// Enable lint group collections
#![warn(
nonstandard_style,
edition_2018,
rust_2018_idioms,
bad_style,
unused
)]
// standalone lints
#![warn(
const_err,
improper_ctypes,
non_shorthand_field_patterns,
no_mangle_generic_items,
overflowing_literals,
plugin_as_library,
private_no_mangle_fns,
private_no_mangle_statics,
unconditional_recursion,
unions_with_drop_fields,
while_true,
missing_debug_implementations,
missing_docs,
trivial_casts,
trivial_numeric_casts,
elided_lifetime_in_paths,
missing_copy_implementations
)]
#![deny(warnings)]
// warn when code is not using dyn Trait syntax. req rustc 1.27
// #![deny(bare_trait_object)]
//! 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, EpisodeWidgetModel, Show, ShowCoverModel, Source};
// Set the user agent, See #53 for more
// Keep this in sync with Tor-browser releases
/// The user-agent to be used for all the requests.
/// It originates from the Tor-browser UA.
pub const USER_AGENT: &str = "Mozilla/5.0 (Windows NT 6.1; rv:52.0) Gecko/20100101 Firefox/52.0";
/// [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 PODCASTS_XDG: xdg::BaseDirectories = {
xdg::BaseDirectories::with_prefix("gnome-podcasts").unwrap()
};
/// XDG_DATA Directory `Pathbuf`.
pub static ref PODCASTS_DATA: PathBuf = {
PODCASTS_XDG.create_data_directory(PODCASTS_XDG.get_data_home()).unwrap()
};
/// XDG_CONFIG Directory `Pathbuf`.
pub static ref PODCASTS_CONFIG: PathBuf = {
PODCASTS_XDG.create_config_directory(PODCASTS_XDG.get_config_home()).unwrap()
};
/// XDG_CACHE Directory `Pathbuf`.
pub static ref PODCASTS_CACHE: PathBuf = {
PODCASTS_XDG.create_cache_directory(PODCASTS_XDG.get_cache_home()).unwrap()
};
/// GNOME Podcasts Download Direcotry `PathBuf`.
pub static ref DL_DIR: PathBuf = {
PODCASTS_XDG.create_data_directory("Downloads").unwrap()
};
}
}

Some files were not shown because too many files have changed in this diff Show More