toxblh/podcasts
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed Episode pub_date setter to accept &str again.

Browse Source
This commit is contained in:
Jordan Petridis 2017-10-05 18:41:51 +03:00
parent cbc0692482
commit 78454f6474
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hammond-data/src/index_feed.rs
View File

@ -45,7 +45,7 @@ fn index_episode(con: &SqliteConnection, ep: &NewEpisode) -> Result<()> {
{ {
foo.set_title(ep.title); foo.set_title(ep.title);
foo.set_description(ep.description); foo.set_description(ep.description);
foo.set_published_date(ep.published_date.clone()); foo.set_published_date(ep.published_date.as_ref().map(|x| x.as_str()));
foo.set_guid(ep.guid); foo.set_guid(ep.guid);
foo.set_length(ep.length); foo.set_length(ep.length);
foo.set_epoch(ep.epoch); foo.set_epoch(ep.epoch);
@ -150,7 +150,6 @@ fn index_channel_items(
} }
// TODO: maybe refactor into an Iterator for lazy evaluation. // TODO: maybe refactor into an Iterator for lazy evaluation.
// TODO: After fixing etag/lmod, add sent_etag:bool arg and logic to bypass it.
pub fn fetch_feeds( pub fn fetch_feeds(
connection: Arc<Mutex<SqliteConnection>>, connection: Arc<Mutex<SqliteConnection>>,
force: bool, force: bool,

7
hammond-data/src/models.rs
View File

@ -65,10 +65,8 @@ impl Episode {
self.published_date.as_ref().map(|s| s.as_str()) self.published_date.as_ref().map(|s| s.as_str())
} }
// FIXME: make the setter accept &str again pub fn set_published_date(&mut self, value: Option<&str>) {
pub fn set_published_date(&mut self, value: Option<String>) { self.published_date = value.map(|x| x.to_string().to_owned());
// self.published_date = value.map(|x| x.to_string());
self.published_date = value;
} }
pub fn guid(&self) -> Option<&str> { pub fn guid(&self) -> Option<&str> {
@ -228,7 +226,6 @@ pub struct NewEpisode<'a> {
pub uri: Option<&'a str>, pub uri: Option<&'a str>,
pub local_uri: Option<&'a str>, pub local_uri: Option<&'a str>,
pub description: Option<&'a str>, pub description: Option<&'a str>,
// FIXME: make it &str again
pub published_date: Option<String>, pub published_date: Option<String>,
pub length: Option<i32>, pub length: Option<i32>,
pub guid: Option<&'a str>, pub guid: Option<&'a str>,