From 31bd75ae45806e52ae4187870289ed48d040311b Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Wed, 7 Feb 2018 07:02:24 +0200 Subject: [PATCH] Minor Arc changes. --- hammond-gtk/src/app.rs | 4 ++-- hammond-gtk/src/views/episodes.rs | 6 +++--- hammond-gtk/src/views/shows.rs | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hammond-gtk/src/app.rs b/hammond-gtk/src/app.rs index 71b7f88..a75eba7 100644 --- a/hammond-gtk/src/app.rs +++ b/hammond-gtk/src/app.rs @@ -23,7 +23,7 @@ pub enum Action { RefreshShowsView, RefreshWidget, RefreshWidgetIfVis, - ReplaceWidget(Podcast), + ReplaceWidget(Arc), RefreshWidgetIfSame(i32), ShowWidgetAnimated, ShowShowsAnimated, @@ -136,7 +136,7 @@ impl App { Ok(Action::RefreshEpisodesView) => content.update_episode_view(), Ok(Action::RefreshEpisodesViewBGR) => content.update_episode_view_if_baground(), Ok(Action::ReplaceWidget(pd)) => { - if let Err(err) = content.get_shows().replace_widget(Arc::new(pd)) { + if let Err(err) = content.get_shows().replace_widget(pd) { error!("Something went wrong while trying to update the ShowWidget."); error!("Error: {}", err); } diff --git a/hammond-gtk/src/views/episodes.rs b/hammond-gtk/src/views/episodes.rs index ca10f43..78a6bc0 100644 --- a/hammond-gtk/src/views/episodes.rs +++ b/hammond-gtk/src/views/episodes.rs @@ -77,11 +77,11 @@ impl Default for EpisodesView { impl EpisodesView { pub fn new(sender: Sender) -> Result { let view = EpisodesView::default(); - let episodes = dbqueries::get_episodes_widgets_with_limit(50)?; + let mut episodes = dbqueries::get_episodes_widgets_with_limit(50)?; let now_utc = Utc::now(); - episodes.into_iter().for_each(|mut ep| { - let viewep = EpisodesViewWidget::new(&mut ep, sender.clone()); + episodes.iter_mut().for_each(|ep| { + let viewep = EpisodesViewWidget::new(ep, sender.clone()); let t = split(&now_utc, i64::from(ep.epoch())); match t { diff --git a/hammond-gtk/src/views/shows.rs b/hammond-gtk/src/views/shows.rs index 736ceb9..d3f57f0 100644 --- a/hammond-gtk/src/views/shows.rs +++ b/hammond-gtk/src/views/shows.rs @@ -84,7 +84,7 @@ fn on_child_activate(child: >k::FlowBoxChild, sender: Sender) -> Resul let id = WidgetExt::get_name(child) .ok_or_else(|| format_err!("Faild to get \"episodes\" child from the stack."))? .parse::()?; - let pd = 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::ReplaceWidget(pd))?;