From 1721c0316a335afec2bcb43a64166fb8baac8f04 Mon Sep 17 00:00:00 2001 From: link2xt Date: Tue, 21 Jul 2026 10:53:04 +0000 Subject: [PATCH] feat: do not set backup_time in exported databases backup_time is unused, it is only set, but nobody reads it. --- src/imex.rs | 14 ++------------ src/imex/transfer.rs | 4 ++-- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/src/imex.rs b/src/imex.rs index 14faeb3b9..012c2d5f8 100644 --- a/src/imex.rs +++ b/src/imex.rs @@ -453,7 +453,7 @@ async fn export_backup(context: &Context, dir: &Path, passphrase: String) -> Res let temp_db_path = TempPathGuard::new(temp_db_path); let temp_path = TempPathGuard::new(temp_path); - export_database(context, &temp_db_path, passphrase, now) + export_database(context, &temp_db_path, passphrase) .await .context("could not export database")?; @@ -737,17 +737,11 @@ where /// overwritten. /// /// This also verifies that IO is not running during the export. -async fn export_database( - context: &Context, - dest: &Path, - passphrase: String, - timestamp: i64, -) -> Result<()> { +async fn export_database(context: &Context, dest: &Path, passphrase: String) -> Result<()> { ensure!( !context.scheduler.is_running().await, "cannot export backup, IO is running" ); - let timestamp = timestamp.try_into().context("32-bit UNIX time overflow")?; // TODO: Maybe introduce camino crate for UTF-8 paths where we need them. let dest = dest @@ -755,10 +749,6 @@ async fn export_database( .with_context(|| format!("path {} is not valid unicode", dest.display()))?; context.set_config(Config::BccSelf, Some("1")).await?; - context - .sql - .set_raw_config_int("backup_time", timestamp) - .await?; context .sql .set_raw_config_int("backup_version", DCBACKUP_VERSION) diff --git a/src/imex/transfer.rs b/src/imex/transfer.rs index 9c3933b2a..d61cbd775 100644 --- a/src/imex/transfer.rs +++ b/src/imex/transfer.rs @@ -48,7 +48,7 @@ use crate::log::warn; use crate::message::Message; use crate::qr::Qr; use crate::stock_str::backup_transfer_msg_body; -use crate::tools::{TempPathGuard, create_id, time}; +use crate::tools::{TempPathGuard, create_id}; use super::{DBFILE_BACKUP_NAME, export_backup_stream, export_database, import_backup_stream}; @@ -130,7 +130,7 @@ impl BackupProvider { let passphrase = String::new(); - export_database(context, &dbfile, passphrase, time()) + export_database(context, &dbfile, passphrase) .await .context("Database export failed")?;