fix: Not to return an error if nostr-address file does not exist
Signed-off-by: Awiteb <a@4rs.nl>
This commit is contained in:
@@ -18,6 +18,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
- New `patch fetch` command to fetch patches - by Awiteb
|
- New `patch fetch` command to fetch patches - by Awiteb
|
||||||
- New `issue {reopen,close,resolve}` commands to manage issue status - by Awiteb
|
- New `issue {reopen,close,resolve}` commands to manage issue status - by Awiteb
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Not to return an error if `nostr-address` file does not exist - by Awiteb
|
||||||
|
|
||||||
### Refactor
|
### Refactor
|
||||||
|
|
||||||
- Store the config in `CliOptions` instead of its path - by Awiteb
|
- Store the config in `CliOptions` instead of its path - by Awiteb
|
||||||
|
|||||||
@@ -227,8 +227,9 @@ pub fn nostr_address_path() -> std::io::Result<PathBuf> {
|
|||||||
std::env::current_dir().map(|p| p.join(NOSTR_ADDRESS_FILE))
|
std::env::current_dir().map(|p| p.join(NOSTR_ADDRESS_FILE))
|
||||||
}
|
}
|
||||||
|
|
||||||
/// If the given coordinate is Some, return it. Otherwise, try to read and parse
|
/// Returns the given coordinates if Some, otherwise attempts to read and parse
|
||||||
/// the first non-comment line from the `nostr-address` file.
|
/// coordinates from the specified file. Returns an empty vector if the file
|
||||||
|
/// doesn't exist.
|
||||||
pub fn naddrs_or_file(
|
pub fn naddrs_or_file(
|
||||||
naddrs: Option<Vec<Nip19Coordinate>>,
|
naddrs: Option<Vec<Nip19Coordinate>>,
|
||||||
address_file_path: &Path,
|
address_file_path: &Path,
|
||||||
@@ -236,7 +237,12 @@ pub fn naddrs_or_file(
|
|||||||
if let Some(naddrs) = naddrs {
|
if let Some(naddrs) = naddrs {
|
||||||
return Ok(naddrs);
|
return Ok(naddrs);
|
||||||
}
|
}
|
||||||
parsers::parse_nostr_address_file(address_file_path)
|
|
||||||
|
if address_file_path.exists() {
|
||||||
|
parsers::parse_nostr_address_file(address_file_path)
|
||||||
|
} else {
|
||||||
|
Ok(Vec::new())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Generate a reply tag for an event with the given ID, relay URL (if any), and
|
/// Generate a reply tag for an event with the given ID, relay URL (if any), and
|
||||||
|
|||||||
Reference in New Issue
Block a user