andrey/album
1
0
Fork 0
Code Issues 10 Pull Requests Packages Projects Releases Wiki Activity

Get rid of direct time dependency.

Browse Source 
Using std and chrono should be enough.
This commit is contained in:
Rasmus Kaj 2019-12-26 15:52:53 +01:00
parent 3077ca967c
commit 08ec114b7c
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.toml
View File

@ -30,7 +30,6 @@ serde = { version = "1.0.0", features = ["derive"] }
serde_json = "1.0"
slug = "0.1"
structopt = { version = "0.3.0", features = ["wrap_help"] }
time = "0.1.42"
[dependencies.diesel]
default-features = false

14
src/server/views_by_date.rs
View File

@ -4,13 +4,13 @@ use super::{not_found, redirect_to_img, Context, ImgRange, Link, PhotoLink};
use crate::models::{Photo, SizeTag};
use crate::templates;
use chrono::naive::{NaiveDate, NaiveDateTime};
use chrono::Duration as ChDuration;
use chrono::{DateTime, Datelike, Duration, Local};
use diesel::dsl::sql;
use diesel::prelude::*;
use diesel::sql_types::{BigInt, Integer, Nullable};
use log::warn;
use serde::Deserialize;
use time;
use std::time::SystemTime;
use warp::http::Response;
use warp::Reply;
@ -156,7 +156,7 @@ pub fn days_in_month(
NaiveDate::from_ymd(year, month, day).and_hms(0, 0, 0);
let photo = Photo::query(context.is_authorized())
.filter(date.ge(fromdate))
.filter(date.lt(fromdate + ChDuration::days(1)))
.filter(date.lt(fromdate + Duration::days(1)))
.order((grade.desc().nulls_last(), date.asc()))
.limit(1)
.first::<Photo>(&db)
@ -232,7 +232,7 @@ pub fn all_for_day(
let photos = Photo::query(context.is_authorized())
.filter(date.ge(thedate))
.filter(date.lt(thedate + ChDuration::days(1)));
.filter(date.lt(thedate + Duration::days(1)));
let (links, coords) = links_by_time(&context, photos, range, false);
if links.is_empty() {
@ -258,8 +258,8 @@ pub fn on_this_day(context: Context) -> impl Reply {
};
let (month, day) = {
let now = time::now();
(now.tm_mon as u32 + 1, now.tm_mday as u32)
let today = DateTime::<Local>::from(SystemTime::now()).date();
(today.month(), today.day())
};
let db = context.db().unwrap();
let pos = Photo::query(context.is_authorized())
@ -305,7 +305,7 @@ pub fn on_this_day(context: Context) -> impl Reply {
.and_hms(0, 0, 0);
let photo = Photo::query(context.is_authorized())
.filter(date.ge(fromdate))
.filter(date.lt(fromdate + ChDuration::days(1)))
.filter(date.lt(fromdate + Duration::days(1)))
.order((grade.desc().nulls_last(), date.asc()))
.limit(1)
.first::<Photo>(&db)