Removed id function from diesel models.

It's automaticly declared upon derive identifiable,
And there's no need to overwrite it.

hammond-data/Cargo.toml

@@ -18,11 +18,13 @@ xdg = "2.1.0"
 
 [dependencies.diesel]
 features = ["sqlite"]
+# version = "0.16.0"
 git = "https://github.com/diesel-rs/diesel.git"
 
 [dependencies.diesel_codegen]
 features = ["sqlite"]
-version = "0.16.0"
+# version = "0.16.0"
+git = "https://github.com/diesel-rs/diesel.git"
 
 [dev-dependencies]
 rand = "0.3.18"

hammond-data/src/dbqueries.rs

@@ -127,8 +127,8 @@ pub fn remove_feed(db: &Database, pd: &Podcast) -> QueryResult<usize> {
 
     tempdb.transaction(|| -> QueryResult<usize> {
         delete_source(&tempdb, pd.source_id())?;
-        delete_podcast(&tempdb, pd.id())?;
-        delete_podcast_episodes(&tempdb, pd.id())
+        delete_podcast(&tempdb, *pd.id())?;
+        delete_podcast_episodes(&tempdb, *pd.id())
     })
 }
 

hammond-data/src/feed.rs

@@ -1,4 +1,5 @@
 use rayon::prelude::*;
+use diesel::Identifiable;
 
 use rss;
 
@@ -38,7 +39,7 @@ impl Feed {
     }
 
     fn index_channel(&self, db: &Database) -> Result<Podcast> {
-        let pd = parser::new_podcast(&self.channel, self.source.id());
+        let pd = parser::new_podcast(&self.channel, *self.source.id());
         // Convert NewPodcast to Podcast
         pd.into_podcast(db)
     }
@@ -49,7 +50,7 @@ impl Feed {
     fn index_channel_items(&self, db: &Database, pd: &Podcast) -> Result<()> {
         let it = self.channel.items();
         let episodes: Vec<_> = it.par_iter()
-            .map(|x| parser::new_episode(x, pd.id()))
+            .map(|x| parser::new_episode(x, *pd.id()))
             .collect();
 
         episodes.into_par_iter().for_each(|x| {

hammond-data/src/models/queryables.rs

@@ -39,10 +39,6 @@ pub struct Episode {
 }
 
 impl Episode {
-    pub fn id(&self) -> i32 {
-        self.id
-    }
-
     pub fn title(&self) -> Option<&str> {
         self.title.as_ref().map(|s| s.as_str())
     }
@@ -173,10 +169,6 @@ impl From<NewPodcast> for Podcast {
 }
 
 impl Podcast {
-    pub fn id(&self) -> i32 {
-        self.id
-    }
-
     pub fn source_id(&self) -> i32 {
         self.source_id
     }
@@ -251,10 +243,6 @@ pub struct Source {
 }
 
 impl<'a> Source {
-    pub fn id(&self) -> i32 {
-        self.id
-    }
-
     pub fn uri(&self) -> &str {
         &self.uri
     }