Merge pull request #536 from fastfetch-cli/dev

CarterLi · web-flow · commit 9a4e7874d632 · 2023-08-24T19:12:52.000+08:00
Release 2.0.3
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -187,7 +187,7 @@ jobs:
         with:
           msystem: CLANG64
           update: true
-          install: git zip mingw-w64-clang-x86_64-cmake mingw-w64-clang-x86_64-clang mingw-w64-clang-x86_64-vulkan-loader mingw-w64-clang-x86_64-opencl-icd
+          install: git mingw-w64-clang-x86_64-7zip mingw-w64-clang-x86_64-cmake mingw-w64-clang-x86_64-clang mingw-w64-clang-x86_64-vulkan-loader mingw-w64-clang-x86_64-opencl-icd
 
       - name: print msys version
         run: uname -a
@@ -222,13 +222,16 @@ jobs:
         run: ctest
 
       - name: create zip archive
-        run: zip fastfetch-$(./fastfetch --version-raw)-Win64.zip *.dll fastfetch.exe flashfetch.exe
+        run: 7z a -tzip -mx9 -bd -y fastfetch-$(./fastfetch --version-raw)-Win64.zip *.dll fastfetch.exe flashfetch.exe presets
+
+      - name: create 7z archive
+        run: 7z a -t7z -mx9 -bd -y fastfetch-$(./fastfetch --version-raw)-Win64.7z *.dll fastfetch.exe flashfetch.exe presets
 
       - name: upload artifacts
         uses: actions/upload-artifact@v3
         with:
           name: fastfetch-win64
-          path: ./fastfetch-*-Win64.zip
+          path: ./fastfetch-*-Win64.*
 
   win32:
     name: Win32
@@ -248,7 +251,7 @@ jobs:
         with:
           msystem: CLANG32
           update: true
-          install: git zip mingw-w64-clang-i686-cmake mingw-w64-clang-i686-clang mingw-w64-clang-i686-vulkan-loader mingw-w64-clang-i686-opencl-icd
+          install: git mingw-w64-clang-i686-7zip mingw-w64-clang-i686-cmake mingw-w64-clang-i686-clang mingw-w64-clang-i686-vulkan-loader mingw-w64-clang-i686-opencl-icd
 
       - name: print msys version
         run: uname -a
@@ -280,13 +283,16 @@ jobs:
         run: ctest
 
       - name: create zip archive
-        run: zip fastfetch-$(./fastfetch --version-raw)-Win32.zip *.dll fastfetch.exe flashfetch.exe
+        run: 7z a -tzip -mx9 -bd -y fastfetch-$(./fastfetch --version-raw)-Win32.zip *.dll fastfetch.exe flashfetch.exe presets
+
+      - name: create 7z archive
+        run: 7z a -t7z -mx9 -bd -y fastfetch-$(./fastfetch --version-raw)-Win32.7z *.dll fastfetch.exe flashfetch.exe presets
 
       - name: upload artifacts
         uses: actions/upload-artifact@v3
         with:
           name: fastfetch-win32
-          path: ./fastfetch-*-Win32.zip
+          path: ./fastfetch-*-Win32.*
 
   release:
     if: github.event_name == 'push' && github.ref == 'refs/heads/master' && github.repository == 'fastfetch-cli/fastfetch'
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+# 2.0.3
+
+Bugfixes:
+* Fix typo in config parsing for --color-title (#534)
+* Fix percent formatting for `--*-format` (#535)
+* Fix loading presets for homebrew (macOS)
+
+Features:
+* Add option `--percent-ndigits`
+* Add command flag `--config` as an alias of `--load-config`
+* Windows packages now include presets (Windows)
+
 # 2.0.2
 
 Bugfixes:
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.12.0) # target_link_libraries with OBJECT libs & project homepage url
 
 project(fastfetch
-    VERSION 2.0.2
+    VERSION 2.0.3
     LANGUAGES C
     DESCRIPTION "Fast system information tool"
     HOMEPAGE_URL "https://github.com/fastfetch-cli/fastfetch"
diff --git a/README.md b/README.md
@@ -1,6 +1,15 @@
 # Fastfetch
 
-[![CI](https://github.com/fastfetch-cli/fastfetch/actions/workflows/ci.yml/badge.svg)](https://github.com/fastfetch-cli/fastfetch/actions/workflows/ci.yml)
+![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/fastfetch-cli/fastfetch/ci.yml)
+![GitHub license](https://img.shields.io/github/license/fastfetch-cli/fastfetch)
+![GitHub contributors](https://img.shields.io/github/contributors/fastfetch-cli/fastfetch)
+![GitHub top language](https://img.shields.io/github/languages/top/fastfetch-cli/fastfetch?logo=c&label=)
+![GitHub commit activity (branch)](https://img.shields.io/github/commit-activity/m/fastfetch-cli/fastfetch)  
+![homebrew downloads](https://img.shields.io/homebrew/installs/dm/fastfetch?logo=homebrew)
+![GitHub all releases](https://img.shields.io/github/downloads/fastfetch-cli/fastfetch/total?logo=github)  
+![GitHub release (with filter)](https://img.shields.io/github/v/release/fastfetch-cli/fastfetch?logo=github)
+[![latest packaged version(s)](https://repology.org/badge/latest-versions/fastfetch.svg)](https://repology.org/project/fastfetch/versions)
+[![Packaging status](https://repology.org/badge/tiny-repos/fastfetch.svg)](https://repology.org/project/fastfetch/versions)
 
 Fastfetch is a [neofetch](https://github.com/dylanaraps/neofetch)-like tool for fetching system information and displaying them in a pretty way. It is written mainly in C, with performance and customizability in mind. Currently, Linux, Android, FreeBSD, MacOS and Windows 7+ are supported.
 
diff --git a/doc/json_schema.json b/doc/json_schema.json
@@ -343,6 +343,8 @@
                 "sizeNdigits": {
                     "type": "integer",
                     "title": "Set the number of digits to keep after the decimal point when formatting sizes",
+                    "minimum": 0,
+                    "maximum": 9,
                     "default": 2
                 },
                 "sizeMaxPrefix": {
@@ -388,9 +390,16 @@
                     "type": "number",
                     "title": "Set the percentage output type. 1 for percentage number, 2 for bar, 3 for both, 6 for bar only, 9 for colored number",
                     "minimum": 0,
-                    "maximum": 9,
+                    "maximum": 255,
                     "default": 1
                 },
+                "percentNdigits": {
+                    "type": "number",
+                    "title": "Set the number of digits to keep after the decimal point when formatting percentage numbers",
+                    "minimum": 0,
+                    "maximum": 9,
+                    "default": 0
+                },
                 "noBuffer": {
                     "type": "boolean",
                     "title": "Whether to disable the stdout application buffer",
diff --git a/src/common/bar.c b/src/common/bar.c
@@ -93,7 +93,7 @@ void ffAppendPercentNum(FFstrbuf* buffer, double percent, uint8_t green, uint8_t
                 ffStrbufAppendS(buffer, "\e[" FF_COLOR_FG_LIGHT_RED "m");
         }
     }
-    ffStrbufAppendF(buffer, "%u%%", (unsigned) (percent + 0.5));
+    ffStrbufAppendF(buffer, "%.*f%%", instance.config.percentNdigits, percent);
 
     if (colored && !instance.config.pipe)
     {
diff --git a/src/common/init.c b/src/common/init.c
@@ -74,6 +74,7 @@ static void defaultConfig(void)
     instance.config.barWidth = 10;
     instance.config.barBorder = true;
     instance.config.percentType = 1;
+    instance.config.percentNdigits = 0;
 
     ffInitBatteryOptions(&instance.config.battery);
     ffInitBiosOptions(&instance.config.bios);
diff --git a/src/common/jsonconfig.c b/src/common/jsonconfig.c
@@ -325,7 +325,9 @@ const char* ffParseDisplayJsonConfig(void)
             config->temperatureUnit = (FFTemperatureUnit) value;
         }
         else if (ffStrEqualsIgnCase(key, "percentType"))
-            config->percentType = (uint32_t) yyjson_get_uint(val);
+            config->percentType = (uint8_t) yyjson_get_uint(val);
+        else if (ffStrEqualsIgnCase(key, "percentNdigits"))
+            config->percentNdigits = (uint8_t) yyjson_get_uint(val);
         else if (ffStrEqualsIgnCase(key, "bar"))
         {
             if (yyjson_is_obj(val))
diff --git a/src/data/help.txt b/src/data/help.txt
@@ -19,6 +19,7 @@ Informative options:
 
 General options:
     --load-config <file>:             Load a config file or preset (+)
+    --config <file>:                  Alias of --load-config (+)
     --multithreading <?value>:        Use multiple threads to detect values
     --stat <?value>:                  Show time usage (in ms) for individual modules
     --allow-slow-operations <?value>: Allow operations that are usually very slow for more detailed output
@@ -70,6 +71,7 @@ Display options:
     --hide-cursor <?value>:      Whether to hide the cursor during the run
     --binary-prefix <value>:     Set the binary prefix to used. Must be IEC, SI or JEDEC. Default is IEC
     --percent-type <value>:      Set the percentage output type. 1 for percentage number, 2 for bar, 3 for both, 6 for bar only, 9 for colored number. Default is 1
+    --percent-ndigits <value>:   Set the number of digits to keep after the decimal point when formatting percentage numbers. Default is 0
     --bar-char-elapsed <str>:    Set the character to use in elapsed part. Default is '■'
     --bar-char-total <str>:      Set the character to use in total part. Default is '-'
     --bar-width <?num>:          Set the width of the bar, in number of characters. Default is 10
diff --git a/src/detection/opengl/opengl.h b/src/detection/opengl/opengl.h
@@ -13,6 +13,6 @@ typedef struct FFOpenGLResult
     FFstrbuf slv;
 } FFOpenGLResult;
 
-const char* ffDetectOpenGL(FFOpenGLResult* result);
+const char* ffDetectOpenGL(FFOpenGLOptions* options, FFOpenGLResult* result);
 
 #endif
diff --git a/src/detection/opengl/opengl_apple.c b/src/detection/opengl/opengl_apple.c
@@ -35,7 +35,7 @@ static const char* cglHandlePixelFormat(FFOpenGLResult* result, CGLPixelFormatOb
     return error;
 }
 
-const char* ffDetectOpenGL(FFOpenGLResult* result)
+const char* ffDetectOpenGL(FF_MAYBE_UNUSED FFOpenGLOptions* options, FFOpenGLResult* result)
 {
     CGLPixelFormatObj pixelFormat;
     CGLPixelFormatAttribute attrs[] = {
diff --git a/src/detection/opengl/opengl_linux.c b/src/detection/opengl/opengl_linux.c
@@ -314,11 +314,11 @@ static const char* osMesaPrint(FFOpenGLResult* result)
 
 #endif //FF_HAVE_OSMESA
 
-const char* ffDetectOpenGL(FFOpenGLResult* result)
+const char* ffDetectOpenGL(FFOpenGLOptions* options, FFOpenGLResult* result)
 {
     #if FF_HAVE_GL
 
-    if(instance.config.openGL.library == FF_OPENGL_LIBRARY_GLX)
+    if(options->library == FF_OPENGL_LIBRARY_GLX)
     {
         #ifdef FF_HAVE_GLX
             return glxPrint(result);
@@ -327,7 +327,7 @@ const char* ffDetectOpenGL(FFOpenGLResult* result)
         #endif
     }
 
-    if(instance.config.openGL.library == FF_OPENGL_LIBRARY_EGL)
+    if(options->library == FF_OPENGL_LIBRARY_EGL)
     {
         #ifdef FF_HAVE_EGL
             return eglPrint(result);
@@ -336,7 +336,7 @@ const char* ffDetectOpenGL(FFOpenGLResult* result)
         #endif
     }
 
-    if(instance.config.openGL.library == FF_OPENGL_LIBRARY_OSMESA)
+    if(options->library == FF_OPENGL_LIBRARY_OSMESA)
     {
         #ifdef FF_HAVE_OSMESA
             return osMesaPrint(result);
diff --git a/src/detection/opengl/opengl_windows.c b/src/detection/opengl/opengl_windows.c
@@ -82,7 +82,7 @@ LRESULT CALLBACK wglHandleWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM
     }
 }
 
-const char* ffDetectOpenGL(FFOpenGLResult* result)
+const char* ffDetectOpenGL(FF_MAYBE_UNUSED FFOpenGLOptions* options, FFOpenGLResult* result)
 {
     MSG msg = {0};
     WNDCLASSW wc = {
diff --git a/src/detection/terminalshell/terminalshell_linux.c b/src/detection/terminalshell/terminalshell_linux.c
@@ -48,7 +48,7 @@ static void getProcessInformation(pid_t pid, FFstrbuf* processName, FFstrbuf* ex
     if(length > 0)
         exe->length = (uint32_t)length;
 
-    #else
+    #elif defined(__FreeBSD__)
 
     size_t size = exe->allocated;
     if(!sysctl(
diff --git a/src/fastfetch.c b/src/fastfetch.c
@@ -58,11 +58,11 @@ static inline void printCommandHelp(const char* command)
 {
     if(command == NULL)
         puts(FASTFETCH_DATATEXT_HELP);
-    else if(ffStrEqualsIgnCase(command, "c") || ffStrEqualsIgnCase(command, "color"))
+    else if(ffStrEqualsIgnCase(command, "color"))
         puts(FASTFETCH_DATATEXT_HELP_COLOR);
     else if(ffStrEqualsIgnCase(command, "format"))
         puts(FASTFETCH_DATATEXT_HELP_FORMAT);
-    else if(ffStrEqualsIgnCase(command, "load-config") || ffStrEqualsIgnCase(command, "loadconfig") || ffStrEqualsIgnCase(command, "config"))
+    else if(ffStrEqualsIgnCase(command, "load-config") || ffStrEqualsIgnCase(command, "config"))
         puts(FASTFETCH_DATATEXT_HELP_CONFIG);
     else if(ffStrEqualsIgnCase(command, "os-format"))
     {
@@ -779,6 +779,19 @@ static void optionParseConfigFile(FFdata* data, const char* key, const char* val
             return;
     }
 
+    {
+        //Try exe path
+        ffStrbufSet(&absolutePath, &instance.state.platform.exePath);
+        ffStrbufSubstrBeforeLastC(&absolutePath, '/');
+        ffStrbufAppendS(&absolutePath, "/presets/");
+        ffStrbufAppendS(&absolutePath, value);
+
+        bool success = isJsonConfig ? parseJsoncFile(absolutePath.chars) : parseConfigFile(data, absolutePath.chars);
+
+        if(success)
+            return;
+    }
+
     //File not found
 
     fprintf(stderr, "Error: couldn't find config: %s\n", value);
@@ -932,7 +945,7 @@ static void parseOption(FFdata* data, const char* key, const char* value)
     //General options//
     ///////////////////
 
-    else if(ffStrEqualsIgnCase(key, "--load-config"))
+    else if(ffStrEqualsIgnCase(key, "--load-config") || ffStrEqualsIgnCase(key, "--config"))
         optionParseConfigFile(data, key, value);
     else if(ffStrEqualsIgnCase(key, "--gen-config"))
         generateConfigFile(false, value);
@@ -1002,7 +1015,7 @@ static void parseOption(FFdata* data, const char* key, const char* value)
             optionCheckString(key, value, &instance.config.colorKeys);
             ffOptionParseColor(value, &instance.config.colorKeys);
         }
-        else if(ffStrEqualsIgnCase(key, "-title"))
+        else if(ffStrEqualsIgnCase(subkey, "-title"))
         {
             optionCheckString(key, value, &instance.config.colorTitle);
             ffOptionParseColor(value, &instance.config.colorTitle);
@@ -1053,7 +1066,9 @@ static void parseOption(FFdata* data, const char* key, const char* value)
         });
     }
     else if(ffStrEqualsIgnCase(key, "--percent-type"))
-        instance.config.percentType = ffOptionParseUInt32(key, value);
+        instance.config.percentType = (uint8_t) ffOptionParseUInt32(key, value);
+    else if(ffStrEqualsIgnCase(key, "--percent-ndigits"))
+        instance.config.percentNdigits = (uint8_t) ffOptionParseUInt32(key, value);
     else if(ffStrEqualsIgnCase(key, "--no-buffer"))
         instance.config.noBuffer = ffOptionParseBoolean(value);
     else if(ffStrStartsWithIgnCase(key, "--bar"))
diff --git a/src/fastfetch.h b/src/fastfetch.h
@@ -61,7 +61,8 @@ typedef struct FFconfig
     FFstrbuf barCharTotal;
     uint8_t barWidth;
     bool barBorder;
-    uint32_t percentType;
+    uint8_t percentType;
+    uint8_t percentNdigits;
     bool pipe; //disables logo and all escape sequences
     bool multithreading;
     bool stat;
diff --git a/src/modules/battery/battery.c b/src/modules/battery/battery.c
@@ -10,17 +10,16 @@
 
 static void printBattery(FFBatteryOptions* options, BatteryResult* result, uint8_t index)
 {
-    if(instance.config.battery.moduleArgs.outputFormat.length == 0)
+    if(options->moduleArgs.outputFormat.length == 0)
     {
         ffPrintLogoAndKey(FF_BATTERY_MODULE_NAME, index, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
 
+        FF_STRBUF_AUTO_DESTROY str = ffStrbufCreate();
         bool showStatus =
             !(instance.config.percentType & FF_PERCENTAGE_TYPE_HIDE_OTHERS_BIT) &&
             result->status.length > 0 &&
             ffStrbufIgnCaseCompS(&result->status, "Unknown") != 0;
 
-        FF_STRBUF_AUTO_DESTROY str = ffStrbufCreate();
-
         if(result->capacity >= 0)
         {
             if(instance.config.percentType & FF_PERCENTAGE_TYPE_BAR_BIT)
@@ -62,11 +61,13 @@ static void printBattery(FFBatteryOptions* options, BatteryResult* result, uint8
     }
     else
     {
+        FF_STRBUF_AUTO_DESTROY capacityStr = ffStrbufCreate();
+        ffAppendPercentNum(&capacityStr, result->capacity, 51, 21, false);
         ffPrintFormat(FF_BATTERY_MODULE_NAME, index, &options->moduleArgs, FF_BATTERY_NUM_FORMAT_ARGS, (FFformatarg[]){
             {FF_FORMAT_ARG_TYPE_STRBUF, &result->manufacturer},
             {FF_FORMAT_ARG_TYPE_STRBUF, &result->modelName},
             {FF_FORMAT_ARG_TYPE_STRBUF, &result->technology},
-            {FF_FORMAT_ARG_TYPE_DOUBLE, &result->capacity},
+            {FF_FORMAT_ARG_TYPE_STRBUF, &capacityStr},
             {FF_FORMAT_ARG_TYPE_STRBUF, &result->status},
             {FF_FORMAT_ARG_TYPE_DOUBLE, &result->temperature},
         });
diff --git a/src/modules/brightness/brightness.c b/src/modules/brightness/brightness.c
@@ -43,10 +43,9 @@ void ffPrintBrightness(FFBrightnessOptions* options)
             });
         }
 
-        FF_STRBUF_AUTO_DESTROY str = ffStrbufCreate();
-
         if(options->moduleArgs.outputFormat.length == 0)
         {
+            FF_STRBUF_AUTO_DESTROY str = ffStrbufCreate();
             ffPrintLogoAndKey(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY);
 
             if (instance.config.percentType & FF_PERCENTAGE_TYPE_BAR_BIT)
@@ -66,8 +65,10 @@ void ffPrintBrightness(FFBrightnessOptions* options)
         }
         else
         {
+            FF_STRBUF_AUTO_DESTROY valueStr = ffStrbufCreate();
+            ffAppendPercentNum(&valueStr, item->value, 10, 10, false);
             ffPrintFormatString(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, FF_BRIGHTNESS_NUM_FORMAT_ARGS, (FFformatarg[]) {
-                {FF_FORMAT_ARG_TYPE_FLOAT, &item->value},
+                {FF_FORMAT_ARG_TYPE_STRBUF, &valueStr},
                 {FF_FORMAT_ARG_TYPE_STRBUF, &item->name},
             });
         }
diff --git a/src/modules/cpuusage/cpuusage.c b/src/modules/cpuusage/cpuusage.c
@@ -36,8 +36,10 @@ void ffPrintCPUUsage(FFCPUUsageOptions* options)
     }
     else
     {
+        FF_STRBUF_AUTO_DESTROY percentageStr = ffStrbufCreate();
+        ffAppendPercentNum(&percentageStr, percentage, 50, 80, false);
         ffPrintFormat(FF_CPUUSAGE_DISPLAY_NAME, 0, &options->moduleArgs, FF_CPUUSAGE_NUM_FORMAT_ARGS, (FFformatarg[]){
-            {FF_FORMAT_ARG_TYPE_DOUBLE, &percentage}
+            {FF_FORMAT_ARG_TYPE_STRBUF, &percentageStr}
         });
     }
 }
diff --git a/src/modules/disk/disk.c b/src/modules/disk/disk.c
diff --git a/src/modules/display/display.c b/src/modules/display/display.c
diff --git a/src/modules/memory/memory.c b/src/modules/memory/memory.c
diff --git a/src/modules/opengl/opengl.c b/src/modules/opengl/opengl.c
diff --git a/src/modules/swap/swap.c b/src/modules/swap/swap.c
diff --git a/src/util/platform/FFPlatform.c b/src/util/platform/FFPlatform.c
diff --git a/src/util/platform/FFPlatform.h b/src/util/platform/FFPlatform.h
diff --git a/src/util/platform/FFPlatform_unix.c b/src/util/platform/FFPlatform_unix.c
diff --git a/src/util/platform/FFPlatform_windows.c b/src/util/platform/FFPlatform_windows.c

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ void ffAppendPercentNum(FFstrbuf* buffer, double percent, uint8_t green, uint8_t`
`93`	`93`	`ffStrbufAppendS(buffer, "\e[" FF_COLOR_FG_LIGHT_RED "m");`
`94`	`94`	`}`
`95`	`95`	`}`
`96`		`- ffStrbufAppendF(buffer, "%u%%", (unsigned) (percent + 0.5));`
	`96`	`+ ffStrbufAppendF(buffer, "%.*f%%", instance.config.percentNdigits, percent);`
`97`	`97`
`98`	`98`	`if (colored && !instance.config.pipe)`
`99`	`99`	`{`
Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,9 @@ const char* ffParseDisplayJsonConfig(void)`
`325`	`325`	`config->temperatureUnit = (FFTemperatureUnit) value;`
`326`	`326`	`}`
`327`	`327`	`else if (ffStrEqualsIgnCase(key, "percentType"))`
`328`		`- config->percentType = (uint32_t) yyjson_get_uint(val);`
	`328`	`+ config->percentType = (uint8_t) yyjson_get_uint(val);`
	`329`	`+ else if (ffStrEqualsIgnCase(key, "percentNdigits"))`
	`330`	`+ config->percentNdigits = (uint8_t) yyjson_get_uint(val);`
`329`	`331`	`else if (ffStrEqualsIgnCase(key, "bar"))`
`330`	`332`	`{`
`331`	`333`	`if (yyjson_is_obj(val))`