Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: prevent overwriting hot repository on init #353

Merged
merged 2 commits into from
Nov 18, 2024
Merged

fix: prevent overwriting hot repository on init #353

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7be5fc8
fix: prevent overwriting hot repository on init
gilbsgilbs Nov 14, 2024
4da2c4a
Merge branch 'main' into fix-hot-repo-overwrite
aawsome Nov 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 24 additions & 2 deletions crates/core/src/repository.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,8 +418,25 @@ impl<P, S> Repository<P, S> {
///
/// The id of the config file or `None` if no config file is found
pub fn config_id(&self) -> RusticResult<Option<ConfigId>> {
let config_ids = self.be.list(FileType::Config)?;
self.config_id_with_backend(&self.be)
}

/// Returns the Id of the config file corresponding to a specific backend.
///
/// # Errors
///
/// * If listing the repository config file failed
/// * If there is more than one repository config file.
///
/// # Arguments
///
/// * `be` - The backend to use
///
/// # Returns
///
/// The id of the config file or `None` if no config file is found
fn config_id_with_backend(&self, be: &dyn WriteBackend) -> RusticResult<Option<ConfigId>> {
aawsome marked this conversation as resolved.
Show resolved Hide resolved
let config_ids = be.list(FileType::Config)?;
match config_ids.len() {
1 => Ok(Some(ConfigId::from(config_ids[0]))),
0 => Ok(None),
Expand Down Expand Up @@ -574,7 +591,12 @@ impl<P, S> Repository<P, S> {
key_opts: &KeyOptions,
config_opts: &ConfigOptions,
) -> RusticResult<Repository<P, OpenStatus>> {
if self.config_id()?.is_some() {
let config_exists = self.config_id_with_backend(&self.be)?.is_some();
let hot_config_exists = match self.be_hot {
None => false,
Some(ref be) => self.config_id_with_backend(be)?.is_some(),
};
if config_exists || hot_config_exists {
return Err(RusticError::new(
ErrorKind::Configuration,
"Config file already exists for `{name}`. Please check the repository.",
Expand Down
Loading