From d1962ab745683472f10fb80d68c248274f4b4c82 Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jordanpetridis@protonmail.com>
Date: Fri, 20 Apr 2018 10:15:27 +0300
Subject: [PATCH] Remove some boilerplate.

---
 hammond-data/src/dbqueries.rs | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/hammond-data/src/dbqueries.rs b/hammond-data/src/dbqueries.rs
index 38b9a4b..efd269c 100644
--- a/hammond-data/src/dbqueries.rs
+++ b/hammond-data/src/dbqueries.rs
@@ -119,24 +119,17 @@ pub fn get_episodes_widgets_filter_limit(
     filter_ids: &[i32],
     limit: u32,
 ) -> Result<Vec<EpisodeWidgetQuery>, DataError> {
-    use schema::episode;
+    use schema::episode::dsl::*;
     let db = connection();
     let con = db.get()?;
+    let columns = (
+        rowid, title, uri, local_uri, epoch, length, duration, played, podcast_id,
+    );
 
-    episode::table
-        .select((
-            episode::rowid,
-            episode::title,
-            episode::uri,
-            episode::local_uri,
-            episode::epoch,
-            episode::length,
-            episode::duration,
-            episode::played,
-            episode::podcast_id,
-        ))
-        .order(episode::epoch.desc())
-        .filter(episode::podcast_id.ne_all(filter_ids))
+    episode
+        .select(columns)
+        .order(epoch.desc())
+        .filter(podcast_id.ne_all(filter_ids))
         .limit(i64::from(limit))
         .load::<EpisodeWidgetQuery>(&con)
         .map_err(From::from)
@@ -190,10 +183,13 @@ pub fn get_pd_episodeswidgets(parent: &Podcast) -> Result<Vec<EpisodeWidgetQuery
     use schema::episode::dsl::*;
     let db = connection();
     let con = db.get()?;
+    let columns = (
+        rowid, title, uri, local_uri, epoch, length, duration, played, podcast_id,
+    );
 
-    episode.select((rowid, title, uri, local_uri, epoch, length, duration, played, podcast_id))
+    episode
+        .select(columns)
         .filter(podcast_id.eq(parent.id()))
-        // .group_by(epoch)
         .order(epoch.desc())
         .load::<EpisodeWidgetQuery>(&con)
         .map_err(From::from)