11<script setup lang="ts">
22import type { DiskStat , LoadStat , MemStat } from ' @/api/analytic'
33import analytic from ' @/api/analytic'
4- import upgrade from ' @/api/upgrade'
54import { formatDateTime } from ' @/lib/helper'
65
76interface StatusData {
@@ -38,30 +37,27 @@ function formatUptime(uptime: number) {
3837// Format memory usage as "used percentage"
3938function formatMemoryUsage(memory : MemStat | null ) {
4039 if (! memory )
41- return ' 0B0 %'
40+ return ' 0B 0 %'
4241
43- // Use the pressure value as percentage (since you said we can get it directly)
44- const = memory .pressure . toFixed (1 )
42+ // Use percentage provided by the backend; keep 1 decimal place
43+ const = typeof memory .pressure === ' number ' ? memory . pressure . toFixed (1 ) : ' 0.0 '
4544
46- // Remove space from used size and combine without space
47- const = memory .used . replace ( ' ' , ' ' )
45+ // Preserve space in formatted size and add a space before percentage
46+ const = memory .used
4847
49- return ` ${usedSize }${percentage }% `
48+ return ` ${usedSize } ${percentage }% `
5049}
5150
5251// Format disk usage as "used percentage"
5352function formatDiskUsage(disk : DiskStat | null ) {
5453 if (! disk )
55- return ' 0B0 %'
54+ return ' 0B 0 %'
5655
57- // Value is already formatted string like "39 GiB"
58- // Use the pre-calculated percentage from the API
59- const percentage = disk .percentage . toFixed ( 1 )
56+ // Already a formatted string like "39 GiB"; percentage comes from API
57+ const percentage = typeof disk . percentage === ' number ' ? disk . percentage . toFixed ( 1 ) : ' 0.0 '
58+ const usedSize = disk .used
6059
61- // Remove space from used size and combine without space
62- const = disk .used .replace (' ' ' '
63-
64- return ` ${usedSize }${percentage }% `
60+ return ` ${usedSize } ${percentage }% `
6561}
6662
6763// Format CPU frequency
@@ -75,50 +71,46 @@ function formatCpuFreq(freq: number) {
7571 return ` ${freq .toFixed (0 )}MHz `
7672}
7773
74+ // Format CPU text as "<count>x<freq>" with graceful fallbacks
75+ function formatCpu(cpuCount : number , freq : number ) {
76+ const = typeof cpuCount === ' number' && cpuCount > 0
77+ const = typeof freq === ' number' && freq > 0
78+
79+ if (hasCount && hasFreq )
80+ return ` ${cpuCount }x${formatCpuFreq (freq )} `
81+ if (hasCount && ! hasFreq )
82+ return ` ${cpuCount }x `
83+ if (! hasCount && hasFreq )
84+ return ` ${formatCpuFreq (freq )} `
85+ return ' N/A'
86+ }
87+
7888// Update current timestamp
7989function updateTimestamp() {
8090 statusData .value .timestamp = formatDateTime (new Date ().toISOString ())
8191}
8292
83- // Initialize data from analytic init API
93+ // Initialize data from analytic init API (no fallbacks)
8494async function initializeData() {
8595 try {
8696 const = await analytic .init ()
8797
88- // Set system info with fallbacks
8998 statusData .value .uptime = analyticData ?.host ?.uptime || 0
9099 statusData .value .loadAvg = analyticData ?.loadavg || null
91100 statusData .value .memory = analyticData ?.memory || null
92101 statusData .value .disk = analyticData ?.disk || null
93102
94- // Set CPU info with fallbacks
103+ // System version is taken directly from host.platformVersion
104+ statusData .value .version = analyticData ?.host ?.platformVersion || ' '
105+
95106 const = analyticData ?.cpu ?.info || []
96107 statusData .value .cpuCount = cpuInfo .length || 0
97-
98- // Get CPU frequency from first CPU info with fallback
99- if (cpuInfo .length > 0 && cpuInfo [0 ].mhz ) {
100- statusData .value .cpuFreq = cpuInfo [0 ].mhz
101- }
102- else {
103- statusData .value .cpuFreq = 0
104- }
105-
106- // Try to get version from upgrade API, fallback to host platform version
107- try {
108- const = await upgrade .current_version ()
109- statusData .value .version = versionData ?.cur_version ?.version || analyticData ?.host ?.platformVersion || ' unknown'
110- }
111- catch (versionError ) {
112- console .warn (' Failed to get app version, using platform version:' versionError )
113- statusData .value .version = analyticData ?.host ?.platformVersion || ' unknown'
114- }
108+ statusData .value .cpuFreq = (cpuInfo .length > 0 && cpuInfo [0 ].mhz ) ? cpuInfo [0 ].mhz : 0
115109
116110 updateTimestamp ()
117111 }
118112 catch (error ) {
119113 console .error (' Failed to initialize terminal status bar:' error )
120- // Set default values on error
121- statusData .value .version = ' error'
122114 updateTimestamp ()
123115 }
124116}
@@ -200,7 +192,7 @@ onMounted(() => {
200192
201193 <div class =" status-item cpu"
202194 <span class =" icon i-tabler-cpu"
203- <span class =" value" }}x{{ formatCpuFreq( statusData.cpuFreq || 0) }}</span >
195+ <span class =" value" formatCpu( statusData.cpuCount || 0, statusData.cpuFreq || 0) }}</span >
204196 </div >
205197
206198 <div class =" status-item memory"
0 commit comments