diff --git a/podcasts-gtk/src/headerbar.rs b/podcasts-gtk/src/headerbar.rs index 3445082..63854e1 100644 --- a/podcasts-gtk/src/headerbar.rs +++ b/podcasts-gtk/src/headerbar.rs @@ -32,7 +32,7 @@ use podcasts_data::{dbqueries, Source}; use crate::app::Action; use crate::stacks::Content; -use crate::utils::{itunes_to_rss, refresh}; +use crate::utils::{itunes_to_rss, schedule_refresh}; use std::rc::Rc; @@ -85,7 +85,7 @@ impl AddPopover { rayon::spawn(clone!(sender => move || { if let Ok(source) = Source::from_url(&url) { - refresh(Some(vec![source]), sender.clone()); + schedule_refresh(Some(vec![source]), sender.clone()); } else { error!("Failed to convert, url: {}, to a source entry", url); } diff --git a/podcasts-gtk/src/utils.rs b/podcasts-gtk/src/utils.rs index 77a81f1..7efa171 100644 --- a/podcasts-gtk/src/utils.rs +++ b/podcasts-gtk/src/utils.rs @@ -206,7 +206,7 @@ pub(crate) fn cleanup(cleanup_date: DateTime) { /// Schedule feed refresh /// If `source` is None, Refreshes all sources in the database. /// Current implementation ignores update request if another update is already running -pub(crate) fn refresh(source: Option>, sender: Sender) { +pub(crate) fn schedule_refresh(source: Option>, sender: Sender) { // If we try to update the whole db, // Exit early if `source` table is empty if source.is_none() { @@ -228,7 +228,7 @@ pub(crate) fn refresh(source: Option>, sender: Sender) { /// Update the rss feed(s) originating from `source`. /// If `source` is None, Fetches all the `Source` entries in the database and updates them. /// Do not call this function directly unless you are sure no other updates are running. -/// Use `refresh()` instead +/// Use `schedule_refresh()` instead pub(crate) fn refresh_feed(source: Option>, sender: Sender) { rayon::spawn(move || { let (up_sender, up_receiver) = bounded(1); @@ -421,7 +421,7 @@ pub(crate) fn on_import_clicked(window: >k::ApplicationWindow, sender: &Sender // Parse the file and import the feeds if let Ok(sources) = opml::import_from_file(filename) { // Refresh the successfully parsed feeds to index them - refresh(Some(sources), sender) + schedule_refresh(Some(sources), sender) } else { let text = i18n("Failed to parse the imported file"); sender.send(Action::ErrorNotification(text)).expect("Action channel blew up somehow"); diff --git a/podcasts-gtk/src/window.rs b/podcasts-gtk/src/window.rs index 7227eb3..98eb2a0 100644 --- a/podcasts-gtk/src/window.rs +++ b/podcasts-gtk/src/window.rs @@ -138,7 +138,7 @@ impl MainWindow { if settings.get_boolean("refresh-on-startup") { info!("Refresh on startup."); let s: Option> = None; - utils::refresh(s, sender.clone()); + utils::schedule_refresh(s, sender.clone()); } let refresh_interval = settings::get_refresh_interval(&settings).num_seconds() as u32; @@ -147,7 +147,7 @@ impl MainWindow { let r_sender = sender.clone(); gtk::timeout_add_seconds(refresh_interval, move || { let s: Option> = None; - utils::refresh(s, r_sender.clone()); + utils::schedule_refresh(s, r_sender.clone()); glib::Continue(true) }); @@ -180,7 +180,7 @@ impl MainWindow { action(&self.window, "refresh", clone!(sender => move |_, _| { gtk::idle_add(clone!(sender => move || { let s: Option> = None; - utils::refresh(s, sender.clone()); + utils::schedule_refresh(s, sender.clone()); glib::Continue(false) })); }));