fbd91b22f5
- use the TimestampSecs newtype instead of raw i64s - use FixedOffset instead of a minutes_west offset - check localOffset each time the timing is calculated, and set it if it's stale - even for v1. - check for and fix missing rollover when calculating timing - stop explicitly passing localOffset in the sync/start call
76 lines
1.9 KiB
Rust
76 lines
1.9 KiB
Rust
// Copyright: Ankitects Pty Ltd and contributors
|
|
// License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
|
|
|
|
use crate::define_newtype;
|
|
use chrono::prelude::*;
|
|
use lazy_static::lazy_static;
|
|
use std::env;
|
|
use std::time;
|
|
|
|
define_newtype!(TimestampSecs, i64);
|
|
define_newtype!(TimestampMillis, i64);
|
|
|
|
impl TimestampSecs {
|
|
pub fn now() -> Self {
|
|
Self(elapsed().as_secs() as i64)
|
|
}
|
|
|
|
pub fn zero() -> Self {
|
|
Self(0)
|
|
}
|
|
|
|
pub fn elapsed_secs(self) -> u64 {
|
|
(Self::now().0 - self.0).max(0) as u64
|
|
}
|
|
|
|
/// YYYY-mm-dd
|
|
pub(crate) fn date_string(self, offset: FixedOffset) -> String {
|
|
offset.timestamp(self.0, 0).format("%Y-%m-%d").to_string()
|
|
}
|
|
|
|
pub fn local_utc_offset(self) -> FixedOffset {
|
|
*Local.timestamp(self.0, 0).offset()
|
|
}
|
|
|
|
pub fn datetime(self, utc_offset: FixedOffset) -> DateTime<FixedOffset> {
|
|
utc_offset.timestamp(self.0, 0)
|
|
}
|
|
}
|
|
|
|
impl TimestampMillis {
|
|
pub fn now() -> Self {
|
|
Self(elapsed().as_millis() as i64)
|
|
}
|
|
|
|
pub fn zero() -> Self {
|
|
Self(0)
|
|
}
|
|
|
|
pub fn as_secs(self) -> TimestampSecs {
|
|
TimestampSecs(self.0 / 1000)
|
|
}
|
|
}
|
|
|
|
lazy_static! {
|
|
static ref TESTING: bool = env::var("SHIFT_CLOCK_HACK").is_ok();
|
|
}
|
|
|
|
fn elapsed() -> time::Duration {
|
|
if *TESTING {
|
|
// shift clock around rollover time to accomodate Python tests that make bad assumptions.
|
|
// we should update the tests in the future and remove this hack.
|
|
let mut elap = time::SystemTime::now()
|
|
.duration_since(time::SystemTime::UNIX_EPOCH)
|
|
.unwrap();
|
|
let now = Local::now();
|
|
if now.hour() >= 2 && now.hour() < 4 {
|
|
elap -= time::Duration::from_secs(60 * 60 * 2);
|
|
}
|
|
elap
|
|
} else {
|
|
time::SystemTime::now()
|
|
.duration_since(time::SystemTime::UNIX_EPOCH)
|
|
.unwrap()
|
|
}
|
|
}
|