Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-17 21:46:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #453 from deltachat/fix-backup

Browse Source 
Fix backup and housekeeping
This commit is contained in:
björn petersen
2019-09-07 15:38:01 +02:00
committed by GitHub
parent 06673b2108 cc0428aa50
commit 5663c7dec3
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/sql.rs
View File

@@ -1015,14 +1015,14 @@ pub fn housekeeping(context: &Context) {
match std::fs::metadata(entry.path()) { match std::fs::metadata(entry.path()) {
Ok(stats) => { Ok(stats) => {
let created = stats.created().is_ok() let recently_created = stats.created().is_ok()
&& stats.created().unwrap() > keep_files_newer_than; && stats.created().unwrap() > keep_files_newer_than;
let modified = stats.modified().is_ok() let recently_modified = stats.modified().is_ok()
&& stats.modified().unwrap() > keep_files_newer_than; && stats.modified().unwrap() > keep_files_newer_than;
let accessed = stats.accessed().is_ok() let recently_accessed = stats.accessed().is_ok()
&& stats.accessed().unwrap() > keep_files_newer_than; && stats.accessed().unwrap() > keep_files_newer_than;
if created || modified || accessed { if recently_created || recently_modified || recently_accessed {
info!( info!(
context, context,
0, 0,
@@ -1090,13 +1090,20 @@ fn maybe_add_from_param(
) { ) {
context context
.sql .sql
.query_row(query, NO_PARAMS, |row| { .query_map(
let param: Params = row.get::<_, String>(0)?.parse().unwrap_or_default(); query,
if let Some(file) = param.get(param_id) { NO_PARAMS,
maybe_add_file(files_in_use, file); |row| row.get::<_, String>(0),
} |rows| {
Ok(()) for row in rows {
}) let param: Params = row?.parse().unwrap_or_default();
if let Some(file) = param.get(param_id) {
maybe_add_file(files_in_use, file);
}
}
Ok(())
},
)
.unwrap_or_else(|err| { .unwrap_or_else(|err| {
warn!(context, 0, "sql: failed to add_from_param: {}", err); warn!(context, 0, "sql: failed to add_from_param: {}", err);
}); });