Page MenuHomePhabricator
Differential D11859

[lib] Rename action type to set aux user fids
ClosedPublic
Actions

Authored by will on May 2 2024, 8:11 AM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Mar 17, 9:34 PM
Unknown Object (File)
Mon, Mar 17, 7:00 PM
Unknown Object (File)
Mon, Mar 17, 9:02 AM
Unknown Object (File)
Fri, Mar 14, 4:56 AM
Unknown Object (File)
Tue, Mar 11, 7:35 AM
Unknown Object (File)
Tue, Mar 11, 6:53 AM
Unknown Object (File)
Tue, Mar 11, 6:27 AM
Unknown Object (File)
Fri, Mar 7, 1:59 AM
View All Files
Subscribers
ashoat
tomek

Details

Reviewers
ginsu
kamil
varun
Commits
rCOMM9958ccbb501e: [lib] Rename action type to set aux user fids
Summary

A simple renaming of the action type. This clarifies that we are setting fids for all comm users not just friends or mutuals.

Test Plan

flow check

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Revision Contents
Changeset List

PathSize
lib/
actions/
4 lines
reducers/
4 lines
4 lines
types/
2 lines
6 lines

Diff 39958

View Options

lib/actions/aux-user-actions.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

lib/reducers/aux-user-reducer.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

lib/reducers/aux-user-reducer.test.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

lib/types/aux-user-types.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

lib/types/redux-types.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,
})
}
}