Made Disel NewModels private.

This commit is contained in:
Jordan Petridis
2017-11-22 05:50:25 +02:00
parent ee7c5ca26e
commit 9bc6df2cba
12 changed files with 35 additions and 51 deletions
+1 -1
View File
@@ -40,7 +40,7 @@ impl<'a> NewSource<'a> {
#[derive(Insertable)]
#[table_name = "episode"]
#[derive(Debug, Clone)]
#[derive(Debug, Clone, Default)]
pub struct NewEpisode<'a> {
pub title: Option<&'a str>,
pub uri: Option<String>,
+5 -19
View File
@@ -1,4 +1,3 @@
use reqwest;
use diesel::SaveChangesDsl;
use diesel::result::QueryResult;
@@ -9,7 +8,7 @@ use schema::{episode, podcast, source};
use feed::Feed;
use errors::*;
use models::insertables::NewPodcast;
use models::insertables::NewSource;
use connection;
use std::io::Read;
@@ -153,23 +152,6 @@ pub struct Podcast {
source_id: i32,
}
/// This is meant only to be used to make unit tests easier.
impl From<NewPodcast> for Podcast {
fn from(pd: NewPodcast) -> Podcast {
Podcast {
id: 0,
title: pd.title,
link: pd.link,
description: pd.description,
image_uri: pd.image_uri,
source_id: pd.source_id,
always_dl: false,
archive: false,
favorite: false,
}
}
}
impl Podcast {
pub fn source_id(&self) -> i32 {
self.source_id
@@ -336,4 +318,8 @@ impl<'a> Source {
Ok(Feed::from_channel_source(chan, self))
}
pub fn from_url(uri: &str) -> QueryResult<Source> {
NewSource::new_with_uri(uri).into_source()
}
}