Update packages, improve zip install

octylFractal · octylFractal · commit d9e80e8bdd36 · 2025-09-17T22:16:16.000-07:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,50 +11,51 @@ repository = "https://github.com/octylFractal/java-preloader-reloadeder"
 edition = "2021"
 
 [dependencies]
-error-stack = "0.5.0"
+error-stack = "0.6.0"
 digest = "0.10.7"
-sha2 = "0.10.8"
+sha2 = "0.10.9"
 directories = "6.0.0"
 tracing = "0.1.41"
-toml = "0.8.20"
-toml_edit = "0.22.24"
+toml = "0.9.6"
+toml_edit = "0.23.5"
 itertools = "0.14.0"
-thiserror = "2.0.12"
-console = "0.15.11"
-indicatif = "0.17.11"
+thiserror = "2.0.16"
+console = "0.16.1"
+indicatif = "0.18.0"
 hex = "0.4.3"
-tempfile = "3.19.1"
+tempfile = "3.22.0"
 tar = "0.4.44"
-flate2 = "1.1.0"
-zip = "2.5.0"
+flate2 = "1.1.2"
+zip = "5.1.1"
 enum_dispatch = "0.3.13"
 
 [dependencies.url]
-version = "2.5.4"
+version = "2.5.7"
 features = ["serde"]
 
 [dependencies.ureq]
-version = "3.0.10"
+version = "3.1.2"
 features = ["json"]
 
 [dependencies.owo-colors]
-version = "4.2.0"
+version = "4.2.2"
 features = ["supports-colors"]
 
 [dependencies.derive_more]
 version = "2.0.1"
 features = ["full"]
 
 [dependencies.clap]
-version = "4.5.34"
+version = "4.5.47"
 features = ["derive"]
 
 [dependencies.serde]
-version = "1.0.219"
+version = "1.0.225"
 features = ["derive"]
 
 [dependencies.tracing-subscriber]
-version = "0.3.19"
+# Force 0.3.19 because of https://github.com/tokio-rs/tracing/issues/3369
+version = "=0.3.19"
 features = ["env-filter"]
 
 # Optimize dependencies in dev
diff --git a/src/command/current.rs b/src/command/current.rs
@@ -18,11 +18,11 @@ impl JpreCommand for Current {
         }
         let link_target = std::fs::read_link(&path)
             .change_context(JpreError::Unexpected)
-            .attach_printable_lazy(|| format!("Failed to read link target of {:?}", path))?;
+            .attach_with(|| format!("Failed to read link target of {:?}", path))?;
         let full_version = JDK_MANAGER
             .get_full_version_from_path(&link_target)
             .change_context(JpreError::Unexpected)
-            .attach_printable_lazy(|| format!("Failed to get full version of {:?}", link_target))?;
+            .attach_with(|| format!("Failed to get full version of {:?}", link_target))?;
 
         println!(
             "{}",
diff --git a/src/command/java_home.rs b/src/command/java_home.rs
@@ -29,7 +29,7 @@ impl JpreCommand for JavaHome {
             Ok(())
         })()
         .change_context(JpreError::Unexpected)
-        .attach_printable("Failed to write Java home path to stderr")?;
+        .attach("Failed to write Java home path to stderr")?;
 
         Ok(())
     }
diff --git a/src/command/list_distributions.rs b/src/command/list_distributions.rs
@@ -19,7 +19,7 @@ impl JpreCommand for ListDistributions {
             FOOJAY_API
                 .list_distributions()
                 .change_context(JpreError::Unexpected)
-                .attach_printable("Failed to list distributions")?,
+                .attach("Failed to list distributions")?,
         );
         distributions.sort();
         for distribution in distributions {
diff --git a/src/command/list_installed.rs b/src/command/list_installed.rs
@@ -15,7 +15,7 @@ impl JpreCommand for ListInstalled {
         let mut installed = JDK_MANAGER
             .get_installed_jdks()
             .change_context(JpreError::Unexpected)
-            .attach_printable("Failed to get installed JDKs")?;
+            .attach("Failed to get installed JDKs")?;
 
         installed.sort();
 
@@ -24,7 +24,7 @@ impl JpreCommand for ListInstalled {
             let full = JDK_MANAGER
                 .get_full_version(&jdk)
                 .change_context(JpreError::Unexpected)
-                .attach_printable_lazy(|| format!("Failed to get full version for JDK {}", jdk))?;
+                .attach_with(|| format!("Failed to get full version for JDK {}", jdk))?;
             println!(
                 "- {} (full: {})",
                 jdk.if_supports_color(Stream::Stdout, |s| s.color(jdk_color())),
diff --git a/src/command/list_versions.rs b/src/command/list_versions.rs
@@ -38,14 +38,14 @@ impl JpreCommand for ListVersions {
             {
                 return Err(err
                     .change_context(JpreError::UserError)
-                    .attach(UserMessage {
+                    .attach_opaque(UserMessage {
                         message: format!("Distribution '{}' not found", distribution),
                     }));
             }
             Err(err) => {
                 return Err(err
                     .change_context(JpreError::Unexpected)
-                    .attach_printable("Failed to list versions"))
+                    .attach("Failed to list versions"))
             }
         };
         major_versions.sort();
diff --git a/src/command/remove_jdk.rs b/src/command/remove_jdk.rs
@@ -19,10 +19,10 @@ impl JpreCommand for RemoveJdk {
         let path = JDK_MANAGER
             .get_jdk_path(&context.config, &self.jdk)
             .change_context(JpreError::Unexpected)
-            .attach_printable_lazy(|| format!("Failed to get path for JDK {}", self.jdk))?;
+            .attach_with(|| format!("Failed to get path for JDK {}", self.jdk))?;
         std::fs::remove_dir_all(&path)
             .change_context(JpreError::Unexpected)
-            .attach_printable_lazy(|| format!("Failed to remove JDK at {}", path.display()))?;
+            .attach_with(|| format!("Failed to remove JDK at {}", path.display()))?;
         eprintln!(
             "Removed JDK {}",
             self.jdk
diff --git a/src/command/set_default.rs b/src/command/set_default.rs
@@ -37,7 +37,7 @@ impl JpreCommand for SetDefault {
         JDK_MANAGER
             .get_jdk_path(&context.config, &self.jdk)
             .change_context(JpreError::Unexpected)
-            .attach_printable_lazy(|| format!("Failed to get path for JDK {}", self.jdk))?;
+            .attach_with(|| format!("Failed to get path for JDK {}", self.jdk))?;
 
         context.config.edit_config(|doc| {
             doc["default_jdk"] = toml_edit::value(self.jdk.to_string());
diff --git a/src/command/set_distributions.rs b/src/command/set_distributions.rs
@@ -30,7 +30,7 @@ impl JpreCommand for SetDistributions {
         let distributions = FOOJAY_API
             .list_distributions()
             .change_context(JpreError::Unexpected)
-            .attach_printable("Failed to list distributions")?;
+            .attach("Failed to list distributions")?;
         let all_names = distributions
             .iter()
             .flat_map(|i| &i.synonyms)
@@ -45,10 +45,10 @@ impl JpreCommand for SetDistributions {
         if !missing_names.is_empty() {
             missing_names.sort();
             return Err(Report::new(JpreError::UserError)
-                .attach(UserMessage {
+                .attach_opaque(UserMessage {
                     message: format!("Distribution(s) '{}' not found", missing_names.join(", ")),
                 })
-                .attach(UserMessage {
+                .attach_opaque(UserMessage {
                     message: format!(
                         "Available distributions: {}",
                         distributions.into_iter().map(|i| i.name).join(", ")
diff --git a/src/command/update.rs b/src/command/update.rs
@@ -48,15 +48,17 @@ impl JpreCommand for UpdateInstalled {
         let mut installed = JDK_MANAGER
             .get_installed_jdks()
             .change_context(JpreError::Unexpected)
-            .attach_printable("Failed to get installed JDKs")?;
+            .attach("Failed to get installed JDKs")?;
 
         let retain_fn: Box<dyn Fn(&VersionKey) -> bool> = match self.target {
             UpdateTarget::All => Box::new(|_| true),
             UpdateTarget::Default => {
                 let Some(default) = context.config.default_jdk.clone() else {
-                    return Err(Report::new(JpreError::UserError).attach(UserMessage {
-                        message: "No default JDK set".to_string(),
-                    }));
+                    return Err(
+                        Report::new(JpreError::UserError).attach_opaque(UserMessage {
+                            message: "No default JDK set".to_string(),
+                        }),
+                    );
                 };
                 Box::new(move |jdk| jdk == &default)
             }
@@ -84,7 +86,7 @@ impl JpreCommand for UpdateInstalled {
                 let latest_info_result = FOOJAY_API
                     .get_latest_package_info_using_priority(&context.config, &jdk)
                     .change_context(JpreError::Unexpected)
-                    .attach_printable("Failed to get latest package info");
+                    .attach("Failed to get latest package info");
                 let (list_info, _) = match latest_info_result {
                     Ok(info) => info,
                     Err(err) => {
@@ -125,7 +127,7 @@ impl UpdateInstalled {
         JDK_MANAGER
             .download_jdk(&context.config, jdk)
             .change_context(JpreError::Unexpected)
-            .attach_printable("Failed to update JDK")?;
+            .attach("Failed to update JDK")?;
         Ok(())
     }
 }
diff --git a/src/command/use_jdk.rs b/src/command/use_jdk.rs
@@ -40,7 +40,7 @@ impl JpreCommand for UseJdk {
     fn run(self, context: Context) -> ESResult<(), JpreError> {
         let jdk = match self.jdk {
             UseTarget::Default => context.config.default_jdk.clone().ok_or_else(|| {
-                Report::new(JpreError::UserError).attach(UserMessage {
+                Report::new(JpreError::UserError).attach_opaque(UserMessage {
                     message: "No default JDK set".to_string(),
                 })
             })?,
diff --git a/src/config.rs b/src/config.rs
@@ -41,7 +41,7 @@ impl JpreConfig {
     pub(super) fn load() -> ESResult<JpreConfig, JpreError> {
         std::fs::create_dir_all(CONFIG_PATH.parent().unwrap())
             .change_context(JpreError::Unexpected)
-            .attach_printable_lazy(|| {
+            .attach_with(|| {
                 format!(
                     "Could not create config directory at {:?}",
                     PROJECT_DIRS.config_dir()
@@ -52,9 +52,7 @@ impl JpreConfig {
             .append(true)
             .open(&*CONFIG_PATH)
             .change_context(JpreError::Unexpected)
-            .attach_printable_lazy(|| {
-                format!("Could not open config file at {:?}", *CONFIG_PATH)
-            })?;
+            .attach_with(|| format!("Could not open config file at {:?}", *CONFIG_PATH))?;
         let (contents, config) = Self::read_config()?;
         match config {
             Ok(mut config) => {
@@ -63,7 +61,7 @@ impl JpreConfig {
                     config.distribution = None;
                 }
                 if config.distributions.is_empty() {
-                    return Err(JpreError::UserError).attach(UserMessage {
+                    return Err(JpreError::UserError).attach_opaque(UserMessage {
                         message: "No distributions set in config".to_string(),
                     });
                 }
@@ -74,15 +72,15 @@ impl JpreConfig {
                 let Ok(old_config) = toml::from_str::<toml::Table>(&contents) else {
                     return Err(e)
                         .change_context(JpreError::Unexpected)
-                        .attach_printable_lazy(|| {
+                        .attach_with(|| {
                             format!("Could not parse config file at {:?}", *CONFIG_PATH)
                         });
                 };
                 if let Some(toml::Value::Integer(major)) = old_config.get("default_jdk") {
                     if old_config.keys().len() != 1 {
                         return Err(e)
                             .change_context(JpreError::Unexpected)
-                            .attach_printable_lazy(|| {
+                            .attach_with(|| {
                                 format!("Could not parse config file at {:?}", *CONFIG_PATH)
                             });
                     }
@@ -105,32 +103,28 @@ impl JpreConfig {
 
                     std::fs::write(&*CONFIG_PATH, new_config.to_string())
                         .change_context(JpreError::Unexpected)
-                        .attach_printable_lazy(|| {
+                        .attach_with(|| {
                             format!("Could not write config file at {:?}", *CONFIG_PATH)
                         })?;
 
                     return Self::read_config()?
                         .1
                         .change_context(JpreError::Unexpected)
-                        .attach_printable_lazy(|| {
+                        .attach_with(|| {
                             format!("Could not parse config file at {:?}", *CONFIG_PATH)
                         });
                 }
                 Err(e)
                     .change_context(JpreError::Unexpected)
-                    .attach_printable_lazy(|| {
-                        format!("Could not parse config file at {:?}", *CONFIG_PATH)
-                    })
+                    .attach_with(|| format!("Could not parse config file at {:?}", *CONFIG_PATH))
             }
         }
     }
 
     fn read_config() -> ESResult<(String, Result<JpreConfig, Error>), JpreError> {
         let contents = std::fs::read_to_string(&*CONFIG_PATH)
             .change_context(JpreError::Unexpected)
-            .attach_printable_lazy(|| {
-                format!("Could not read config file at {:?}", *CONFIG_PATH)
-            })?;
+            .attach_with(|| format!("Could not read config file at {:?}", *CONFIG_PATH))?;
         let config = toml::from_str::<JpreConfig>(&contents);
         Ok((contents, config))
     }
@@ -142,9 +136,7 @@ impl JpreConfig {
         let contents = Self::read_config()?.0;
         let mut config = toml_edit::DocumentMut::from_str(&contents)
             .change_context(JpreError::Unexpected)
-            .attach_printable_lazy(|| {
-                format!("Could not parse config file at {:?}", *CONFIG_PATH)
-            })?;
+            .attach_with(|| format!("Could not parse config file at {:?}", *CONFIG_PATH))?;
         editor(&mut config);
 
         // Ensure whatever is in the config is valid, and update ourselves to it.
@@ -153,9 +145,7 @@ impl JpreConfig {
 
         std::fs::write(&*CONFIG_PATH, config.to_string())
             .change_context(JpreError::Unexpected)
-            .attach_printable_lazy(|| {
-                format!("Could not write config file at {:?}", *CONFIG_PATH)
-            })?;
+            .attach_with(|| format!("Could not write config file at {:?}", *CONFIG_PATH))?;
         Ok(())
     }
 }
diff --git a/src/error.rs b/src/error.rs
@@ -1,7 +1,8 @@
 use derive_more::Display;
-use error_stack::Context;
+use error_stack::Report;
+use std::error::Error;
 
-pub type ESResult<T, E> = error_stack::Result<T, E>;
+pub type ESResult<T, E> = Result<T, Report<E>>;
 
 #[derive(Debug, Display)]
 pub enum JpreError {
@@ -13,7 +14,7 @@ pub enum JpreError {
     Unexpected,
 }
 
-impl Context for JpreError {}
+impl Error for JpreError {}
 
 /// Message for the user. Attached when the error is a [`JpreError::UserError`].
 #[derive(Debug)]
diff --git a/src/foojay.rs b/src/foojay.rs
diff --git a/src/java_home_management.rs b/src/java_home_management.rs
diff --git a/src/java_version.rs b/src/java_version.rs
diff --git a/src/jdk_manager.rs b/src/jdk_manager.rs

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ impl JpreCommand for JavaHome {`
`29`	`29`	`Ok(())`
`30`	`30`	`})()`
`31`	`31`	`.change_context(JpreError::Unexpected)`
`32`		`- .attach_printable("Failed to write Java home path to stderr")?;`
	`32`	`+ .attach("Failed to write Java home path to stderr")?;`
`33`	`33`
`34`	`34`	`Ok(())`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,14 +38,14 @@ impl JpreCommand for ListVersions {`
`38`	`38`	`{`
`39`	`39`	`return Err(err`
`40`	`40`	`.change_context(JpreError::UserError)`
`41`		`- .attach(UserMessage {`
	`41`	`+ .attach_opaque(UserMessage {`
`42`	`42`	`message: format!("Distribution '{}' not found", distribution),`
`43`	`43`	`}));`
`44`	`44`	`}`
`45`	`45`	`Err(err) => {`
`46`	`46`	`return Err(err`
`47`	`47`	`.change_context(JpreError::Unexpected)`
`48`		`- .attach_printable("Failed to list versions"))`
	`48`	`+ .attach("Failed to list versions"))`
`49`	`49`	`}`
`50`	`50`	`};`
`51`	`51`	`major_versions.sort();`