Allow cleanup to be blocking on startup and remove cleanup from automatic content refreshes.

This commit is contained in:
Rowan Lewis 2018-03-17 23:50:59 +01:00
parent 34536f4e21
commit e14f215793

View File

@ -3,8 +3,8 @@
use gio::{ApplicationExt, ApplicationExtManual, ApplicationFlags, Settings, SettingsExt}; use gio::{ApplicationExt, ApplicationExtManual, ApplicationFlags, Settings, SettingsExt};
use glib; use glib;
use gtk; use gtk;
use gtk::prelude::*;
use gtk::SettingsExt as GtkSettingsExt; use gtk::SettingsExt as GtkSettingsExt;
use gtk::prelude::*;
use hammond_data::{Podcast, Source}; use hammond_data::{Podcast, Source};
@ -120,9 +120,10 @@ impl App {
info!("Refresh on startup."); info!("Refresh on startup.");
utils::cleanup(cleanup_date);
gtk::timeout_add_seconds(2, move || { gtk::timeout_add_seconds(2, move || {
utils::refresh(None, sender.clone()); utils::refresh(None, sender.clone());
utils::cleanup(cleanup_date);
glib::Continue(false) glib::Continue(false)
}); });
@ -131,14 +132,12 @@ impl App {
fn setup_auto_refresh(&self) { fn setup_auto_refresh(&self) {
let refresh_interval = utils::get_refresh_interval(&self.settings).num_seconds() as u32; let refresh_interval = utils::get_refresh_interval(&self.settings).num_seconds() as u32;
let cleanup_date = utils::get_cleanup_date(&self.settings);
let sender = self.sender.clone(); let sender = self.sender.clone();
info!("Auto-refresh every {:?} seconds.", refresh_interval); info!("Auto-refresh every {:?} seconds.", refresh_interval);
gtk::timeout_add_seconds(refresh_interval, move || { gtk::timeout_add_seconds(refresh_interval, move || {
utils::refresh(None, sender.clone()); utils::refresh(None, sender.clone());
utils::cleanup(cleanup_date);
glib::Continue(true) glib::Continue(true)
}); });