mab122
/
radicle-heartwood-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radicle: Skip invalid named folders 

Instead of failing with an `InvalidId` error in
`radicle::storage::ReadStorage::repositories` for repos that don't have
a valid repository ID, skip them and log a warning.


Co-authored-by: Lorenz Leutgeb <lorenz.leutgeb@radicle.xyz>
This commit is contained in:
Sebastian Martinez 2025-11-28 13:19:13 +01:00 committed by Lorenz Leutgeb
parent 0c70e17123
commit 7e5a1ababc
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crates/radicle/src/storage/git.rs
View File

@ -126,12 +126,22 @@ impl ReadStorage for Storage {
if path.file_name().to_string_lossy().starts_with('.') { if path.file_name().to_string_lossy().starts_with('.') {
continue; continue;
} }
// Skip temporary repositories
if let Some(ext) = path.path().extension() { if let Some(ext) = path.path().extension().and_then(|s| s.to_str()) {
if ext == TempRepository::EXT { if ext == TempRepository::EXT {
// Skip temporary repositories
log::debug!(target: "storage", "Skipping temporary repository at '{}'", path.path().display());
continue; continue;
} else if "lock" == ext {
// In previous versions, the extension ".lock" was used for temporary repositories.
// This is to handle those names in a backward-compatible way.
log::debug!(target: "storage", "Skipping locked repository at '{}'", path.path().display());
continue;
} else {
log::warn!(target: "storage", "Found path '{}' with unexpected extension '{ext}'", path.path().display());
} }
} }
let rid = RepoId::try_from(path.file_name()) let rid = RepoId::try_from(path.file_name())
.map_err(|_| Error::InvalidId(path.file_name()))?; .map_err(|_| Error::InvalidId(path.file_name()))?;

1
crates/radicle/src/storage/git/temp.rs
View File

@ -23,6 +23,7 @@ pub struct TempRepository {
impl TempRepository { impl TempRepository {
/// Extension used for the directory /// Extension used for the directory
pub(crate) const EXT: &str = "tmp"; pub(crate) const EXT: &str = "tmp";
const RANDOMNESS_LENGTH: usize = 6; const RANDOMNESS_LENGTH: usize = 6;
pub(super) fn new<P>(root: P, rid: RepoId, info: &UserInfo) -> Result<Self, RepositoryError> pub(super) fn new<P>(root: P, rid: RepoId, info: &UserInfo) -> Result<Self, RepositoryError>