Skip to content

Commit 315cb24

Browse files
CarterLiCarterLi
authored
Merge pull request #604 from fastfetch-cli/dev
Fix CI of FreeBSD
2 parents 390119c + 4cabc56 commit 315cb24

File tree

4 files changed

+47
-37
lines changed

4 files changed

+47
-37
lines changed

‎src/common/bar.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,9 @@ void ffAppendPercentNum(FFstrbuf* buffer, double percent, uint8_t green, uint8_t
7878

7979
if (colored && !options->pipe)
8080
{
81-
if(green < yellow)
81+
if(percent != percent)
82+
ffStrbufAppendS(buffer, "\e[" FF_COLOR_FG_LIGHT_BLACK "m");
83+
else if(green < yellow)
8284
{
8385
if (percent <= green)
8486
ffStrbufAppendS(buffer, "\e[" FF_COLOR_FG_GREEN "m");

‎src/detection/cpuusage/cpuusage.c‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ const char* ffGetCpuUsageResult(FFlist* result)
2727
if(cpuTimes1.length == 0) return "No CPU cores found";
2828

2929
FF_LIST_AUTO_DESTROY cpuTimes2 = ffListCreate(sizeof(FFCpuUsageInfo));
30+
uint32_t retryCount = 0;
3031

3132
retry:
3233
error = ffGetCpuUsageInfo(&cpuTimes2);
@@ -39,9 +40,12 @@ const char* ffGetCpuUsageResult(FFlist* result)
3940
FFCpuUsageInfo* cpuTime2 = ffListGet(&cpuTimes2, i);
4041
if (cpuTime2->totalAll <= cpuTime1->totalAll)
4142
{
42-
ffListClear(&cpuTimes2);
43-
ffTimeSleep(200);
44-
goto retry;
43+
if (++retryCount <= 3)
44+
{
45+
ffListClear(&cpuTimes2);
46+
ffTimeSleep(200);
47+
goto retry;
48+
}
4549
}
4650
}
4751

‎src/detection/os/os_apple.m‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -35,34 +35,34 @@ static bool detectOSCodeName(FFOSResult* os)
3535

3636
switch (num)
3737
{
38-
case 14: ffStrbufAppendS(&os->codename, "Sonoma"); return true;
39-
case 13: ffStrbufAppendS(&os->codename, "Ventura"); return true;
40-
case 12: ffStrbufAppendS(&os->codename, "Monterey"); return true;
41-
case 11: ffStrbufAppendS(&os->codename, "Big Sur"); return true;
38+
case 14: ffStrbufSetStatic(&os->codename, "Sonoma"); return true;
39+
case 13: ffStrbufSetStatic(&os->codename, "Ventura"); return true;
40+
case 12: ffStrbufSetStatic(&os->codename, "Monterey"); return true;
41+
case 11: ffStrbufSetStatic(&os->codename, "Big Sur"); return true;
4242
case 10: {
4343
version = str_end + 1;
4444
num = strtoul(version, &str_end, 10);
4545
if (str_end == version) return false;
4646

4747
switch (num)
4848
{
49-
case 16: ffStrbufAppendS(&os->codename, "Big Sur"); return true;
50-
case 15: ffStrbufAppendS(&os->codename, "Catalina"); return true;
51-
case 14: ffStrbufAppendS(&os->codename, "Mojave"); return true;
52-
case 13: ffStrbufAppendS(&os->codename, "High Sierra"); return true;
53-
case 12: ffStrbufAppendS(&os->codename, "Sierra"); return true;
54-
case 11: ffStrbufAppendS(&os->codename, "El Capitan"); return true;
55-
case 10: ffStrbufAppendS(&os->codename, "Yosemite"); return true;
56-
case 9: ffStrbufAppendS(&os->codename, "Mavericks"); return true;
57-
case 8: ffStrbufAppendS(&os->codename, "Mountain Lion"); return true;
58-
case 7: ffStrbufAppendS(&os->codename, "Lion"); return true;
59-
case 6: ffStrbufAppendS(&os->codename, "Snow Leopard"); return true;
60-
case 5: ffStrbufAppendS(&os->codename, "Leopard"); return true;
61-
case 4: ffStrbufAppendS(&os->codename, "Tiger"); return true;
62-
case 3: ffStrbufAppendS(&os->codename, "Panther"); return true;
63-
case 2: ffStrbufAppendS(&os->codename, "Jaguar"); return true;
64-
case 1: ffStrbufAppendS(&os->codename, "Puma"); return true;
65-
case 0: ffStrbufAppendS(&os->codename, "Cheetah"); return true;
49+
case 16: ffStrbufSetStatic(&os->codename, "Big Sur"); return true;
50+
case 15: ffStrbufSetStatic(&os->codename, "Catalina"); return true;
51+
case 14: ffStrbufSetStatic(&os->codename, "Mojave"); return true;
52+
case 13: ffStrbufSetStatic(&os->codename, "High Sierra"); return true;
53+
case 12: ffStrbufSetStatic(&os->codename, "Sierra"); return true;
54+
case 11: ffStrbufSetStatic(&os->codename, "El Capitan"); return true;
55+
case 10: ffStrbufSetStatic(&os->codename, "Yosemite"); return true;
56+
case 9: ffStrbufSetStatic(&os->codename, "Mavericks"); return true;
57+
case 8: ffStrbufSetStatic(&os->codename, "Mountain Lion"); return true;
58+
case 7: ffStrbufSetStatic(&os->codename, "Lion"); return true;
59+
case 6: ffStrbufSetStatic(&os->codename, "Snow Leopard"); return true;
60+
case 5: ffStrbufSetStatic(&os->codename, "Leopard"); return true;
61+
case 4: ffStrbufSetStatic(&os->codename, "Tiger"); return true;
62+
case 3: ffStrbufSetStatic(&os->codename, "Panther"); return true;
63+
case 2: ffStrbufSetStatic(&os->codename, "Jaguar"); return true;
64+
case 1: ffStrbufSetStatic(&os->codename, "Puma"); return true;
65+
case 0: ffStrbufSetStatic(&os->codename, "Cheetah"); return true;
6666
}
6767
}
6868
}
@@ -113,7 +113,7 @@ void ffDetectOSImpl(FFOSResult* os)
113113
parseSystemVersion(os);
114114

115115
if(ffStrbufStartsWithIgnCaseS(&os->name, "MacOS"))
116-
ffStrbufAppendS(&os->id, "macos");
116+
ffStrbufSetStatic(&os->id, "macos");
117117

118118
if(os->version.length == 0)
119119
ffSysctlGetString("kern.osproductversion", &os->version);

‎src/modules/cpuusage/cpuusage.c‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,27 @@ void ffPrintCPUUsage(FFCPUUsageOptions* options)
2222
double maxValue = -999, minValue = 999, sumValue = 0;
2323
uint32_t maxIndex = 999, minIndex = 999;
2424

25-
uint32_t index = 0;
25+
uint32_t index = 0, valueCount = 0;
2626
FF_LIST_FOR_EACH(double, percent, percentages)
2727
{
28-
sumValue += *percent;
29-
if (*percent > maxValue)
28+
if (*percent == *percent)
3029
{
31-
maxValue = *percent;
32-
maxIndex = index;
33-
}
34-
if (*percent < minValue)
35-
{
36-
minValue = *percent;
37-
minIndex = index;
30+
sumValue += *percent;
31+
if (*percent > maxValue)
32+
{
33+
maxValue = *percent;
34+
maxIndex = index;
35+
}
36+
if (*percent < minValue)
37+
{
38+
minValue = *percent;
39+
minIndex = index;
40+
}
41+
++valueCount;
3842
}
3943
++index;
4044
}
41-
double avgValue = sumValue / (double) percentages.length;
45+
double avgValue = sumValue / (double) valueCount;
4246

4347
if(options->moduleArgs.outputFormat.length == 0)
4448
{

0 commit comments

Comments
 (0)