Merge branch 'synchronize-feed-updates' into 'master'

Synchronize feed updates

Closes #166

See merge request World/podcasts!133

podcasts-gtk/src/app.rs

@@ -34,7 +34,7 @@ use gettextrs::{bindtextdomain, setlocale, textdomain, LocaleCategory};
 
 use crossbeam_channel::Receiver;
 use fragile::Fragile;
-use podcasts_data::Show;
+use podcasts_data::{Show, Source};
 
 use crate::settings;
 use crate::stacks::PopulatedState;
@@ -138,7 +138,9 @@ pub(crate) enum Action {
     HeaderBarShowTile(String),
     HeaderBarNormal,
     MarkAllPlayerNotification(Arc<Show>),
+    UpdateFeed(Option<Vec<Source>>),
     ShowUpdateNotif(Receiver<bool>),
+    StopUpdating,
     RemoveShow(Arc<Show>),
     ErrorNotification(String),
     InitEpisode(i32),
@@ -248,6 +250,17 @@ impl PdApplication {
                     let notif = InAppNotification::new(&err, 6000, callback, undo_cb);
                     notif.show(&window.overlay);
                 }
+                Action::UpdateFeed(source) => {
+                    if window.updating.get() {
+                        info!("Ignoring feed update request (another one is already running)")
+                    } else {
+                        window.updating.set(true);
+                        utils::refresh_feed(source, window.sender.clone())
+                    }
+                }
+                Action::StopUpdating => {
+                    window.updating.set(false);
+                }
                 Action::ShowUpdateNotif(receiver) => {
                     let sender = window.sender.clone();
                     let callback = move |revealer: gtk::Revealer| match receiver.try_recv() {
@@ -255,9 +268,15 @@ impl PdApplication {
                         Err(TryRecvError::Disconnected) => glib::Continue(false),
                         Ok(_) => {
                             revealer.set_reveal_child(false);
+
+                            sender
+                                .send(Action::StopUpdating)
+                                .expect("Action channel blew up somehow");
+
                             sender
                                 .send(Action::RefreshAllViews)
                                 .expect("Action channel blew up somehow");
+
                             glib::Continue(false)
                         }
                     };
@@ -269,6 +288,7 @@ impl PdApplication {
 
                     let old = window.updater.replace(Some(updater));
                     old.map(|i| i.destroy());
+
                     window
                         .updater
                         .borrow()

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);
             }

podcasts-gtk/src/utils.rs

@@ -203,10 +203,10 @@ pub(crate) fn cleanup(cleanup_date: DateTime<Utc>) {
         .ok();
 }
 
-pub(crate) fn refresh<S>(source: Option<S>, sender: Sender<Action>)
+/// Schedule feed refresh
-where
+/// If `source` is None, Refreshes all sources in the database.
-    S: IntoIterator<Item = Source> + Send + 'static,
+/// Current implementation ignores update request if another update is already running
-{
+pub(crate) fn schedule_refresh(source: Option<Vec<Source>>, sender: Sender<Action>) {
     // If we try to update the whole db,
     // Exit early if `source` table is empty
     if source.is_none() {
@@ -220,15 +220,16 @@ where
         };
     }
 
-    refresh_feed(source, sender)
+    sender
+        .send(Action::UpdateFeed(source))
+        .expect("Action channel blew up somehow")
 }
 
 /// Update the rss feed(s) originating from `source`.
 /// If `source` is None, Fetches all the `Source` entries in the database and updates them.
-fn refresh_feed<S>(source: Option<S>, sender: Sender<Action>)
+/// Do not call this function directly unless you are sure no other updates are running.
-where
+/// Use `schedule_refresh()` instead
-    S: IntoIterator<Item = Source> + Send + 'static,
+pub(crate) fn refresh_feed(source: Option<Vec<Source>>, sender: Sender<Action>) {
-{
     rayon::spawn(move || {
         let (up_sender, up_receiver) = bounded(1);
         sender
@@ -420,7 +421,7 @@ pub(crate) fn on_import_clicked(window: &gtk::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");

podcasts-gtk/src/window.rs

@@ -36,7 +36,7 @@ use crate::widgets::about_dialog;
 use crate::widgets::appnotif::InAppNotification;
 use crate::widgets::player;
 
-use std::cell::RefCell;
+use std::cell::{Cell, RefCell};
 use std::ops::Deref;
 use std::rc::Rc;
 
@@ -65,6 +65,7 @@ pub struct MainWindow {
     pub(crate) content: Rc<Content>,
     pub(crate) headerbar: Rc<Header>,
     pub(crate) player: player::PlayerWrapper,
+    pub(crate) updating: Cell<bool>,
     pub(crate) updater: RefCell<Option<InAppNotification>>,
     pub(crate) sender: Sender<Action>,
     pub(crate) receiver: Receiver<Action>,
@@ -137,7 +138,7 @@ impl MainWindow {
         if settings.get_boolean("refresh-on-startup") {
             info!("Refresh on startup.");
             let s: Option<Vec<_>> = None;
-            utils::refresh(s, sender.clone());
+            utils::schedule_refresh(s, sender.clone());
         }
 
         let refresh_interval = settings::get_refresh_interval(&settings).num_seconds() as u32;
@@ -146,7 +147,7 @@ impl MainWindow {
         let r_sender = sender.clone();
         gtk::timeout_add_seconds(refresh_interval, move || {
             let s: Option<Vec<_>> = None;
-            utils::refresh(s, r_sender.clone());
+            utils::schedule_refresh(s, r_sender.clone());
 
             glib::Continue(true)
         });
@@ -158,6 +159,7 @@ impl MainWindow {
             headerbar: header,
             content,
             player,
+            updating: Cell::new(false),
             updater,
             sender,
             receiver,
@@ -178,7 +180,7 @@ impl MainWindow {
         action(&self.window, "refresh", clone!(sender => move |_, _| {
             gtk::idle_add(clone!(sender => move || {
                 let s: Option<Vec<_>> = None;
-                utils::refresh(s, sender.clone());
+                utils::schedule_refresh(s, sender.clone());
                 glib::Continue(false)
             }));
         }));