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

Connect settings for auto refresh and cleanup.

Browse Source
This commit is contained in:
Rowan Lewis
2018-03-16 23:23:06 +01:00
parent a253d7ebf5
commit a7540583d6
5 changed files with 103 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hammond-gtk/Cargo.toml
+4 -1
View File
@@ -10,7 +10,6 @@ chrono = "0.4.0"
dissolve = "0.2.2"
gdk = "0.7.0"
gdk-pixbuf = "0.3.0"
gio = "0.3.0"
glib = "0.4.1"
humansize = "1.1.0"
lazy_static = "1.0.0"
@@ -31,6 +30,10 @@ serde_json = "1.0.11"
features = ["v3_22"]
version = "0.3.0"
[dependencies.gio]
features = ["v2_50"]
version = "0.3.0"
[dependencies.hammond-data]
path = "../hammond-data"
hammond-gtk/resources/org.gnome.Hammond.gschema.xml
+2 -6
View File
@@ -33,16 +33,12 @@
<summary>Whether to refresh content after startup</summary>
</key>
<key name="auto-cleanup" type="b">
<default>true</default>
<summary>Whether to periodically cleanup content</summary>
</key>
<key name="auto-cleanup-time" type="i">
<key name="cleanup-age-time" type="i">
<range min="1" max="100"/>
<default>2</default>
<summary>How many periods of time to wait between automatic cleanups</summary>
</key>
<key name="auto-cleanup-period" enum="org.gnome.Hammond.timePeriods">
<key name="cleanup-age-period" enum="org.gnome.Hammond.timePeriods">
<default>'days'</default>
<summary>What period of time to wait between automatic cleanups</summary>
</key>
hammond-gtk/src/app.rs
+36 -22
View File
@@ -1,12 +1,11 @@
#![allow(new_without_default)]
use gio::{ApplicationExt, ApplicationExtManual, ApplicationFlags};
use gio::{ApplicationExt, ApplicationExtManual, ApplicationFlags, Settings, SettingsExt};
use glib;
use gtk;
use gtk::prelude::*;
use hammond_data::{Podcast, Source};
use hammond_data::utils::checkup;
use appnotif::*;
use headerbar::Header;
@@ -47,6 +46,7 @@ pub struct App {
content: Arc<Content>,
receiver: Receiver<Action>,
sender: Sender<Action>,
settings: Settings,
}
impl App {
@@ -84,6 +84,8 @@ impl App {
// Add the overlay to the main window
window.add(&overlay);
let settings = Settings::new("org.gnome.Hammond");
App {
app_instance: application,
window,
@@ -92,33 +94,45 @@ impl App {
content,
receiver,
sender,
settings,
}
}
fn setup_timed_callbacks(&self) {
let sender = self.sender.clone();
self.setup_refresh_on_startup();
self.setup_auto_refresh();
}
fn setup_refresh_on_startup(&self) {
// Update the feeds right after the Application is initialized.
gtk::timeout_add_seconds(2, move || {
utils::refresh_feed_wrapper(None, sender.clone());
glib::Continue(false)
});
if self.settings.get_boolean("refresh-on-startup") {
let cleanup_age = utils::get_cleanup_age(&self.settings);
let sender = self.sender.clone();
info!("Refresh on startup.");
gtk::timeout_add_seconds(2, move || {
utils::refresh(None, sender.clone());
utils::cleanup(cleanup_age);
glib::Continue(false)
});
}
}
fn setup_auto_refresh(&self) {
let refresh_interval = utils::get_refresh_interval(&self.settings);
let cleanup_age = utils::get_cleanup_age(&self.settings);
let sender = self.sender.clone();
// Auto-updater, runs every hour.
// TODO: expose the interval in which it run to a user setting.
gtk::timeout_add_seconds(3600, move || {
utils::refresh_feed_wrapper(None, sender.clone());
info!("Auto-refresh every {:?} seconds.", refresh_interval);
gtk::timeout_add_seconds(refresh_interval, move || {
utils::refresh(None, sender.clone());
utils::cleanup(cleanup_age);
glib::Continue(true)
});
// Run a database checkup once the application is initialized.
gtk::timeout_add(300, || {
if let Err(err) = checkup() {
error!("Check up failed: {}", err);
}
glib::Continue(false)
});
}
pub fn run(self) {
@@ -137,9 +151,9 @@ impl App {
match receiver.recv_timeout(Duration::from_millis(10)) {
Ok(Action::UpdateSources(source)) => {
if let Some(s) = source {
utils::refresh_feed_wrapper(Some(vec![s]), sender.clone());
utils::refresh(Some(vec![s]), sender.clone());
} else {
utils::refresh_feed_wrapper(None, sender.clone());
utils::refresh(None, sender.clone());
}
}
Ok(Action::RefreshAllViews) => content.update(),
hammond-gtk/src/utils.rs
+53 -1
View File
@@ -2,6 +2,7 @@
use failure::Error;
use gdk_pixbuf::Pixbuf;
use gio::{Settings, SettingsExt};
use regex::Regex;
use reqwest;
use send_cell::SendCell;
@@ -11,6 +12,7 @@ use serde_json::Value;
use hammond_data::{PodcastCoverQuery, Source};
use hammond_data::dbqueries;
use hammond_data::pipeline;
use hammond_data::utils::checkup;
use hammond_downloader::downloader;
use std::collections::HashMap;
@@ -20,13 +22,33 @@ use std::thread;
use app::Action;
pub fn refresh_feed_wrapper(source: Option<Vec<Source>>, sender: Sender<Action>) {
pub fn cleanup(age: u32) {
if let Err(err) = checkup(age) {
error!("Check up failed: {}", err);
}
}
pub fn refresh(source: Option<Vec<Source>>, sender: Sender<Action>) {
if let Err(err) = refresh_feed(source, sender) {
error!("An error occured while trying to update the feeds.");
error!("Error: {}", err);
}
}
pub fn get_refresh_interval(settings: &Settings) -> u32 {
let time = settings.get_int("auto-refresh-time") as u32;
let period = settings.get_string("auto-refresh-period").unwrap();
time_period_to_seconds(&time, period.as_str())
}
pub fn get_cleanup_age(settings: &Settings) -> u32 {
let time = settings.get_int("auto-refresh-time") as u32;
let period = settings.get_string("auto-refresh-period").unwrap();
time_period_to_seconds(&time, period.as_str())
}
/// Update the rss feed(s) originating from `source`.
/// If `source` is None, Fetches all the `Source` entries in the database and updates them.
/// When It's done,it queues up a `RefreshViews` action.
@@ -138,12 +160,42 @@ fn lookup_id(id: u32) -> Result<String, Error> {
Ok(feedurl.into())
}
pub fn time_period_to_seconds(time: &u32, period: &str) -> u32 {
match period {
"weeks" => time * 604800,
"days" => time * 86400,
"hours" => time * 3600,
"minutes" => time * 60,
_ => time * 1,
}
}
#[cfg(test)]
mod tests {
use super::*;
use hammond_data::Source;
use hammond_data::dbqueries;
#[test]
fn test_time_period_to_seconds() {
let time = 2 as u32;
let week = 604800 * time as u32;
let day = 86400 * time as u32;
let hour = 3600 * time as u32;
let minute = 60 * time as u32;
let from_weeks = time_period_to_seconds(&time, "weeks");
let from_days = time_period_to_seconds(&time, "days");
let from_hours = time_period_to_seconds(&time, "hours");
let from_minutes = time_period_to_seconds(&time, "minutes");
let from_seconds = time_period_to_seconds(&time, "seconds");
assert_eq!(week, from_weeks);
assert_eq!(day, from_days);
assert_eq!(hour, from_hours);
assert_eq!(minute, from_minutes);
assert_eq!(time, from_seconds);
}
#[test]
// This test inserts an rss feed to your `XDG_DATA/hammond/hammond.db` so we make it explicit
// to run it.