Models: Change the Query suffix to Model.

This is maps better to the MVC naming convention.

hammond-gtk/src/widgets/episode.rs

@@ -12,7 +12,7 @@ use open;
 
 use hammond_data::dbqueries;
 use hammond_data::utils::get_download_folder;
-use hammond_data::EpisodeWidgetQuery;
+use hammond_data::EpisodeWidgetModel;
 
 use app::Action;
 use manager;
@@ -68,7 +68,7 @@ struct Buttons {
 }
 
 impl InfoLabels {
-    fn init(&self, episode: &EpisodeWidgetQuery) {
+    fn init(&self, episode: &EpisodeWidgetModel) {
         // Set the title label state.
         self.set_title(episode);
 
@@ -82,7 +82,7 @@ impl InfoLabels {
         self.set_size(episode.length())
     }
 
-    fn set_title(&self, episode: &EpisodeWidgetQuery) {
+    fn set_title(&self, episode: &EpisodeWidgetModel) {
         self.title.set_text(episode.title());
 
         if episode.played().is_some() {
@@ -206,7 +206,7 @@ impl Default for EpisodeWidget {
 }
 
 impl EpisodeWidget {
-    pub fn new(episode: &EpisodeWidgetQuery, sender: &Sender<Action>) -> Rc<Self> {
+    pub fn new(episode: &EpisodeWidgetModel, sender: &Sender<Action>) -> Rc<Self> {
         let widget = Rc::new(Self::default());
         widget.info.init(episode);
         Self::determine_buttons_state(&widget, episode, sender)
@@ -297,7 +297,7 @@ impl EpisodeWidget {
     /// -------------------
     fn determine_buttons_state(
         widget: &Rc<Self>,
-        episode: &EpisodeWidgetQuery,
+        episode: &EpisodeWidgetModel,
         sender: &Sender<Action>,
     ) -> Result<(), Error> {
         // Reset the buttons state no matter the glade file.
@@ -428,7 +428,7 @@ impl EpisodeWidget {
     }
 }
 
-fn on_download_clicked(ep: &EpisodeWidgetQuery, sender: &Sender<Action>) -> Result<(), Error> {
+fn on_download_clicked(ep: &EpisodeWidgetModel, sender: &Sender<Action>) -> Result<(), Error> {
     let pd = dbqueries::get_podcast_from_id(ep.show_id())?;
     let download_fold = get_download_folder(&pd.title())?;
 
@@ -442,7 +442,7 @@ fn on_download_clicked(ep: &EpisodeWidgetQuery, sender: &Sender<Action>) -> Resu
 
 fn on_play_bttn_clicked(
     widget: &Rc<EpisodeWidget>,
-    episode: &mut EpisodeWidgetQuery,
+    episode: &mut EpisodeWidgetModel,
     sender: &Sender<Action>,
 ) -> Result<(), Error> {
     // Mark played

hammond-gtk/src/widgets/home_view.rs

@@ -6,7 +6,7 @@ use gtk::prelude::*;
 
 use crossbeam_channel::Sender;
 use hammond_data::dbqueries;
-use hammond_data::EpisodeWidgetQuery;
+use hammond_data::EpisodeWidgetModel;
 use send_cell::SendCell;
 
 use app::Action;
@@ -93,7 +93,7 @@ impl HomeView {
         let now_utc = Utc::now();
 
         let view_ = view.clone();
-        let func = move |ep: EpisodeWidgetQuery| {
+        let func = move |ep: EpisodeWidgetModel| {
             let epoch = ep.epoch();
             let widget = HomeEpisode::new(&ep, &sender);
 
@@ -197,7 +197,7 @@ impl Default for HomeEpisode {
 }
 
 impl HomeEpisode {
-    fn new(episode: &EpisodeWidgetQuery, sender: &Sender<Action>) -> HomeEpisode {
+    fn new(episode: &EpisodeWidgetModel, sender: &Sender<Action>) -> HomeEpisode {
         let builder =
             gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/episodes_view_widget.ui");
         let container: gtk::Box = builder.get_object("container").unwrap();

hammond-gtk/src/widgets/player.rs

@@ -14,7 +14,7 @@ use failure::Error;
 use send_cell::SendCell;
 
 use hammond_data::{dbqueries, USER_AGENT};
-use hammond_data::{EpisodeWidgetQuery, ShowCoverQuery};
+use hammond_data::{EpisodeWidgetModel, ShowCoverModel};
 
 use app::Action;
 use utils::set_image_from_path;
@@ -49,23 +49,23 @@ struct PlayerInfo {
 
 impl PlayerInfo {
     // FIXME: create a Diesel Model of the joined episode and podcast query instead
-    fn init(&self, episode: &EpisodeWidgetQuery, podcast: &ShowCoverQuery) {
+    fn init(&self, episode: &EpisodeWidgetModel, podcast: &ShowCoverModel) {
         self.set_cover_image(podcast);
         self.set_show_title(podcast);
         self.set_episode_title(episode);
     }
 
-    fn set_episode_title(&self, episode: &EpisodeWidgetQuery) {
+    fn set_episode_title(&self, episode: &EpisodeWidgetModel) {
         self.episode.set_text(episode.title());
         self.episode.set_tooltip_text(episode.title());
     }
 
-    fn set_show_title(&self, show: &ShowCoverQuery) {
+    fn set_show_title(&self, show: &ShowCoverModel) {
         self.show.set_text(show.title());
         self.show.set_tooltip_text(show.title());
     }
 
-    fn set_cover_image(&self, show: &ShowCoverQuery) {
+    fn set_cover_image(&self, show: &ShowCoverModel) {
         set_image_from_path(&self.cover, show.id(), 34)
             .map_err(|err| error!("Player Cover: {}", err))
             .ok();