misc loose ends

- tweak release-pre command in justfile to ensure pre-release comes after verify-clean-git
- rustfmt

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "registry-backup"
 authors = ["Jonathan Strong <jstrong@shipyard.rs>"]
-version = "0.4.0"
+version = "0.4.1"
 edition = "2021"
 publish = ["shipyard-rs-public"]
 readme = "README.md"

README.md

@@ -39,7 +39,7 @@ $ cargo install registry-backup --git https://git.shipyard.rs/jstrong/registry-b
 ```console
 $ ./target/release/registry-backup --help
 
-registry-backup 0.4.0
+registry-backup 0.4.1
 Jonathan Strong <jstrong@shipyard.rs>
 Download all .crate files from a registry server
 
@@ -82,7 +82,7 @@ OPTIONS:
     -U, --user-agent <USER_AGENT>
             Value of user-agent HTTP header
             
-            [default: registry-backup/v0.4.0]
+            [default: registry-backup/v0.4.1]
 
     -R, --requests-per-second <INT>
             Requests to registry server will not exceed this rate
@@ -193,7 +193,7 @@ The commands that mirror cargo commands (e.g. `just test`) are included for the
 
 This file is generated using a template (`doc/README.tera.md`) rendered using updated outputs of the CLI menu, config sample, and other values.
 
-This version of `README.md` was generated at `Thu, 15 Sep 2022 20:34:23 +0000` based on git commit `01ce9284`.
+This version of `README.md` was generated at `Thu, 08 Dec 2022 02:23:17 +0000` based on git commit `3241e207`.
 
 To (re-)generate the `README.md` file, use the justfile command:
 

doc/cli-menu.txt

@@ -1,4 +1,4 @@
-registry-backup 0.4.0
+registry-backup 0.4.1
 Jonathan Strong <jstrong@shipyard.rs>
 Download all .crate files from a registry server
 
@@ -41,7 +41,7 @@ OPTIONS:
     -U, --user-agent <USER_AGENT>
             Value of user-agent HTTP header
             
-            [default: registry-backup/v0.4.0]
+            [default: registry-backup/v0.4.1]
 
     -R, --requests-per-second <INT>
             Requests to registry server will not exceed this rate

justfile

@@ -60,7 +60,9 @@ update-readme-and-commit: update-readme-and-stage
     git commit -m 're-generate docs'
 
 # get everything all ready for release
-release-prep: verify-clean-git pre-release
+release-prep:
+    just pre-release
+    just verify-clean-git
     VERSION=$(just get-crate-version) \
         && test -z "$(git tag | rg \"v${VERSION}\")" # Error: tag appears to exist already
     just update-readme-and-commit

src/main.rs

@@ -194,6 +194,7 @@ pub struct Config {
     pub output: OutputConfig,
     /// Download settings
     #[clap(flatten)]
+    #[serde(default)]
     pub http: HttpConfig,
     /// Specify configuration values using the provided TOML file, instead of
     /// via command line flags. The values in the config file will override
@@ -274,6 +275,16 @@ impl std::fmt::Debug for TargetRegistryConfig {
     }
 }
 
+impl Default for HttpConfig {
+    fn default() -> Self {
+        Self {
+            user_agent: default_user_agent(),
+            requests_per_second: default_requests_per_second(),
+            max_concurrent_requests: default_max_concurrent_requests(),
+        }
+    }
+}
+
 impl std::fmt::Debug for HttpConfig {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         f.debug_struct("Config")
@@ -370,7 +381,14 @@ async fn load_config_file(config: Config) -> Result<Config, AnyError> {
         Some(path) => {
             debug!(?path, "loading config file");
             let toml = tokio::fs::read_to_string(&path).await?;
-            let config: Config = toml::from_str(&toml)?;
+            let config: Config = match toml::from_str(&toml) {
+                Ok(c) => c,
+                Err(e) => panic!(
+                    "\nfatal error: parsing config file at {} failed:\n\n{}\n\n",
+                    path.display(),
+                    e
+                ),
+            };
             Ok(config)
         }