v0.0.10 修复BSD系统识别硬盘大小失败的问题，添加默认的KSM和气球驱动默认值

.github/workflows/ci.yaml

@@ -24,7 +24,7 @@ jobs:
         run: |
           git config --global user.name 'github-actions'
           git config --global user.email 'github-actions@github.com'
-          TAG="v0.0.9-$(date +'%Y%m%d%H%M%S')"
+          TAG="v0.0.10-$(date +'%Y%m%d%H%M%S')"
           git tag $TAG
           git push origin $TAG
         env:

model/model.go

@@ -1,6 +1,6 @@
 package model
 
-const BasicsVersion = "v0.0.9"
+const BasicsVersion = "v0.0.10"
 
 var EnableLoger bool
 

system/disk.go

@@ -12,9 +12,37 @@ import (
 // getDiskInfo 获取硬盘信息
 func getDiskInfo() (string, string, string, string, error) {
 	var diskTotalStr, diskUsageStr, percentageStr, bootPath string
+
+	// BSD系统特殊处理
+	if runtime.GOOS == "freebsd" || runtime.GOOS == "openbsd" || runtime.GOOS == "netbsd" {
+		cmd := exec.Command("df", "-h", "/")
+		output, err := cmd.Output()
+		if err == nil {
+			lines := strings.Split(string(output), "\n")
+			if len(lines) >= 2 {
+				fields := strings.Fields(lines[1])
+				if len(fields) >= 5 {
+					bootPath = fields[0]
+					diskTotalStr = fields[1]
+					diskUsageStr = fields[2]
+					percentageStr = fields[4]
+
+					// 两个%避免被转义
+					if percentageStr != "" && strings.Contains(percentageStr, "%") {
+						percentageStr = strings.ReplaceAll(percentageStr, "%", "%%")
+					}
+
+					return diskTotalStr, diskUsageStr, percentageStr, bootPath, nil
+				}
+			}
+		}
+	}
+
+	// 保持原有代码逻辑
 	tempDiskTotal, tempDiskUsage := getDiskTotalAndUsed()
 	diskTotalGB := float64(tempDiskTotal) / (1024 * 1024 * 1024)
 	diskUsageGB := float64(tempDiskUsage) / (1024 * 1024 * 1024)
+
 	// 字节为单位 进行单位转换
 	if diskTotalGB < 1 {
 		diskTotalStr = strconv.FormatFloat(diskTotalGB*1024, 'f', 2, 64) + " MB"
@@ -26,6 +54,7 @@ func getDiskInfo() (string, string, string, string, error) {
 	} else {
 		diskUsageStr = strconv.FormatFloat(diskUsageGB, 'f', 2, 64) + " GB"
 	}
+
 	if runtime.GOOS == "windows" {
 		parts, err := disk.Partitions(true)
 		if err != nil {
@@ -86,6 +115,7 @@ func getDiskInfo() (string, string, string, string, error) {
 			}
 		}
 	}
+
 	// 两个%避免被转义
 	if percentageStr != "" && strings.Contains(percentageStr, "%") {
 		percentageStr = strings.ReplaceAll(percentageStr, "%", "%%")
@@ -111,9 +141,18 @@ func getDiskTotalAndUsed() (total uint64, used uint64) {
 			used += diskUsageOf.Used
 		}
 	}
-	// Fallback 到这个方法,仅统计根路径,适用于OpenVZ之类的.
+
-	if runtime.GOOS == "linux" && total == 0 && used == 0 {
+	// Fallback 到根路径的获取方法
-		cmd := exec.Command("df")
+	if total == 0 && used == 0 {
+		var cmd *exec.Cmd
+
+		// BSD系统使用特定参数
+		if runtime.GOOS == "freebsd" || runtime.GOOS == "openbsd" || runtime.GOOS == "netbsd" {
+			cmd = exec.Command("df", "-k", "/")
+		} else {
+			cmd = exec.Command("df")
+		}
+
 		out, err := cmd.CombinedOutput()
 		if err == nil {
 			s := strings.Split(string(out), "\n")
@@ -126,6 +165,16 @@ func getDiskTotalAndUsed() (total uint64, used uint64) {
 						// 默认获取的是1K块为单位的.
 						total = total * 1024
 						used = used * 1024
+						break
+					}
+				} else if len(info) == 5 && (runtime.GOOS == "freebsd" || runtime.GOOS == "openbsd" || runtime.GOOS == "netbsd") {
+					// BSD系统df输出格式可能只有5列
+					if info[4] == "/" {
+						total, _ = strconv.ParseUint(info[1], 0, 64)
+						used, _ = strconv.ParseUint(info[2], 0, 64)
+						total = total * 1024
+						used = used * 1024
+						break
 					}
 				}
 			}

system/memory.go

@@ -85,11 +85,14 @@ func getMemoryInfo() (string, string, string, string, string, string) {
 			} else {
 				virtioBalloonStatus = "✔️ Enabled"
 			}
-		} else {
-			virtioBalloonStatus = ""
 		}
-	} else {
+	}
-		virtioBalloonStatus = ""
+	if virtioBalloonStatus == "" {
+		if runtime.GOOS == "windows" {
+			virtioBalloonStatus = "[N] Undetected"
+		} else {
+			virtioBalloonStatus = "❌ Undetected"
+		}
 	}
 	ksmStatus, err := os.ReadFile("/sys/kernel/mm/ksm/run")
 	if err == nil {
@@ -99,11 +102,14 @@ func getMemoryInfo() (string, string, string, string, string, string) {
 			} else {
 				KernelSamepageMerging = "✔️ Enabled"
 			}
-		} else {
-			KernelSamepageMerging = ""
 		}
-	} else {
+	}
-		KernelSamepageMerging = ""
+	if KernelSamepageMerging == "" {
+		if runtime.GOOS == "windows" {
+			KernelSamepageMerging = "[N] Undetected"
+		} else {
+			KernelSamepageMerging = "❌ Undetected"
+		}
 	}
 	return memoryTotalStr, memoryUsageStr, swapTotalStr, swapUsageStr, virtioBalloonStatus, KernelSamepageMerging
 }

system/system.go

@@ -136,7 +136,7 @@ func CheckSystemInfo(language string) string {
 			res += " 气球驱动            : " + ret.VirtioBalloon + "\n"
 		}
 		if ret.KSM != "" {
-			res += " 内存同页合并        : " + ret.KSM + "\n"
+			res += " 内核页合并          : " + ret.KSM + "\n"
 		}
 		if ret.SwapTotal == "" && ret.SwapUsage == "" {
 			res += " 虚拟内存 Swap       : [ no swap partition or swap file detected ]" + "\n"