aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src-tauri/src/core/java.rs
diff options
context:
space:
mode:
authorHsiangNianian <i@jyunko.cn>2026-01-18 13:34:52 +0800
committerHsiangNianian <i@jyunko.cn>2026-01-18 13:34:52 +0800
commit02520ca62ac5e508e8748b2445171be64f459b6c (patch)
treea15a95be5f2f93385df36d6336f53b3f08d07a44 /src-tauri/src/core/java.rs
parent53df697ccf90cd13efc985c195dade48920cc0fa (diff)
downloadDropOut-02520ca62ac5e508e8748b2445171be64f459b6c.tar.gz
DropOut-02520ca62ac5e508e8748b2445171be64f459b6c.zip
fix(ci): improve pre-commit fmt hook configuration
- Add pass_filenames: false to fmt hook - Add -- separator for cargo fmt args - Manually format code with cargo fmt
Diffstat (limited to 'src-tauri/src/core/java.rs')
-rw-r--r--src-tauri/src/core/java.rs15
1 files changed, 6 insertions, 9 deletions
diff --git a/src-tauri/src/core/java.rs b/src-tauri/src/core/java.rs
index d3e1bb9..2e3c8a7 100644
--- a/src-tauri/src/core/java.rs
+++ b/src-tauri/src/core/java.rs
@@ -855,22 +855,19 @@ fn parse_java_version(version: &str) -> u32 {
// - New format: 17.0.1, 11.0.5+10 (Java 11+)
// - Format with build: 21.0.3+13-Ubuntu-0ubuntu0.24.04.1
// - Format with underscores: 1.8.0_411
-
+
// First, strip build metadata (everything after '+')
let version_only = version.split('+').next().unwrap_or(version);
-
+
// Remove trailing junk (like "-Ubuntu-0ubuntu0.24.04.1")
- let version_only = version_only
- .split('-')
- .next()
- .unwrap_or(version_only);
-
+ let version_only = version_only.split('-').next().unwrap_or(version_only);
+
// Replace underscores with dots (1.8.0_411 -> 1.8.0.411)
let normalized = version_only.replace('_', ".");
-
+
// Split by dots
let parts: Vec<&str> = normalized.split('.').collect();
-
+
if let Some(first) = parts.first() {
if *first == "1" {
// Old format: 1.8.0 -> major is 8