Page MenuHomePhabricator
Differential D13936

[CommCoreModule] cleanup methods for creating backup
ClosedPublic
Actions

Authored by kamil on Nov 14 2024, 8:58 AM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Mar 21, 2:38 AM
Unknown Object (File)
Sun, Mar 16, 1:06 PM
Unknown Object (File)
Mon, Mar 3, 6:26 AM
Unknown Object (File)
Mon, Mar 3, 6:26 AM
Unknown Object (File)
Feb 28 2025, 2:57 AM
Unknown Object (File)
Feb 28 2025, 2:56 AM
Unknown Object (File)
Feb 19 2025, 6:35 AM
Unknown Object (File)
Feb 1 2025, 11:27 PM
View All 35 Files
Subscribers
ashoat

Details

Reviewers
bartek
tomek
Commits
rCOMMf2be17bca4bd: [CommCoreModule] cleanup methods for creating backup
Summary

ENG-9656.

Cleaning old code to make it more straightforward, reducing code duplication.

Depends on D13935

Test Plan

Tested in D13937

Diff Detail

Repository
rCOMM Comm
Branch
publish-client-backup
Lint
No Lint Coverage
Unit
No Test Coverage

Revision Contents
Changeset List

PathSize
native/
backup/
30 lines
cpp/
CommonCpp/
NativeModules/
6 lines
84 lines
_generated/
profile/
13 lines
schema/
6 lines

Diff 45827

View Options

native/backup/use-client-backup.js

  • This file was added.
use lazy_static::lazy_static;
use regex::Regex;
use std::path::PathBuf;
lazy_static! {
static ref BACKUP_DATA_FILE_REGEX: Regex = Regex::new(
r"^backup-(?<backup_id>[^-]*)(?:-log-(?<log_id>\d*))?(?<additional_data>-userkeys|-attachments)?$"
)
.expect("Regex compilation failed");
}
#[derive(Debug)]
pub struct BackupFileInfo {
pub backup_id: String,
pub log_id: Option<usize>,
pub additional_data: Option<String>,
}
impl TryFrom<PathBuf> for BackupFileInfo {
type Error = ();
fn try_from(value: PathBuf) -> Result<Self, Self::Error> {
let Some(file_name) = value.file_name() else {
return Err(());
};
let file_name = file_name.to_string_lossy();
let Some(captures) = BACKUP_DATA_FILE_REGEX.captures(&file_name) else {
return Err(());
};
let Some(backup_id) = captures
.name("backup_id")
.map(|re_match| re_match.as_str().to_string())
else {
// Should never happen happen because regex matched the filename
println!(
"Couldn't parse 'backup_id' from backup filename: {file_name:?}"
);
return Err(());
};
let log_id = match captures
.name("log_id")
.map(|re_match| re_match.as_str().parse::<usize>())
{
None => None,
Some(Ok(log_id)) => Some(log_id),
Some(Err(err)) => {
// Should never happen happen because regex matched the filename
println!(
"Couldn't parse 'log_id' from backup filename: {file_name:?}. \
Error: {err:?}"
);
return Err(());
}
};
let additional_data = captures
.name("additional_data")
.map(|m| m.as_str().to_string());
Ok(Self {
backup_id,
log_id,
additional_data,
})
}
}
View Options

native/cpp/CommonCpp/NativeModules/CommCoreModule.h

  • This file was added.
use lazy_static::lazy_static;
use regex::Regex;
use std::path::PathBuf;
lazy_static! {
static ref BACKUP_DATA_FILE_REGEX: Regex = Regex::new(
r"^backup-(?<backup_id>[^-]*)(?:-log-(?<log_id>\d*))?(?<additional_data>-userkeys|-attachments)?$"
)
.expect("Regex compilation failed");
}
#[derive(Debug)]
pub struct BackupFileInfo {
pub backup_id: String,
pub log_id: Option<usize>,
pub additional_data: Option<String>,
}
impl TryFrom<PathBuf> for BackupFileInfo {
type Error = ();
fn try_from(value: PathBuf) -> Result<Self, Self::Error> {
let Some(file_name) = value.file_name() else {
return Err(());
};
let file_name = file_name.to_string_lossy();
let Some(captures) = BACKUP_DATA_FILE_REGEX.captures(&file_name) else {
return Err(());
};
let Some(backup_id) = captures
.name("backup_id")
.map(|re_match| re_match.as_str().to_string())
else {
// Should never happen happen because regex matched the filename
println!(
"Couldn't parse 'backup_id' from backup filename: {file_name:?}"
);
return Err(());
};
let log_id = match captures
.name("log_id")
.map(|re_match| re_match.as_str().parse::<usize>())
{
None => None,
Some(Ok(log_id)) => Some(log_id),
Some(Err(err)) => {
// Should never happen happen because regex matched the filename
println!(
"Couldn't parse 'log_id' from backup filename: {file_name:?}. \
Error: {err:?}"
);
return Err(());
}
};
let additional_data = captures
.name("additional_data")
.map(|m| m.as_str().to_string());
Ok(Self {
backup_id,
log_id,
additional_data,
})
}
}
View Options

native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp

  • This file was added.
use lazy_static::lazy_static;
use regex::Regex;
use std::path::PathBuf;
lazy_static! {
static ref BACKUP_DATA_FILE_REGEX: Regex = Regex::new(
r"^backup-(?<backup_id>[^-]*)(?:-log-(?<log_id>\d*))?(?<additional_data>-userkeys|-attachments)?$"
)
.expect("Regex compilation failed");
}
#[derive(Debug)]
pub struct BackupFileInfo {
pub backup_id: String,
pub log_id: Option<usize>,
pub additional_data: Option<String>,
}
impl TryFrom<PathBuf> for BackupFileInfo {
type Error = ();
fn try_from(value: PathBuf) -> Result<Self, Self::Error> {
let Some(file_name) = value.file_name() else {
return Err(());
};
let file_name = file_name.to_string_lossy();
let Some(captures) = BACKUP_DATA_FILE_REGEX.captures(&file_name) else {
return Err(());
};
let Some(backup_id) = captures
.name("backup_id")
.map(|re_match| re_match.as_str().to_string())
else {
// Should never happen happen because regex matched the filename
println!(
"Couldn't parse 'backup_id' from backup filename: {file_name:?}"
);
return Err(());
};
let log_id = match captures
.name("log_id")
.map(|re_match| re_match.as_str().parse::<usize>())
{
None => None,
Some(Ok(log_id)) => Some(log_id),
Some(Err(err)) => {
// Should never happen happen because regex matched the filename
println!(
"Couldn't parse 'log_id' from backup filename: {file_name:?}. \
Error: {err:?}"
);
return Err(());
}
};
let additional_data = captures
.name("additional_data")
.map(|m| m.as_str().to_string());
Ok(Self {
backup_id,
log_id,
additional_data,
})
}
}
View Options

native/cpp/CommonCpp/_generated/commJSI-generated.cpp

  • This file was added.
use lazy_static::lazy_static;
use regex::Regex;
use std::path::PathBuf;
lazy_static! {
static ref BACKUP_DATA_FILE_REGEX: Regex = Regex::new(
r"^backup-(?<backup_id>[^-]*)(?:-log-(?<log_id>\d*))?(?<additional_data>-userkeys|-attachments)?$"
)
.expect("Regex compilation failed");
}
#[derive(Debug)]
pub struct BackupFileInfo {
pub backup_id: String,
pub log_id: Option<usize>,
pub additional_data: Option<String>,
}
impl TryFrom<PathBuf> for BackupFileInfo {
type Error = ();
fn try_from(value: PathBuf) -> Result<Self, Self::Error> {
let Some(file_name) = value.file_name() else {
return Err(());
};
let file_name = file_name.to_string_lossy();
let Some(captures) = BACKUP_DATA_FILE_REGEX.captures(&file_name) else {
return Err(());
};
let Some(backup_id) = captures
.name("backup_id")
.map(|re_match| re_match.as_str().to_string())
else {
// Should never happen happen because regex matched the filename
println!(
"Couldn't parse 'backup_id' from backup filename: {file_name:?}"
);
return Err(());
};
let log_id = match captures
.name("log_id")
.map(|re_match| re_match.as_str().parse::<usize>())
{
None => None,
Some(Ok(log_id)) => Some(log_id),
Some(Err(err)) => {
// Should never happen happen because regex matched the filename
println!(
"Couldn't parse 'log_id' from backup filename: {file_name:?}. \
Error: {err:?}"
);
return Err(());
}
};
let additional_data = captures
.name("additional_data")
.map(|m| m.as_str().to_string());
Ok(Self {
backup_id,
log_id,
additional_data,
})
}
}
View Options

native/cpp/CommonCpp/_generated/commJSI.h

Loading...
View Options

native/profile/backup-menu.react.js

Loading...
View Options

native/schema/CommCoreModuleSchema.js

Loading...