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

Allow the Copy trait to do the work for us.

Browse Source
This commit is contained in:
Rowan Lewis 2018-03-18 00:29:52 +01:00
parent e14f215793
commit f182d441d1
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
hammond-gtk/src/utils.rs
View File

@ -42,13 +42,13 @@ pub fn get_refresh_interval(settings: &Settings) -> Duration {
let time = settings.get_int("refresh-interval-time") as i64; let time = settings.get_int("refresh-interval-time") as i64;
let period = settings.get_string("refresh-interval-period").unwrap(); let period = settings.get_string("refresh-interval-period").unwrap();
time_period_to_duration(&time, period.as_str()) time_period_to_duration(time, period.as_str())
} }
pub fn get_cleanup_date(settings: &Settings) -> DateTime<Utc> { pub fn get_cleanup_date(settings: &Settings) -> DateTime<Utc> {
let time = settings.get_int("cleanup-age-time") as i64; let time = settings.get_int("cleanup-age-time") as i64;
let period = settings.get_string("cleanup-age-period").unwrap(); let period = settings.get_string("cleanup-age-period").unwrap();
let duration = time_period_to_duration(&time, period.as_str()); let duration = time_period_to_duration(time, period.as_str());
Utc::now() - duration Utc::now() - duration
} }
@ -164,13 +164,13 @@ fn lookup_id(id: u32) -> Result<String, Error> {
Ok(feedurl.into()) Ok(feedurl.into())
} }
pub fn time_period_to_duration(time: &i64, period: &str) -> Duration { pub fn time_period_to_duration(time: i64, period: &str) -> Duration {
match period { match period {
"weeks" => Duration::weeks(time.clone()), "weeks" => Duration::weeks(time),
"days" => Duration::days(time.clone()), "days" => Duration::days(time),
"hours" => Duration::hours(time.clone()), "hours" => Duration::hours(time),
"minutes" => Duration::minutes(time.clone()), "minutes" => Duration::minutes(time),
_ => Duration::seconds(time.clone()), _ => Duration::seconds(time),
} }
} }
@ -188,17 +188,14 @@ mod tests {
let hour = 3600 * time; let hour = 3600 * time;
let minute = 60 * time; let minute = 60 * time;
assert_eq!(week, time_period_to_duration(&time, "weeks").num_seconds()); assert_eq!(week, time_period_to_duration(time, "weeks").num_seconds());
assert_eq!(day, time_period_to_duration(&time, "days").num_seconds()); assert_eq!(day, time_period_to_duration(time, "days").num_seconds());
assert_eq!(hour, time_period_to_duration(&time, "hours").num_seconds()); assert_eq!(hour, time_period_to_duration(time, "hours").num_seconds());
assert_eq!( assert_eq!(
minute, minute,
time_period_to_duration(&time, "minutes").num_seconds() time_period_to_duration(time, "minutes").num_seconds()
);
assert_eq!(
time,
time_period_to_duration(&time, "seconds").num_seconds()
); );
assert_eq!(time, time_period_to_duration(time, "seconds").num_seconds());
} }
#[test] #[test]