Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-07 08:56:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3798 from deltachat/dependabot/cargo/chrono-0.4.23

Browse Source
This commit is contained in:
dependabot[bot]
2022-12-12 15:09:57 +00:00
committed by GitHub
parent edb1d2fb9e 3023d3c358
commit f37e50cc71
8 changed files with 93 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -3,6 +3,7 @@
## Unreleased ## Unreleased
### Changes ### Changes
- Don't use deprecated `chrono` functions #3798
### API-Changes ### API-Changes

4
Cargo.lock generated
View File

@@ -524,9 +524,9 @@ dependencies = [
[[package]] [[package]]
name = "chrono" name = "chrono"
version = "0.4.22" version = "0.4.23"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f"
dependencies = [ dependencies = [
"iana-time-zone", "iana-time-zone",
"js-sys", "js-sys",

3
src/imex.rs
View File

@@ -478,7 +478,8 @@ async fn import_backup(
/// it can be renamed to dest_path. This guarantees that the backup is complete. /// it can be renamed to dest_path. This guarantees that the backup is complete.
fn get_next_backup_path(folder: &Path, backup_time: i64) -> Result<(PathBuf, PathBuf, PathBuf)> { fn get_next_backup_path(folder: &Path, backup_time: i64) -> Result<(PathBuf, PathBuf, PathBuf)> {
let folder = PathBuf::from(folder); let folder = PathBuf::from(folder);
let stem = chrono::NaiveDateTime::from_timestamp(backup_time, 0) let stem = chrono::NaiveDateTime::from_timestamp_opt(backup_time, 0)
.context("can't get next backup path")?
// Don't change this file name format, in `dc_imex_has_backup` we use string comparison to determine which backup is newer: // Don't change this file name format, in `dc_imex_has_backup` we use string comparison to determine which backup is newer:
.format("delta-chat-backup-%Y-%m-%d") .format("delta-chat-backup-%Y-%m-%d")
.to_string(); .to_string();

3
src/location.rs
View File

@@ -476,7 +476,8 @@ pub async fn get_kml(context: &Context, chat_id: ChatId) -> Result<(String, u32)
fn get_kml_timestamp(utc: i64) -> String { fn get_kml_timestamp(utc: i64) -> String {
// Returns a string formatted as YYYY-MM-DDTHH:MM:SSZ. The trailing `Z` indicates UTC. // Returns a string formatted as YYYY-MM-DDTHH:MM:SSZ. The trailing `Z` indicates UTC.
chrono::NaiveDateTime::from_timestamp(utc, 0) chrono::NaiveDateTime::from_timestamp_opt(utc, 0)
.unwrap()
.format("%Y-%m-%dT%H:%M:%SZ") .format("%Y-%m-%dT%H:%M:%SZ")
.to_string() .to_string()
} }

39
src/mimefactory.rs
View File

@@ -531,7 +531,10 @@ impl<'a> MimeFactory<'a> {
.push(Header::new("Subject".into(), encoded_subject)); .push(Header::new("Subject".into(), encoded_subject));
let date = chrono::Utc let date = chrono::Utc
.from_local_datetime(&chrono::NaiveDateTime::from_timestamp(self.timestamp, 0)) .from_local_datetime(
&chrono::NaiveDateTime::from_timestamp_opt(self.timestamp, 0)
.context("can't convert timestamp to NativeDateTime")?,
)
.unwrap() .unwrap()
.to_rfc2822(); .to_rfc2822();
headers.unprotected.push(Header::new("Date".into(), date)); headers.unprotected.push(Header::new("Date".into(), date));
@@ -1336,17 +1339,27 @@ async fn build_body_file(
// are normally not needed and contain timestamps, running numbers // are normally not needed and contain timestamps, running numbers
// etc. // etc.
let filename_to_send: String = match msg.viewtype { let filename_to_send: String = match msg.viewtype {
Viewtype::Voice => chrono::Utc Viewtype::Voice => format!(
.timestamp(msg.timestamp_sort, 0) "voice-messsage_{}.{}",
.format(&format!("voice-message_%Y-%m-%d_%H-%M-%S.{}", &suffix)) chrono::Utc
.to_string(), .timestamp_opt(msg.timestamp_sort, 0)
.single()
.map_or_else(
|| "YY-mm-dd_hh:mm:ss".to_string(),
|ts| ts.format("%Y-%m-%d_%H-%M-%S").to_string()
),
&suffix
),
Viewtype::Image | Viewtype::Gif => format!( Viewtype::Image | Viewtype::Gif => format!(
"{}.{}", "image_{}.{}",
if base_name.is_empty() { if base_name.is_empty() {
chrono::Utc chrono::Utc
.timestamp(msg.timestamp_sort, 0) .timestamp_opt(msg.timestamp_sort, 0)
.format("image_%Y-%m-%d_%H-%M-%S") .single()
.to_string() .map_or_else(
|| "YY-mm-dd_hh:mm:ss".to_string(),
|ts| ts.format("%Y-%m-%d_%H-%M-%S").to_string(),
)
} else { } else {
base_name.to_string() base_name.to_string()
}, },
@@ -1355,8 +1368,12 @@ async fn build_body_file(
Viewtype::Video => format!( Viewtype::Video => format!(
"video_{}.{}", "video_{}.{}",
chrono::Utc chrono::Utc
.timestamp(msg.timestamp_sort, 0) .timestamp_opt(msg.timestamp_sort, 0)
.format("%Y-%m-%d_%H-%M-%S"), .single()
.map_or_else(
|| "YY-mm-dd_hh:mm:ss".to_string(),
|ts| ts.format("%Y-%m-%d_%H-%M-%S").to_string()
),
&suffix &suffix
), ),
_ => blob.as_file_name().to_string(), _ => blob.as_file_name().to_string(),

8
src/provider.rs
View File

@@ -184,7 +184,9 @@ pub fn get_provider_by_id(id: &str) -> Option<&'static Provider> {
// returns update timestamp in seconds, UTC, compatible for comparison with time() and database times // returns update timestamp in seconds, UTC, compatible for comparison with time() and database times
pub fn get_provider_update_timestamp() -> i64 { pub fn get_provider_update_timestamp() -> i64 {
NaiveDateTime::new(*PROVIDER_UPDATED, NaiveTime::from_hms(0, 0, 0)).timestamp_millis() / 1_000 NaiveDateTime::new(*PROVIDER_UPDATED, NaiveTime::from_hms_opt(0, 0, 0).unwrap())
.timestamp_millis()
/ 1_000
} }
#[cfg(test)] #[cfg(test)]
@@ -260,8 +262,8 @@ mod tests {
#[test] #[test]
fn test_get_provider_update_timestamp() { fn test_get_provider_update_timestamp() {
let timestamp_past = NaiveDateTime::new( let timestamp_past = NaiveDateTime::new(
NaiveDate::from_ymd(2020, 9, 9), NaiveDate::from_ymd_opt(2020, 9, 9).unwrap(),
NaiveTime::from_hms(0, 0, 0), NaiveTime::from_hms_opt(0, 0, 0).unwrap(),
) )
.timestamp_millis() .timestamp_millis()
/ 1_000; / 1_000;

2
src/provider/data.rs
View File

@@ -1891,4 +1891,4 @@ pub(crate) static PROVIDER_IDS: Lazy<HashMap<&'static str, &'static Provider>> =
}); });
pub static PROVIDER_UPDATED: Lazy<chrono::NaiveDate> = pub static PROVIDER_UPDATED: Lazy<chrono::NaiveDate> =
Lazy::new(|| chrono::NaiveDate::from_ymd(2022, 7, 5)); Lazy::new(|| chrono::NaiveDate::from_ymd_opt(2022, 7, 5).unwrap());

90
src/tools.rs
View File

@@ -112,9 +112,14 @@ pub(crate) fn truncate_by_lines(
* date/time tools * date/time tools
******************************************************************************/ ******************************************************************************/
/// Converts Unix time in seconds to a local timestamp string.
pub fn timestamp_to_str(wanted: i64) -> String { pub fn timestamp_to_str(wanted: i64) -> String {
let ts = Local.timestamp(wanted, 0); if let Some(ts) = Local.timestamp_opt(wanted, 0).single() {
ts.format("%Y.%m.%d %H:%M:%S").to_string() ts.format("%Y.%m.%d %H:%M:%S").to_string()
} else {
// Out of range number of seconds.
"??.??.?? ??:??:??".to_string()
}
} }
pub fn duration_to_str(duration: Duration) -> String { pub fn duration_to_str(duration: Duration) -> String {
@@ -206,27 +211,31 @@ async fn maybe_warn_on_bad_time(context: &Context, now: i64, known_past_timestam
msg.text = Some( msg.text = Some(
stock_str::bad_time_msg_body( stock_str::bad_time_msg_body(
context, context,
&Local &Local.timestamp_opt(now, 0).single().map_or_else(
.timestamp(now, 0) || "YY-MM-DD hh:mm:ss".to_string(),
.format("%Y-%m-%d %H:%M:%S") |ts| ts.format("%Y-%m-%d %H:%M:%S").to_string(),
.to_string(), ),
) )
.await, .await,
); );
add_device_msg_with_importance( if let Some(timestamp) = chrono::NaiveDateTime::from_timestamp_opt(now, 0) {
context, add_device_msg_with_importance(
Some( context,
format!( Some(
"bad-time-warning-{}", format!(
chrono::NaiveDateTime::from_timestamp(now, 0).format("%Y-%m-%d") // repeat every day "bad-time-warning-{}",
) timestamp.format("%Y-%m-%d") // repeat every day
.as_str(), )
), .as_str(),
Some(&mut msg), ),
true, Some(&mut msg),
) true,
.await )
.ok(); .await
.ok();
} else {
warn!(context, "Can't convert current timestamp");
}
return true; return true;
} }
false false
@@ -236,19 +245,21 @@ async fn maybe_warn_on_outdated(context: &Context, now: i64, approx_compile_time
if now > approx_compile_time + DC_OUTDATED_WARNING_DAYS * 24 * 60 * 60 { if now > approx_compile_time + DC_OUTDATED_WARNING_DAYS * 24 * 60 * 60 {
let mut msg = Message::new(Viewtype::Text); let mut msg = Message::new(Viewtype::Text);
msg.text = Some(stock_str::update_reminder_msg_body(context).await); msg.text = Some(stock_str::update_reminder_msg_body(context).await);
add_device_msg( if let Some(timestamp) = chrono::NaiveDateTime::from_timestamp_opt(now, 0) {
context, add_device_msg(
Some( context,
format!( Some(
"outdated-warning-{}", format!(
chrono::NaiveDateTime::from_timestamp(now, 0).format("%Y-%m") // repeat every month "outdated-warning-{}",
) timestamp.format("%Y-%m") // repeat every month
.as_str(), )
), .as_str(),
Some(&mut msg), ),
) Some(&mut msg),
.await )
.ok(); .await
.ok();
}
} }
} }
@@ -648,11 +659,14 @@ pub(crate) fn parse_receive_header(header: &str) -> String {
if let Ok(date) = dateparse(&header) { if let Ok(date) = dateparse(&header) {
// In tests, use the UTC timezone so that the test is reproducible // In tests, use the UTC timezone so that the test is reproducible
#[cfg(test)] #[cfg(test)]
let date_obj = chrono::Utc.timestamp(date, 0); let date_obj = chrono::Utc.timestamp_opt(date, 0).single();
#[cfg(not(test))] #[cfg(not(test))]
let date_obj = Local.timestamp(date, 0); let date_obj = Local.timestamp_opt(date, 0).single();
hop_info += &format!("Date: {}", date_obj.to_rfc2822()); hop_info += &format!(
"Date: {}",
date_obj.map_or_else(|| "?".to_string(), |x| x.to_rfc2822())
);
}; };
hop_info hop_info
@@ -1153,8 +1167,8 @@ DKIM Results: Passed=true, Works=true, Allow_Keychange=true";
let timestamp_now = time(); let timestamp_now = time();
let timestamp_future = timestamp_now + 60 * 60 * 24 * 7; let timestamp_future = timestamp_now + 60 * 60 * 24 * 7;
let timestamp_past = NaiveDateTime::new( let timestamp_past = NaiveDateTime::new(
NaiveDate::from_ymd(2020, 9, 1), NaiveDate::from_ymd_opt(2020, 9, 1).unwrap(),
NaiveTime::from_hms(0, 0, 0), NaiveTime::from_hms_opt(0, 0, 0).unwrap(),
) )
.timestamp_millis() .timestamp_millis()
/ 1_000; / 1_000;