gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-08-20 03:22:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
houseme
2025-06-23 14:54:09 +08:00
parent de3773fbbc
commit 4654ba0937
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/utils/src/sys/user_agent.rs
+11 -14
View File
@@ -55,13 +55,12 @@ impl UserAgent {
/// Obtain operating system platform information /// Obtain operating system platform information
fn get_os_platform() -> String { fn get_os_platform() -> String {
let sys = System::new_all();
if cfg!(target_os = "windows") { if cfg!(target_os = "windows") {
Self::get_windows_platform(&sys) Self::get_windows_platform()
} else if cfg!(target_os = "macos") { } else if cfg!(target_os = "macos") {
Self::get_macos_platform(&sys) Self::get_macos_platform()
} else if cfg!(target_os = "linux") { } else if cfg!(target_os = "linux") {
Self::get_linux_platform(&sys) Self::get_linux_platform()
} else { } else {
"Unknown".to_string() "Unknown".to_string()
} }
@@ -69,9 +68,9 @@ impl UserAgent {
/// Get Windows platform information /// Get Windows platform information
#[cfg(windows)] #[cfg(windows)]
fn get_windows_platform(sys: &System) -> String { fn get_windows_platform() -> String {
// Priority to using sysinfo to get versions // Priority to using sysinfo to get versions
if let Some(version) = sys.os_version() { if let Some(version) = System::os_version() {
format!("Windows NT {}", version) format!("Windows NT {}", version)
} else { } else {
// Fallback to cmd /c ver // Fallback to cmd /c ver
@@ -91,13 +90,13 @@ impl UserAgent {
} }
#[cfg(not(windows))] #[cfg(not(windows))]
fn get_windows_platform(_sys: &System) -> String { fn get_windows_platform() -> String {
"N/A".to_string() "N/A".to_string()
} }
/// Get macOS platform information /// Get macOS platform information
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
fn get_macos_platform(_sys: &System) -> String { fn get_macos_platform() -> String {
let binding = System::os_version().unwrap_or("14.5.0".to_string()); let binding = System::os_version().unwrap_or("14.5.0".to_string());
let version = binding.split('.').collect::<Vec<&str>>(); let version = binding.split('.').collect::<Vec<&str>>();
let major = version.first().unwrap_or(&"14").to_string(); let major = version.first().unwrap_or(&"14").to_string();
@@ -112,20 +111,18 @@ impl UserAgent {
} }
#[cfg(not(target_os = "macos"))] #[cfg(not(target_os = "macos"))]
fn get_macos_platform(_sys: &System) -> String { fn get_macos_platform() -> String {
"N/A".to_string() "N/A".to_string()
} }
/// Get Linux platform information /// Get Linux platform information
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
fn get_linux_platform(sys: &System) -> String { fn get_linux_platform() -> String {
let name = sys.name().unwrap_or("Linux".to_string()); format!("X11; {}", System::long_os_version().unwrap_or("Linux Unknown".to_string()))
let version = sys.os_version().unwrap_or("Unknown".to_string());
format!("X11; {} {}", name, version)
} }
#[cfg(not(target_os = "linux"))] #[cfg(not(target_os = "linux"))]
fn get_linux_platform(_sys: &System) -> String { fn get_linux_platform() -> String {
"N/A".to_string() "N/A".to_string()
} }
} }