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

Untested: If we can't find the newest backup file by opening the sql file, find it by name comparison

Browse Source
This commit is contained in:
Hocuri
2021-01-18 14:08:43 +01:00
parent 35b0f00a88
commit e3f7b31501
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/imex.rs
View File

@@ -158,6 +158,7 @@ pub async fn has_backup_old(context: &Context, dir_name: impl AsRef<Path>) -> Re
let dir_name = dir_name.as_ref(); let dir_name = dir_name.as_ref();
let mut dir_iter = async_std::fs::read_dir(dir_name).await?; let mut dir_iter = async_std::fs::read_dir(dir_name).await?;
let mut newest_backup_time = 0; let mut newest_backup_time = 0;
let mut newest_backup_name = "".to_string();
let mut newest_backup_path: Option<PathBuf> = None; let mut newest_backup_path: Option<PathBuf> = None;
while let Some(dirent) = dir_iter.next().await { while let Some(dirent) = dir_iter.next().await {
if let Ok(dirent) = dirent { if let Ok(dirent) = dirent {
@@ -184,8 +185,15 @@ pub async fn has_backup_old(context: &Context, dir_name: impl AsRef<Path>) -> Re
context, context,
"Found backup file {} which could not be opened: {}", name, e "Found backup file {} which could not be opened: {}", name, e
); );
if newest_backup_path.is_none() { // On some Android devices we can't open sql files that are not in our private directory
newest_backup_path = Some(path); // If there is no other backup file, just try this one // (see https://github.com/deltachat/deltachat-android/issues/1768). So, compare names
// to still find the newest backup.
let name: String = name.into();
if newest_backup_time == 0
&& (newest_backup_name.is_empty() || name > newest_backup_name)
{
newest_backup_path = Some(path);
newest_backup_name = name;
} }
} }
} }