Merge pull request #571 from fastfetch-cli/dev

Release v2.1.0

.github/workflows/ci.yml

@@ -13,24 +13,29 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-22.04, ubuntu-20.04]
-        compiler: [gcc, clang, "musl-gcc"]
+        compiler: [
+          { cc: gcc, cxx: "g++" },
+          { cc: clang, cxx: "clang++" },
+          { cc: "musl-gcc", cxx: "musl-g++" }
+        ]
         enableFeatures: [ON, OFF]
         exclude:
           # The feature libraries are all build against glibc, so they can't be used with musl
-          - compiler: "musl-gcc"
+          - compiler: { cc: "musl-gcc", cxx: "musl-g++" }
             enableFeatures: ON
     runs-on: ${{ matrix.os }}
     steps:
       - name: checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: install required packages
-        run: sudo apt-get update && sudo apt-get install -y musl-dev musl-tools linux-headers-generic libpci-dev libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev rpm librpm-dev libzstd-dev libegl-dev libglx-dev libosmesa6-dev ocl-icd-opencl-dev libnm-dev libpulse-dev
+        run: sudo apt-get update && sudo apt-get install -y musl-dev musl-tools linux-headers-generic libpci-dev libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev rpm librpm-dev libzstd-dev libegl-dev libglx-dev libosmesa6-dev ocl-icd-opencl-dev libnm-dev libpulse-dev directx-headers-dev
 
       - name: configure project
         env:
-          CC: ${{ matrix.compiler }}
-        run: cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_LIBPCI=${{ matrix.enableFeatures }} -DENABLE_VULKAN=${{ matrix.enableFeatures }} -DENABLE_WAYLAND=${{ matrix.enableFeatures }} -DENABLE_XCB_RANDR=${{ matrix.enableFeatures }} -DENABLE_XCB=${{ matrix.enableFeatures }} -DENABLE_XRANDR=${{ matrix.enableFeatures }} -DENABLE_X11=${{ matrix.enableFeatures }} -DENABLE_GIO=${{ matrix.enableFeatures }} -DENABLE_DCONF=${{ matrix.enableFeatures }} -DENABLE_DBUS=${{ matrix.enableFeatures }} -DENABLE_XFCONF=${{ matrix.enableFeatures }} -DENABLE_SQLITE3=${{ matrix.enableFeatures }} -DENABLE_RPM=${{ matrix.enableFeatures }} -DENABLE_IMAGEMAGICK7=${{ matrix.enableFeatures }} -DENABLE_IMAGEMAGICK6=${{ matrix.enableFeatures }} -DENABLE_CHAFA=${{ matrix.enableFeatures }} -DENABLE_ZLIB=${{ matrix.enableFeatures }} -DENABLE_EGL=${{ matrix.enableFeatures }} -DENABLE_GLX=${{ matrix.enableFeatures }} -DENABLE_OSMESA=${{ matrix.enableFeatures }} -DENABLE_OPENCL=${{ matrix.enableFeatures }} -DENABLE_LIBNM=${{ matrix.enableFeatures }} -DENABLE_PULSE=${{ matrix.enableFeatures }} -DENABLE_JSONC=${{ matrix.enableFeatures }} .
+          CC: ${{ matrix.compiler.cc }}
+          CXX: ${{ matrix.compiler.cxx }}
+        run: cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_LIBPCI=${{ matrix.enableFeatures }} -DENABLE_VULKAN=${{ matrix.enableFeatures }} -DENABLE_WAYLAND=${{ matrix.enableFeatures }} -DENABLE_XCB_RANDR=${{ matrix.enableFeatures }} -DENABLE_XCB=${{ matrix.enableFeatures }} -DENABLE_XRANDR=${{ matrix.enableFeatures }} -DENABLE_X11=${{ matrix.enableFeatures }} -DENABLE_GIO=${{ matrix.enableFeatures }} -DENABLE_DCONF=${{ matrix.enableFeatures }} -DENABLE_DBUS=${{ matrix.enableFeatures }} -DENABLE_XFCONF=${{ matrix.enableFeatures }} -DENABLE_SQLITE3=${{ matrix.enableFeatures }} -DENABLE_RPM=${{ matrix.enableFeatures }} -DENABLE_IMAGEMAGICK7=${{ matrix.enableFeatures }} -DENABLE_IMAGEMAGICK6=${{ matrix.enableFeatures }} -DENABLE_CHAFA=${{ matrix.enableFeatures }} -DENABLE_ZLIB=${{ matrix.enableFeatures }} -DENABLE_EGL=${{ matrix.enableFeatures }} -DENABLE_GLX=${{ matrix.enableFeatures }} -DENABLE_OSMESA=${{ matrix.enableFeatures }} -DENABLE_OPENCL=${{ matrix.enableFeatures }} -DENABLE_LIBNM=${{ matrix.enableFeatures }} -DENABLE_PULSE=${{ matrix.enableFeatures }} -DENABLE_JSONC=${{ matrix.enableFeatures }} -DENABLE_DIRECTX_HEADERS=${{ matrix.enableFeatures }} .
 
       - name: build project
         run: cmake --build .
@@ -39,7 +44,7 @@ jobs:
         run: ctest
 
       - name: run fastfetch
-        run: ./fastfetch --disable-linewrap false --hide-cursor false --show-errors --no-buffer --load-config presets/all
+        run: ./fastfetch --stat --show-errors --no-buffer --load-config presets/all
 
       - name: run flashfetch
         run: ./flashfetch
@@ -54,10 +59,10 @@ jobs:
       ffversion: ${{ steps.ffversion.outputs.ffversion }}
     steps:
       - name: checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: install required packages
-        run: sudo apt-get update && sudo apt-get install -y libpci-dev libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev rpm librpm-dev libzstd-dev libegl-dev libglx-dev libosmesa6-dev ocl-icd-opencl-dev libnm-dev libpulse-dev
+        run: sudo apt-get update && sudo apt-get install -y libpci-dev libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev rpm librpm-dev libzstd-dev libegl-dev libglx-dev libosmesa6-dev ocl-icd-opencl-dev libnm-dev libpulse-dev directx-headers-dev
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2
@@ -77,11 +82,14 @@ jobs:
         run: ./fastfetch --list-features
 
       - name: run fastfetch
-        run: time ./fastfetch --disable-linewrap false --hide-cursor false --show-errors --no-buffer --load-config presets/all
+        run: time ./fastfetch -c presets/ci
 
       - name: run flashfetch
         run: time ./flashfetch
 
+      - name: print dependencies
+        run: ldd fastfetch
+
       - name: run tests
         run: ctest
 
@@ -103,7 +111,7 @@ jobs:
       contents: read
     steps:
       - name: checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: install required packages
         run: brew install vulkan-loader molten-vk imagemagick chafa
@@ -126,11 +134,14 @@ jobs:
         run: ./fastfetch --list-features
 
       - name: run fastfetch
-        run: time ./fastfetch --disable-linewrap false --hide-cursor false --show-errors --no-buffer --load-config presets/all
+        run: time ./fastfetch -c presets/ci
 
       - name: run flashfetch
         run: time ./flashfetch
 
+      - name: print dependencies
+        run: otool -L fastfetch
+
       - name: run tests
         run: ctest
 
@@ -148,7 +159,7 @@ jobs:
       contents: read
     steps:
       - name: checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: run VM
         uses: vmactions/freebsd-vm@v0
@@ -159,8 +170,9 @@ jobs:
             cmake -DSET_TWEAK=Off -DBUILD_TESTS=On .
             cmake --build . --target package
             ./fastfetch --list-features
-            time ./fastfetch --disable-linewrap false --hide-cursor false --show-errors --no-buffer --load-config presets/all
+            time ./fastfetch -c presets/ci
             time ./flashfetch
+            ldd fastfetch
             ctest
 
       - name: upload artifacts
@@ -180,7 +192,7 @@ jobs:
         shell: msys2 {0}
     steps:
       - name: checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: setup-msys2
         uses: msys2/setup-msys2@v2
@@ -213,11 +225,14 @@ jobs:
         run: ./fastfetch --list-features
 
       - name: run fastfetch
-        run: time ./fastfetch --disable-linewrap false --hide-cursor false --show-errors --no-buffer --load-config presets/all
+        run: time ./fastfetch -c presets/ci
 
       - name: run flashfetch
         run: time ./flashfetch
 
+      - name: print dependencies
+        run: ldd fastfetch
+
       - name: run tests
         run: ctest
 
@@ -244,7 +259,7 @@ jobs:
         shell: msys2 {0}
     steps:
       - name: checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: setup-msys2
         uses: msys2/setup-msys2@v2
@@ -274,11 +289,14 @@ jobs:
         run: cp /clang32/bin/{OpenCL,vulkan-1}.dll .
 
       - name: run fastfetch
-        run: time ./fastfetch --disable-linewrap false --hide-cursor false --show-errors --no-buffer --load-config presets/all
+        run: time ./fastfetch -c presets/ci
 
       - name: run flashfetch
         run: time ./flashfetch
 
+      - name: print dependencies
+        run: ldd fastfetch
+
       - name: run tests
         run: ctest
 

CHANGELOG.md

@@ -1,3 +1,57 @@
+# 2.1.0
+
+This release introduces a new output format: JSON result
+
+Changes:
+* Users module detects and prints user login time by default. Specifying `--users-compact` to disable it
+* Fastfetch now requires yyjson 0.8.0 or later, which is embeded in fastfetch source tree. If you build fastfetch with `-DENABLE_SYSTEM_YYJSON` cmake option, you must upgrade your yyjson package
+* Reduced information supported by `--terminal-format`, `--shell-format`
+* Some config presets (`devinfo` and `verbose`) are obseleted and removed. They are barely maintained and can be replaced with `--format json` now.
+* Custom strings in `--module-key` and `--module-format` are no longer trimmed.
+* `/boot` is hidden by default (FreeBSD, Disk)
+
+Features:
+* Add `--format json`, which prints system information as JSON format
+* Add fast path for xfce4 version detection (DE, FreeBSD)
+* Support contour terminal version and font detection (Terminal / TerminalFont)
+* Support `kitty-direct` / `iterm` without specifying logo width / height. Note: in this case, the entre screen will be cleared.
+* Support new flag `--logo-separate`. If true, print modules at bottom of the logo
+* Support Apple Silicon CPU frequency detection (CPU, macOS)
+* Support user login time detection (Users)
+* Support winget package manager detection, guarded behind `--allow-slow-operations` (Packages, Windows)
+* Print monitor type (built-in or external) (Display)
+* Support full GPU detection in WSL (Linux, GPU)
+* Add `--module-key " "` as a special case for hiding keys
+* Support `--title-format`. See `fastfetch --help title-format` for detail
+* Support `--colors-key` (Colors)
+* Add `-c` as a shortcut of `--load-config`. Note it was used as the shortcut of `--color` before 2.0.5
+* Support Windows Service Pack version detection (Kernel, Windows)
+* Support Debian point releases detection (OS, Linux)
+* Add new module `NetIO` which prints network throughput (usage) of specified interface. Note this module costs about 1 second to finish.
+* Use `lscpu` to detect CPU name for ARM CPUs (CPU, Linux)
+
+Bugfixes:
+* Fix fastfetch hanging in specific environment (#561)
+* Fix short read when reading from stdin (Logo)
+* Fix `poll() timeout or failed` error when image is very large (Logo)
+* Fix Termux Monet terminal version detection (Terminal)
+* Fix zpool volumes detection (Disk, Linux)
+* Fix external volumes detection (Disk, Linux)
+* Fix snap package number detection on systems other than Ubuntu (Packages, Linux)
+* Fix dpkg / apt package number detection (Packages, Linux)
+* Fix bluetooth mac address detection (Bluetooth, Windows)
+
+Logo:
+* Add Afterglow
+* Add Elbrus
+* Update EvolutionOS
+* Update AOSC OS
+* Update Ubuntu_old
+* Update Windows 11_small
+* Add Amazon Linux
+* Add LainOS
+* Fix colors of Slackware
+
 # 2.0.5
 
 Bugfixes:
@@ -11,7 +65,7 @@ Features:
 # 2.0.4
 
 Bugfixes:
-* Fix building on 32-bit FreeBSD (Memory, BSD)
+* Fix building on 32-bit FreeBSD (Memory, FreeBSD)
 * Fix `--file-raw` doesn't work (Logo)
 
 Features:

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.5
+    VERSION 2.1.0
     LANGUAGES C
     DESCRIPTION "Fast system information tool"
     HOMEPAGE_URL "https://github.com/fastfetch-cli/fastfetch"
@@ -67,6 +67,7 @@ cmake_dependent_option(ENABLE_LIBNM "Enable libnm" ON "LINUX" OFF)
 cmake_dependent_option(ENABLE_FREETYPE "Enable freetype" ON "ANDROID" OFF)
 cmake_dependent_option(ENABLE_PULSE "Enable pulse" ON "LINUX OR BSD" OFF)
 cmake_dependent_option(ENABLE_DDCUTIL "Enable ddcutil" ON "LINUX" OFF)
+cmake_dependent_option(ENABLE_DIRECTX_HEADERS "Enable DirectX headers for WSL" ON "LINUX" OFF)
 cmake_dependent_option(ENABLE_THREADS "Enable multithreading" ON "Threads_FOUND" OFF)
 cmake_dependent_option(ENABLE_PCI_MEMORY "Enable detecting GPU memory size with libpci" OFF "LINUX OR BSD" OFF)
 cmake_dependent_option(ENABLE_SYSTEM_YYJSON "Use system provided (instead of fastfetch embeded) yyjson library" OFF "LINUX OR APPLE OR BSD OR WIN32 OR ANDROID" OFF)
@@ -98,10 +99,13 @@ set(WARNING_FLAGS "-Wall -Wextra -Wconversion -Werror=uninitialized -Werror=retu
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS} -Werror=incompatible-pointer-types -Werror=implicit-function-declaration")
 
-if(WIN32)
+if(WIN32 OR ENABLE_DIRECTX_HEADERS)
     enable_language(CXX)
     set(CMAKE_CXX_STANDARD 17)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS} -fno-exceptions -fno-rtti")
+endif()
+
+if(WIN32)
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--tsaware -Wl,--build-id -Wl,--subsystem,console:6.1,--major-os-version,6,--minor-os-version,1")
 endif()
 
@@ -112,8 +116,8 @@ if(APPLE AND DEFINED ENV{HOMEBREW_PREFIX})
 endif()
 
 set(FASTFETCH_FLAGS_DEBUG "-fno-omit-frame-pointer")
-if(NOT WIN32)
-    set(FASTFETCH_FLAGS_DEBUG "${FASTFETCH_FLAGS_DEBUG} -fsanitize=address -fsanitize=undefined")
+if(NOT WIN32 AND NOT APPLE)
+    set(FASTFETCH_FLAGS_DEBUG "${FASTFETCH_FLAGS_DEBUG} -fsanitize=address")
 endif()
 set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${FASTFETCH_FLAGS_DEBUG}")
 set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} ${FASTFETCH_FLAGS_DEBUG}")
@@ -121,8 +125,8 @@ if(NOT WIN32)
     set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -rdynamic")
 endif()
 
-
 if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
+    message(STATUS "Enabling LTO")
     include(CheckIPOSupported)
     check_ipo_supported(RESULT IPO_SUPPORTED)
     if(IPO_SUPPORTED)
@@ -259,6 +263,7 @@ set(LIBFASTFETCH_SRC
     src/common/jsonconfig.c
     src/common/library.c
     src/common/modules.c
+    src/common/netif/netif.c
     src/common/option.c
     src/common/parsing.c
     src/common/printing.c
@@ -267,20 +272,22 @@ set(LIBFASTFETCH_SRC
     src/detection/chassis/chassis.c
     src/detection/cpu/cpu.c
     src/detection/cpuusage/cpuusage.c
-    src/detection/datetime/datetime.c
     src/detection/disk/disk.c
     src/detection/displayserver/displayserver.c
     src/detection/font/font.c
     src/detection/gpu/gpu.c
     src/detection/locale/locale.c
     src/detection/media/media.c
+    src/detection/netio/netio.c
     src/detection/opencl/opencl.c
     src/detection/os/os.c
     src/detection/packages/packages.c
+    src/detection/publicip/publicip.c
     src/detection/terminalfont/terminalfont.c
     src/detection/terminalshell/terminalshell.c
     src/detection/version/version.c
     src/detection/vulkan/vulkan.c
+    src/detection/weather/weather.c
     src/logo/builtin.c
     src/logo/image/im6.c
     src/logo/image/im7.c
@@ -314,6 +321,7 @@ set(LIBFASTFETCH_SRC
     src/modules/localip/localip.c
     src/modules/memory/memory.c
     src/modules/monitor/monitor.c
+    src/modules/netio/netio.c
     src/modules/opencl/opencl.c
     src/modules/opengl/opengl.c
     src/modules/os/os.c
@@ -354,6 +362,7 @@ if(LINUX)
     list(APPEND LIBFASTFETCH_SRC
         src/common/dbus.c
         src/common/io/io_unix.c
+        src/common/netif/netif_linux.c
         src/common/networking_linux.c
         src/common/processing_linux.c
         src/detection/battery/battery_linux.c
@@ -382,6 +391,7 @@ if(LINUX)
         src/detection/media/media_linux.c
         src/detection/memory/memory_linux.c
         src/detection/monitor/monitor_linux.c
+        src/detection/netio/netio_linux.c
         src/detection/opengl/opengl_linux.c
         src/detection/os/os_linux.c
         src/detection/packages/packages_linux.c
@@ -405,6 +415,7 @@ if(LINUX)
 elseif(ANDROID)
     list(APPEND LIBFASTFETCH_SRC
         src/common/io/io_unix.c
+        src/common/netif/netif_linux.c
         src/common/networking_linux.c
         src/common/processing_linux.c
         src/detection/battery/battery_android.c
@@ -428,6 +439,7 @@ elseif(ANDROID)
         src/detection/media/media_nosupport.c
         src/detection/memory/memory_linux.c
         src/detection/monitor/monitor_nosupport.c
+        src/detection/netio/netio_linux.c
         src/detection/opengl/opengl_linux.c
         src/detection/os/os_android.c
         src/detection/packages/packages_linux.c
@@ -451,6 +463,7 @@ elseif(BSD)
     list(APPEND LIBFASTFETCH_SRC
         src/common/dbus.c
         src/common/io/io_unix.c
+        src/common/netif/netif_bsd.c
         src/common/networking_linux.c
         src/common/processing_linux.c
         src/common/sysctl.c
@@ -480,6 +493,7 @@ elseif(BSD)
         src/detection/media/media_linux.c
         src/detection/memory/memory_bsd.c
         src/detection/monitor/monitor_nosupport.c
+        src/detection/netio/netio_bsd.c
         src/detection/opengl/opengl_linux.c
         src/detection/os/os_linux.c
         src/detection/packages/packages_linux.c
@@ -503,6 +517,7 @@ elseif(BSD)
 elseif(APPLE)
     list(APPEND LIBFASTFETCH_SRC
         src/common/io/io_unix.c
+        src/common/netif/netif_bsd.c
         src/common/networking_linux.c
         src/common/processing_linux.c
         src/common/sysctl.c
@@ -515,7 +530,6 @@ elseif(APPLE)
         src/detection/cpu/cpu_apple.c
         src/detection/cpuusage/cpuusage_apple.c
         src/detection/cursor/cursor_apple.m
-        src/detection/disk/disk_apple.m
         src/detection/disk/disk_bsd.c
         src/detection/displayserver/displayserver_apple.c
         src/detection/font/font_apple.m
@@ -528,6 +542,7 @@ elseif(APPLE)
         src/detection/media/media_apple.m
         src/detection/memory/memory_apple.c
         src/detection/monitor/monitor_apple.m
+        src/detection/netio/netio_bsd.c
         src/detection/opengl/opengl_apple.c
         src/detection/os/os_apple.m
         src/detection/packages/packages_apple.c
@@ -552,6 +567,7 @@ elseif(APPLE)
 elseif(WIN32)
     list(APPEND LIBFASTFETCH_SRC
         src/common/io/io_windows.c
+        src/common/netif/netif_windows.c
         src/common/networking_windows.c
         src/common/processing_windows.c
         src/detection/battery/battery_windows.c
@@ -575,6 +591,7 @@ elseif(WIN32)
         src/detection/media/media_nosupport.c
         src/detection/memory/memory_windows.c
         src/detection/monitor/monitor_windows.c
+        src/detection/netio/netio_windows.c
         src/detection/opengl/opengl_windows.c
         src/detection/os/os_windows.cpp
         src/detection/packages/packages_windows.c
@@ -601,6 +618,11 @@ elseif(WIN32)
     )
 endif()
 
+if(ENABLE_DIRECTX_HEADERS)
+    message(STATUS "Enabling DirectX headers for WSL")
+    list(APPEND LIBFASTFETCH_SRC src/detection/gpu/gpu_wsl.cpp)
+endif()
+
 include(CheckFunctionExists)
 check_function_exists(wcwidth HAVE_WCWIDTH)
 if(NOT HAVE_WCWIDTH)
@@ -623,14 +645,17 @@ endif()
 add_library(libfastfetch OBJECT
     ${LIBFASTFETCH_SRC}
 )
+
 if(yyjson_FOUND)
     target_compile_definitions(libfastfetch PRIVATE FF_USE_SYSTEM_YYJSON)
     target_link_libraries(libfastfetch PRIVATE yyjson)
 endif()
 
-target_compile_definitions(libfastfetch PUBLIC _GNU_SOURCE _XOPEN_SOURCE)
+target_compile_definitions(libfastfetch PUBLIC _GNU_SOURCE _XOPEN_SOURCE __STDC_WANT_LIB_EXT1__=1)
 if(WIN32)
     target_compile_definitions(libfastfetch PUBLIC WIN32_LEAN_AND_MEAN=1)
+elseif(APPLE)
+    target_compile_definitions(libfastfetch PUBLIC _DARWIN_C_SOURCE)
 endif()
 
 if(HAVE_WCWIDTH)
@@ -773,6 +798,10 @@ ff_lib_enable(DDCUTIL
     "ddcutil"
     "Ddcutil"
 )
+ff_lib_enable(DIRECTX_HEADERS
+    "DirectX-Headers"
+    "DirectX-Headers"
+)
 
 if(ENABLE_THREADS)
     target_compile_definitions(libfastfetch PRIVATE FF_HAVE_THREADS)
@@ -877,6 +906,12 @@ target_link_libraries(flashfetch
     PRIVATE libfastfetch
 )
 
+# Prevent fastfetch from linking to libstdc++
+set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
+set(CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "")
+set_target_properties(fastfetch PROPERTIES LINKER_LANGUAGE C)
+set_target_properties(flashfetch PROPERTIES LINKER_LANGUAGE C)
+
 if(WIN32)
     set(TARGET_NAME fastfetch)
     target_sources(fastfetch

README.md

@@ -71,6 +71,7 @@ The following libraries are used if present at runtime:
 * [`libnm`](https://networkmanager.dev/docs/libnm/latest/): Used for Wifi detection.
 * [`libpulse`](https://freedesktop.org/software/pulseaudio/doxygen/): Used for Sound detection.
 * [`libddcutil`](https://github.com/rockowitz/ddcutil): Used for brightness detection of external displays
+* [`DirectX-Headers`](https://github.com/microsoft/DirectX-Headers): Used for GPU detection in WSL
 
 ### macOS
 
@@ -91,7 +92,7 @@ For the image logo, iTerm with iterm image protocol should work. Apple Terminal
 
 Note: In Windows 7, 8 and 8.1, [ConEmu](https://conemu.github.io/en/AnsiEscapeCodes.html) is required to run fastfetch due to [the lack of ASCII escape code native support](https://en.wikipedia.org/wiki/ANSI_escape_code#DOS,_OS/2,_and_Windows). In addition, as fastfetch for Windows targets [UCRT](https://learn.microsoft.com/en-us/cpp/windows/universal-crt-deployment) C runtime library, [it must be installed manually](https://support.microsoft.com/en-us/topic/update-for-universal-c-runtime-in-windows-c0514201-7fe6-95a3-b0a5-287930f3560c) as UCRT is only pre-installed in Windows 10 and later.
 
-For the image logo, only chafa is supported due to [a design flaw of ConPTY](https://github.com/microsoft/terminal/issues/1173). In addition, chafa support is not included by default due to the massive dependencies of imagemagick. You must built it yourself.
+For the image logo, WezTerm with iterm image protocol is known to work, surprisingly.
 
 ### Android
 
@@ -100,19 +101,21 @@ For the image logo, only chafa is supported due to [a design flaw of ConPTY](htt
 * [`termux-api`](https://github.com/termux/termux-api-package): Used for Wifi / Battery detection. Read [the official doc](https://wiki.termux.com/wiki/Termux:API) for detail or if you hang on these modules (IMPORTANT). [`termux-api`](https://github.com/termux/termux-packages/tree/master/packages/termux-api)
 * [`libandroid-wordexp-static`](https://github.com/termux/termux-packages/tree/master/packages/libandroid-wordexp): `wordexp.h` support for Android.
 
+For the image logo, [Termux Monet](https://github.com/HardcodedCat/termux-monet) supports iterm image protocol.
+
 ## Support status
 All categories not listed here should work without needing a specific implementation.
 
 ##### Available Modules
 ```
-Battery, Bios, Bluetooth, Board, Break, Brightness, Colors, Command, CPU, CPUUsage, Cursor, Custom, Date, DateTime, DE, Disk, Display, Font, Gamepad, GPU, Host, Icons, Kernel, LM, Locale, LocalIP, Media, Memory, Monitor, OpenCL, OpenGL, OS, Packages, Player, Power Adapter, Processes, PublicIP, Separator, Shell, Sound, Swap, Terminal, Terminal Font, Terminal Size, Theme, Time, Title, Uptime, Version, Vulkan, Wallpaper, Weather, Wifi, WM, WMTheme
+Battery, Bios, Bluetooth, Board, Break, Brightness, Colors, Command, CPU, CPUUsage, Cursor, Custom, Date, DateTime, DE, Disk, Display, Font, Gamepad, GPU, Host, Icons, Kernel, LM, Locale, LocalIP, Media, Memory, Monitor, NetIO, OpenCL, OpenGL, OS, Packages, Player, Power Adapter, Processes, PublicIP, Separator, Shell, Sound, Swap, Terminal, Terminal Font, Terminal Size, Theme, Time, Title, Uptime, Version, Vulkan, Wallpaper, Weather, Wifi, WM, WMTheme
 ```
 
 ##### Builtin logos
 
 <!-- `Content of src/logo/builtin.c`.split('\n').map(x => x.trim()).filter(x => x.startsWith('// ')).map(x => x.slice(3)).filter(x => x != 'LAST').sort((a, b)=>a.toUpperCase().localeCompare(b.toUpperCase())).join(', ') -->
 ```
-AerOS, AIX, AlmaLinux, Alpine, Alpine2Small, AlpineSmall, Alter, Amazon, AmogOS, Anarchy, Android, AndroidSmall, Antergos, Antix, AoscOS, AoscOsRetro, AoscOsRetro_small, Aperture, Apple, AppleSmall, Apricity, Arch, Arch2, ArchBox, Archcraft, Archcraft2, Archlabs, ArchSmall, ArchStrike, ArcoLinux, ArcoLinuxSmall, ArseLinux, Artix, Artix2Small, ArtixSmall, Arya, Asahi, Aster, AsteroidOS, AstOS, Astra, Ataraxia, Athena, Bedrock, BigLinux, Bitrig, BlackArch, BlackPanther, BLAG, BlankOn, BlueLight, Bodhi, Bonsai, BSD, BunsenLabs, CachyOS, CachyOSSmall, Calculate, CalinixOS, CalinixOSSmall, Carbs, CBL-Mariner, CelOS, Center, CentOS, CentOSSmall, Chakra, ChaletOS, Chapeau, ChonkySealOS, Chrom, Cleanjaro, CleanjaroSmall, ClearLinux, ClearOS, Clover, Cobalt, Condres, ContainerLinux, CRUX, CRUXSmall, CrystalLinux, Cucumber, CutefishOS, CuteOS, CyberOS, Dahlia, DarkOS, Debian, DebianSmall, Deepin, DesaOS, Devuan, DevuanSmall, DietPi, DracOS, DragonFly, DragonFlyOld, DragonFlySmall, Drauger, Droidian, Elementary, ElementarySmall, Elive, EncryptOS, Endeavour, Endless, Enso, EuroLinux, EvolutionOS, Exherbo, ExodiaPredator, Fedora, FedoraOld, FedoraSmall, FemboyOS, Feren, Finnix, Floflis, FreeBSD, FreeBSDSmall, FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, GarudaDragon, GarudaSmall, Gentoo, GentooSmall, GhostBSD, Glaucus, GNewSense, Gnome, GNU, GoboLinux, GrapheneOS, Grombyang, Guix, GuixSmall, Haiku, HaikuSmall, HamoniKR, HarDClanZ, HardenedBSD, Hash, Huayra, Hybrid, HydroOS, Hyperbola, HyperbolaSmall, Iglunix, InstantOS, IRIX, Itc, Januslinux, Kaisen, Kali, KaliSmall, KaOS, KDENeon, Kibojoe, KISSLinux, Kogaion, Korora, KrassOS, KSLinux, Kubuntu, LangitKetujuh, Laxeros, LEDE, LibreELEC, Linspire, Linux, LinuxLight, LinuxLightSmall, LinuxMint, LinuxMintOld, LinuxMintSmall, LinuxSmall, Live_Raizo, LMDE, Lunar, MacOS, MacOS2, MacOS2Small, MacOSSmall, Mageia, MageiaSmall, MagpieOS, Mandriva, Manjaro, ManjaroSmall, MassOS, MatuusOS, MaUI, Meowix, Mer, Minix, Mint, MintOld, MintSmall, MiracleLinux, MOS, Msys2, MX, MXSmall, Namib, Nekos, Neptune, NetBSD, NetRunner, Nitrux, NixOS, NixOS_small, NixOsOld, NixOsSmall, Nobara, NomadBSD, Nurunner, NuTyX, Obarun, OBRevenge, OmniOS, OpenBSD, OpenBSDSmall, OpenEuler, OpenIndiana, OpenKylin, OpenMamba, OpenMandriva, OpenStage, OpenSuse, OpenSuseLeap, OpenSuseSmall, OpenSuseTumbleweed, OpenWrt, OPNsense, Oracle, Orchid, OrchidSmall, OS_Elbrus, OSMC, OSX, OSXSmall, PacBSD, Panwah, Parabola, ParabolaSmall, Parch, Pardus, Parrot, Parsix, PCBSD, PCLinuxOS, PearOS, Pengwin, Pentoo, Peppermint, PhyOS, Pisi, PNMLinux, Pop, PopSmall, Porteus, PostMarketOS, PostMarketOSSmall, Proxmox, PuffOS, Puppy, PureOS, PureOSSmall, Q4OS, Qubes, Qubyt, Quibian, Radix, Raspbian, RaspbianSmall, RavynOS, Reborn, RebornSmall, RedCore, RedHatEnterpriseLinux, RedHatEnterpriseLinux_old, RedstarOS, Refracted Devuan, Regata, Regolith, RhaymOS, RockyLinux, RockyLinuxSmall, RosaLinux, Sabayon, Sabotage, Sailfish, SalentOS, SalientOS, Salix, SambaBOX, Sasanqua, Scientific, Semc, Septor, Serene, SharkLinux, ShastraOS, Siduction, SkiffOS, Slackel, Slackware, SlackwareSmall, Slitaz, SmartOS, Soda, Solaris, SolarisSmall, Solus, SourceMage, Sparky, Star, SteamOS, StockLinux, Sulin, Suse, SuseSmall, Swagarch, T2, Tails, TeArch, TorizonCore, Trisquel, TuxedoOS, Twister, Ubuntu, Ubuntu2Old, Ubuntu2Small, UbuntuBudgie, UbuntuCinnamon, UbuntuGnome, UbuntuKde, UbuntuKylin, UbuntuMate, UbuntuOld, UbuntuSmall, UbuntuStudio, UbuntuSway, UbuntuTouch, UbuntuUnity, Ultramarine, Univalent, Univention, UOS, UrukOS, Uwuntu, Vanilla, Venom, Vnux, Void, VoidSmall, Vzlinux, WiiLinuxNgx, Windows, Windows11, Windows11Small, Windows8, Windows95, Xferience, YiffOS, Zorin
+AerOS, Afterglow, AIX, AlmaLinux, Alpine, Alpine2Small, AlpineSmall, Alter, Amazon, AmazonLinux, AmogOS, Anarchy, Android, AndroidSmall, Antergos, Antix, AoscOS, AoscOS_old, AoscOsRetro, AoscOsRetro_small, Aperture, Apple, AppleSmall, Apricity, Arch, Arch2, ArchBox, Archcraft, Archcraft2, Archlabs, ArchSmall, ArchStrike, ArcoLinux, ArcoLinuxSmall, ArseLinux, Artix, Artix2Small, ArtixSmall, Arya, Asahi, Aster, AsteroidOS, AstOS, Astra, Ataraxia, Athena, Bedrock, BigLinux, Bitrig, BlackArch, BlackPanther, BLAG, BlankOn, BlueLight, Bodhi, Bonsai, BSD, BunsenLabs, CachyOS, CachyOSSmall, Calculate, CalinixOS, CalinixOSSmall, Carbs, CBL-Mariner, CelOS, Center, CentOS, CentOSSmall, Chakra, ChaletOS, Chapeau, ChonkySealOS, Chrom, Cleanjaro, CleanjaroSmall, ClearLinux, ClearOS, Clover, Cobalt, Condres, ContainerLinux, CRUX, CRUXSmall, CrystalLinux, Cucumber, CutefishOS, CuteOS, CyberOS, Dahlia, DarkOS, Debian, DebianSmall, Deepin, DesaOS, Devuan, DevuanSmall, DietPi, DracOS, DragonFly, DragonFlyOld, DragonFlySmall, Drauger, Droidian, Elbrus, Elementary, ElementarySmall, Elive, EncryptOS, Endeavour, Endless, Enso, EuroLinux, EvolutionOS, EvolutionOS_old, EvolutionOSSmall, Exherbo, ExodiaPredator, Fedora, FedoraOld, FedoraSmall, FemboyOS, Feren, Finnix, Floflis, FreeBSD, FreeBSDSmall, FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, GarudaDragon, GarudaSmall, Gentoo, GentooSmall, GhostBSD, Glaucus, GNewSense, Gnome, GNU, GoboLinux, GrapheneOS, Grombyang, Guix, GuixSmall, Haiku, HaikuSmall, HamoniKR, HarDClanZ, HardenedBSD, Hash, Huayra, Hybrid, HydroOS, Hyperbola, HyperbolaSmall, Iglunix, InstantOS, IRIX, Itc, Januslinux, Kaisen, Kali, KaliSmall, KaOS, KDENeon, Kibojoe, KISSLinux, Kogaion, Korora, KrassOS, KSLinux, Kubuntu, LangitKetujuh, Laxeros, LEDE, LibreELEC, Linspire, Linux, LinuxLight, LinuxLightSmall, LinuxMint, LinuxMintOld, LinuxMintSmall, LinuxSmall, Live_Raizo, LMDE, Lunar, MacOS, MacOS2, MacOS2Small, MacOSSmall, Mageia, MageiaSmall, MagpieOS, Mandriva, Manjaro, ManjaroSmall, MassOS, MatuusOS, MaUI, Meowix, Mer, Minix, Mint, MintOld, MintSmall, MiracleLinux, MOS, Msys2, MX, MXSmall, Namib, Nekos, Neptune, NetBSD, NetRunner, Nitrux, NixOS, NixOS_small, NixOsOld, NixOsSmall, Nobara, NomadBSD, Nurunner, NuTyX, Obarun, OBRevenge, OmniOS, OpenBSD, OpenBSDSmall, OpenEuler, OpenIndiana, OpenKylin, OpenMamba, OpenMandriva, OpenStage, OpenSuse, OpenSuseLeap, OpenSuseSmall, OpenSuseTumbleweed, OpenWrt, OPNsense, Oracle, Orchid, OrchidSmall, OS_Elbrus, OSMC, OSX, OSXSmall, PacBSD, Panwah, Parabola, ParabolaSmall, Parch, Pardus, Parrot, Parsix, PCBSD, PCLinuxOS, PearOS, Pengwin, Pentoo, Peppermint, PhyOS, Pisi, PNMLinux, Pop, PopSmall, Porteus, PostMarketOS, PostMarketOSSmall, Proxmox, PuffOS, Puppy, PureOS, PureOSSmall, Q4OS, Qubes, Qubyt, Quibian, Radix, Raspbian, RaspbianSmall, RavynOS, Reborn, RebornSmall, RedCore, RedHatEnterpriseLinux, RedHatEnterpriseLinux_old, RedstarOS, Refracted Devuan, Regata, Regolith, RhaymOS, RockyLinux, RockyLinuxSmall, RosaLinux, Sabayon, Sabotage, Sailfish, SalentOS, SalientOS, Salix, SambaBOX, Sasanqua, Scientific, Semc, Septor, Serene, SharkLinux, ShastraOS, Siduction, SkiffOS, Slackel, Slackware, SlackwareSmall, Slitaz, SmartOS, Soda, Solaris, SolarisSmall, Solus, SourceMage, Sparky, Star, SteamOS, StockLinux, Sulin, Suse, SuseSmall, Swagarch, T2, Tails, TeArch, TorizonCore, Trisquel, TuxedoOS, Twister, Ubuntu, Ubuntu2Old, Ubuntu2Small, UbuntuBudgie, UbuntuCinnamon, UbuntuGnome, UbuntuKde, UbuntuKylin, UbuntuMate, UbuntuOld, UbuntuSmall, UbuntuStudio, UbuntuSway, UbuntuTouch, UbuntuUnity, Ultramarine, Univalent, Univention, UOS, UrukOS, Uwuntu, Vanilla, Venom, VenomSmall, Vnux, Void, VoidSmall, Vzlinux, WiiLinuxNgx, Windows, Windows11, Windows11Small, Windows8, Windows95, Xferience, YiffOS, Zorin
 ```
 
 Run `fastfetch --print-logos` to print them

completions/bash

@@ -24,7 +24,7 @@ __fastfetch_complete_help()
         "terminal-format"
         "terminalfont-format"
         "cpu-format"
-        "cpu-usage-format"
+        "cpuusage-format"
         "gpu-format"
         "memory-format"
         "swap-format"

doc/json_schema.json

@@ -166,6 +166,11 @@
                             "title": "If true, regenerate image logo cache",
                             "default": false
                         },
+                        "separate": {
+                            "type": "boolean",
+                            "title": "If true, print modules at bottom of the logo",
+                            "default": false
+                        },
                         "chafa": {
                             "type": "object",
                             "title": "Chafa configuration. See chafa document for details",
@@ -269,6 +274,11 @@
                     "type": "integer",
                     "title": "Set the timeout (ms) for WMI queries, `-1` for no timeout. Windows only",
                     "default": 5000
+                },
+                "processingTimeout": {
+                    "type": "integer",
+                    "title": "Set the timeout (ms) when waiting for child processes, `-1` for no timeout",
+                    "default": 1000
                 }
             },
             "additionalProperties": false
@@ -548,6 +558,7 @@
                             "media",
                             "memory",
                             "monitor",
+                            "netio",
                             "opencl",
                             "opengl",
                             "os",
@@ -989,7 +1000,37 @@
                                         "title": "Show IPs with given name prefix only",
                                         "type": "string"
                                     },
-                                    "showDefaultRouteOnly": {
+                                    "defaultRouteOnly": {
+                                        "title": "Show ips that are used for default routing only",
+                                        "type": "boolean",
+                                        "default": false
+                                    },
+                                    "key": {
+                                        "$ref": "#/$defs/key"
+                                    },
+                                    "keyColor": {
+                                        "$ref": "#/$defs/keyColor"
+                                    },
+                                    "keyWidth": {
+                                        "$ref": "#/$defs/keyWidth"
+                                    },
+                                    "format": {
+                                        "$ref": "#/$defs/format"
+                                    }
+                                },
+                                "additionalProperties": false
+                            },
+                            {
+                                "title": "Network throughput (usage)",
+                                "properties": {
+                                    "type": {
+                                        "const": "netio"
+                                    },
+                                    "namePrefix": {
+                                        "title": "Show IPs with given name prefix only",
+                                        "type": "string"
+                                    },
+                                    "defaultRouteOnly": {
                                         "title": "Show ips that are used for default routing only",
                                         "type": "boolean",
                                         "default": false

presets/all

@@ -1 +1 @@
---structure Title:Separator:OS:Host:Bios:Board:Chassis:Kernel:Uptime:Processes:Packages:Shell:Display:Brightness:Monitor:LM:DE:WM:WMTheme:Theme:Icons:Font:Cursor:Wallpaper:Terminal:TerminalFont:TerminalSize:CPU:CPUUsage:GPU:Memory:Swap:Disk:Battery:PowerAdapter:Player:Media:PublicIP:LocalIP:Wifi:DateTime:Locale:Vulkan:OpenGL:OpenCL:Users:Bluetooth:Sound:Gamepad:Weather:Version:Break:Colors
+--structure Title:Separator:OS:Host:Bios:Board:Chassis:Kernel:Uptime:Processes:Packages:Shell:Display:Brightness:Monitor:LM:DE:WM:WMTheme:Theme:Icons:Font:Cursor:Wallpaper:Terminal:TerminalFont:TerminalSize:CPU:CPUUsage:GPU:Memory:Swap:Disk:Battery:PowerAdapter:Player:Media:PublicIP:LocalIP:Wifi:DateTime:Locale:Vulkan:OpenGL:OpenCL:Users:Bluetooth:Sound:Gamepad:Weather:NetIO:Version:Break:Colors

presets/all.jsonc

@@ -51,6 +51,7 @@
         "sound",
         "gamepad",
         "weather",
+        "netio",
         "version",
         "break",
         "colors"

presets/ci

@@ -0,0 +1,7 @@
+-c all
+--pipe
+--show-errors
+--no-buffer
+--publicip-timeout 1000
+--weather-timeout 1000
+--stat

presets/devinfo

@@ -1,3 +0,0 @@
---disable-linewrap false
---multithreading false
---show-errors

presets/devinfo-verbose

@@ -1,3 +0,0 @@
---load-config devinfo
---load-config all
---load-config verbose

presets/devinfo.jsonc

@@ -1,49 +0,0 @@
-{
-    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
-    "logo": {
-        "type": "builtin",
-        "source": "arch"
-    },
-    "display": {
-        "disableLinewrap": false,
-        "showErrors": true
-    },
-    "general": {
-        "multithreading": false
-    },
-    "modules": [
-        "title",
-        "separator",
-        {
-            "type": "os",
-            "format": "Arch Linux ({12})"
-        },
-        "host",
-        "kernel",
-        "uptime",
-        {
-            "type": "packages",
-            "format": "{} (pacman)"
-        },
-        "shell",
-        "display",
-        "de",
-        "wm",
-        "wmtheme",
-        "theme",
-        "icons",
-        "font",
-        "cursor",
-        "terminal",
-        "terminalfont",
-        "cpu",
-        "gpu",
-        "memory",
-        "disk",
-        "battery",
-        "poweradapter",
-        "locale",
-        "break",
-        "colors"
-    ]
-}

presets/examples/10.jsonc

@@ -0,0 +1,150 @@
+// Load with --load-config examples/2.jsonc
+// Note that you must replace the image path to an existing image to display it.
+
+{
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "logo": {
+        "padding": {
+            "top": 2
+        }
+    },
+    "display": {
+        "separator": " -> "
+    },
+    "modules": [
+        {
+            "type": "custom",
+            "format": "\u001b[90m┌────────────────────────────────────────────────────────────┐"
+        },
+        {
+            "type": "title",
+            "keyWidth": 10
+        },
+        {
+            "type": "custom",
+            "format": "\u001b[90m└────────────────────────────────────────────────────────────┘"
+        },
+        {
+            "type": "custom",
+            "format": " \u001b[90m  \u001b[31m  \u001b[32m  \u001b[33m  \u001b[34m  \u001b[35m  \u001b[36m  \u001b[37m  \u001b[38m  \u001b[39m       \u001b[38m  \u001b[37m  \u001b[36m  \u001b[35m  \u001b[34m  \u001b[33m  \u001b[32m  \u001b[31m  \u001b[90m"
+        },
+        {
+            "type": "custom",
+            "format": "\u001b[90m┌────────────────────────────────────────────────────────────┐"
+        },
+        {
+            "type": "os",
+            "key": " OS",
+            "keyColor": "yellow"
+        },
+        {
+            "type": "kernel",
+            "key": "│ ├",
+            "keyColor": "yellow"
+        },
+        {
+            "type": "packages",
+            "key": "│ ├󰏖",
+            "keyColor": "yellow"
+        },
+        {
+            "type": "shell",
+            "key": "│ └",
+            "keyColor": "yellow"
+        },
+        {
+            "type": "wm",
+            "key": " DE/WM",
+            "keyColor": "blue"
+        },
+        {
+            "type": "lm",
+            "key": "│ ├󰧨",
+            "keyColor": "blue"
+        },
+        {
+            "type": "wmtheme",
+            "key": "│ ├󰉼",
+            "keyColor": "blue"
+        },
+        {
+            "type": "icons",
+            "key": "│ ├󰀻",
+            "keyColor": "blue"
+        },
+        {
+            "type": "terminal",
+            "key": "│ ├",
+            "keyColor": "blue"
+        },
+        {
+            "type": "wallpaper",
+            "key": "│ └󰸉",
+            "keyColor": "blue"
+        },
+        {
+            "type": "host",
+            "key": " PC",
+            "keyColor": "green"
+        },
+        {
+            "type": "cpu",
+            "key": "│ ├",
+            "keyColor": "green"
+        },
+        {
+            "type": "gpu",
+            "key": "│ ├﬙",
+            "keyColor": "green"
+        },
+        {
+            "type": "disk",
+            "key": "│ ├",
+            "keyColor": "green"
+        },
+        {
+            "type": "memory",
+            "key": "│ ├󰑭",
+            "keyColor": "green"
+        },
+        {
+            "type": "swap",
+            "key": "│ ├󰓡",
+            "keyColor": "green"
+        },
+        {
+            "type": "uptime",
+            "key": "│ ├󰅐",
+            "keyColor": "green"
+        },
+        {
+            "type": "display",
+            "key": "│ └󰍹",
+            "keyColor": "green"
+        },
+        {
+            "type": "sound",
+            "key": " SND",
+            "keyColor": "cyan"
+        },
+        {
+            "type": "player",
+            "key": "│ ├󰥠",
+            "keyColor": "cyan"
+        },
+        {
+            "type": "media",
+            "key": "│ └󰝚",
+            "keyColor": "cyan"
+        },
+        {
+            "type": "custom",
+            "format": "\u001b[90m└────────────────────────────────────────────────────────────┘"
+        },
+        "break",
+        {
+            "type": "custom",
+            "format": " \u001b[90m  \u001b[31m  \u001b[32m  \u001b[33m  \u001b[34m  \u001b[35m  \u001b[36m  \u001b[37m  \u001b[38m  \u001b[39m       \u001b[38m  \u001b[37m  \u001b[36m  \u001b[35m  \u001b[34m  \u001b[33m  \u001b[32m  \u001b[31m  \u001b[90m"
+        }
+    ]
+}

presets/examples/11.jsonc

@@ -0,0 +1,38 @@
+{
+    "$schema": "file:///C:/msys64/home/zhang/fastfetch/doc/json_schema.json",
+    "logo": {
+        "type": "small"
+    },
+    "display": {
+        "percentType": 9,
+        "separator": "\u001b[31m->   "
+    },
+    "modules": [
+        {
+            "key": "Distro      ",
+            "type": "os"
+        },
+        {
+            "key": "Shell       ",
+            "type": "shell"
+        },
+        {
+            "key": "Terminal    ",
+            "type": "terminal"
+        },
+        {
+            "key": "Display     ",
+            "type": "display"
+        },
+        {
+            "key": "Backlight   ",
+            "type": "brightness"
+        },
+        "break",
+        {
+            "type": "colors",
+            "paddingLeft": 6,
+            "symbol": "circle"
+        }
+    ]
+}

presets/verbose

@@ -1,31 +0,0 @@
---os-format System: {}; Name: {}; Pretty name: {}; ID: {}; ID like: {}; Variant: {}; Variant ID: {}; Version: {}; Version ID: {}; Version codename: {}; Build ID: {}; Architecture: {}
---host-format Family: product_family: {}; product_name: {}; product_version: {}; product_sku: {}; sys_vendor: {}
---kernel-format Sysname: {}; Release: {}; Version: {}
---uptime-format Days: {}; Hours: {}; Minutes: {}; Seconds: {}
---processes-format Count: {}
---packages-format All: {}; pacman: {}; pacman branch: {}; dpkg: {}; rpm: {}; emerge: {}; eopkg: {}; xbps: {}; apk: {}; flatpak-system: {}; flatpak-user: {}; snap: {}; brew: {}; brew-cask: {}; port: {}; scoop: {}; choco: {}; pkgtool: {}; paludis {}
---shell-format Process name: {}; Process path: {}; Process exe: {}; Process version: {}; User path: {}; User exe: {}; User version: {}
---display-format Width: {}; Height: {}; Refresh rate: {}; ScaledWith: {}; ScaledHeight: {}
---de-format Process name: {}; Pretty name: {}; Version: {}
---wm-format Process name: {}; Pretty name: {}; Protocol: {}
---wmtheme-format Name: {}
---theme-format Plasma: {}; Plasma colors: {}; Plasma colors pretty: {}; GTK2: {}; GTK3: {}; GTK4: {}; GTK: {}
---icons-format Plasma: {}; GTK2: {}; GTK3: {}; GTK4: {}; GTK: {}
---font-format Font1: {}; Font2: {}; Font3: {}; Font4: {}
---cursor-format Theme: {}; Size: {}
---terminal-format Process: {}; Path: {}; Exe: {}
---terminalfont-format Pretty: {}; Name: {}; Size: {}; Styles: {}
---cpu-format Name: {}, Vendor: {}, CoresPhysical: {}, CoresLogical: {}, CoresOnline: {}, FrequencyMin: {}, FrequencyMax: {}, Temperature: {}
---cpu-usage-format Percentage: {}
---gpu-format Vendor: {}; Name: {}; Driver: {}; Temperature: {}; CoreCount: {}; Type: {}
---memory-format Used: {}; Total: {}; Percentage: {}
---disk-format SizeUsed: {}; SizeTotal: {}; SizePercentage: {}; FilesUsed: {}; FilesTotal: {}; FilesPercentage: {}; External: {}; Hidden: {}; Filesystem: {}; Name: {}
---battery-format Manufactor: {}; Model: {}; Technology: {}; Capacity: {}; Status: {}
---poweradapter-format Watts: {}; Name: {}; Manufactor: {}; Model: {}; Description: {}
---player-format Pretty: {}; Name: {}; Bus: {}; Url: {}
---media-format Pretty: {}; Name: {};  Artist: {}; Album: {}
---datetime-format year: {}; yearShort: {}; month: {}; monthPretty: {}; monthName: {}; monthNameShort: {}; weekNumber: {}; weekday: {}; weekdayShort: {}; dayInYear: {}; dayInMonth: {}; dayInWeek: {}; hour: {}; hourPretty: {}; hour12: {}; hour12Pretty: {}; minute: {}; minutePretty: {}; second: {}; secondPretty: {}
---vulkan-format driver: {}; Api Version: {}; Conformance Version: {}
---opengl-format version: {}; renderer: {}; vendor: {}
---opencl-format version: {}; device: {}; vendor: {}
---bluetooth-format Name: {}; Address: {}; Type: {}; Battery: {}

src/3rdparty/yyjson/repo.json

@@ -1,6 +1,6 @@
 {
     "home": "https://github.com/ibireme/yyjson",
     "license": "MIT ( embed in source )",
-    "version": "5e3b26d2659287d31e2f8e10f95f95feb7e5ab3a",
+    "version": "0.8.0",
     "author": "ibireme"
 }

src/3rdparty/yyjson/yyjson.c

@@ -307,6 +307,9 @@ uint32_t yyjson_version(void) {
 #define YYJSON_MUT_DOC_VAL_POOL_INIT_SIZE   (0x10 * sizeof(yyjson_mut_val))
 #define YYJSON_MUT_DOC_VAL_POOL_MAX_SIZE    (0x1000000 * sizeof(yyjson_mut_val))
 
+/* The minimum size of the dynamic allocator's chunk. */
+#define YYJSON_ALC_DYN_MIN_SIZE             0x1000
+
 /* Default value for compile-time options. */
 #ifndef YYJSON_DISABLE_READER
 #define YYJSON_DISABLE_READER 0
@@ -966,6 +969,15 @@ static const yyjson_alc YYJSON_DEFAULT_ALC = {
     NULL
 };
 
+
+
+/*==============================================================================
+ * Null Memory Allocator
+ *
+ * This allocator is just a placeholder to ensure that the internal
+ * malloc/realloc/free function pointers are not null.
+ *============================================================================*/
+
 static void *null_malloc(void *ctx, usize size) {
     return NULL;
 }
@@ -989,29 +1001,37 @@ static const yyjson_alc YYJSON_NULL_ALC = {
 
 /*==============================================================================
  * Pool Memory Allocator
- * This is a simple memory allocator that uses linked list memory chunk.
- * The following code will be executed only when the library user creates
- * this allocator manually.
+ *
+ * This allocator is initialized with a fixed-size buffer.
+ * The buffer is split into multiple memory chunks for memory allocation.
  *============================================================================*/
 
-/** chunk header */
+/** memory chunk header */
 typedef struct pool_chunk {
-    usize size; /* chunk memory size (include chunk header) */
-    struct pool_chunk *next;
+    usize size; /* chunk memory size, include chunk header */
+    struct pool_chunk *next; /* linked list, nullable */
+    /* char mem[]; flexible array member */
 } pool_chunk;
 
-/** ctx header */
+/** allocator ctx header */
 typedef struct pool_ctx {
-    usize size; /* total memory size (include ctx header) */
-    pool_chunk *free_list;
+    usize size; /* total memory size, include ctx header */
+    pool_chunk *free_list; /* linked list, nullable */
+    /* pool_chunk chunks[]; flexible array member */
 } pool_ctx;
 
+/** align up the input size to chunk size */
+static_inline void pool_size_align(usize *size) {
+    *size = size_align_up(*size, sizeof(pool_chunk)) + sizeof(pool_chunk);
+}
+
 static void *pool_malloc(void *ctx_ptr, usize size) {
+    /* assert(size != 0) */
     pool_ctx *ctx = (pool_ctx *)ctx_ptr;
     pool_chunk *next, *prev = NULL, *cur = ctx->free_list;
     
-    if (unlikely(size == 0 || size >= ctx->size)) return NULL;
-    size = size_align_up(size, sizeof(pool_chunk)) + sizeof(pool_chunk);
+    if (unlikely(size >= ctx->size)) return NULL;
+    pool_size_align(&size);
     
     while (cur) {
         if (cur->size < size) {
@@ -1038,6 +1058,7 @@ static void *pool_malloc(void *ctx_ptr, usize size) {
 }
 
 static void pool_free(void *ctx_ptr, void *ptr) {
+    /* assert(ptr != NULL) */
     pool_ctx *ctx = (pool_ctx *)ctx_ptr;
     pool_chunk *cur = ((pool_chunk *)ptr) - 1;
     pool_chunk *prev = NULL, *next = ctx->free_list;
@@ -1064,25 +1085,15 @@ static void pool_free(void *ctx_ptr, void *ptr) {
 
 static void *pool_realloc(void *ctx_ptr, void *ptr,
                           usize old_size, usize size) {
+    /* assert(ptr != NULL && size != 0 && old_size < size) */
     pool_ctx *ctx = (pool_ctx *)ctx_ptr;
     pool_chunk *cur = ((pool_chunk *)ptr) - 1, *prev, *next, *tmp;
-    usize free_size;
-    void *new_ptr;
     
-    if (unlikely(size == 0 || size >= ctx->size)) return NULL;
-    size = size_align_up(size, sizeof(pool_chunk)) + sizeof(pool_chunk);
-    
-    /* reduce size */
-    if (unlikely(size <= cur->size)) {
-        free_size = cur->size - size;
-        if (free_size >= sizeof(pool_chunk) * 2) {
-            tmp = (pool_chunk *)(void *)((u8 *)cur + cur->size - free_size);
-            tmp->size = free_size;
-            pool_free(ctx_ptr, (void *)(tmp + 1));
-            cur->size -= free_size;
-        }
-        return ptr;
-    }
+    /* check size */
+    if (unlikely(size >= ctx->size)) return NULL;
+    pool_size_align(&old_size);
+    pool_size_align(&size);
+    if (unlikely(old_size == size)) return ptr;
     
     /* find next and prev chunk */
     prev = NULL;
@@ -1092,10 +1103,9 @@ static void *pool_realloc(void *ctx_ptr, void *ptr,
         next = next->next;
     }
     
-    /* merge to higher chunk if they are contiguous */
-    if ((u8 *)cur + cur->size == (u8 *)next &&
-        cur->size + next->size >= size) {
-        free_size = cur->size + next->size - size;
+    if ((u8 *)cur + cur->size == (u8 *)next && cur->size + next->size >= size) {
+        /* merge to higher chunk if they are contiguous */
+        usize free_size = cur->size + next->size - size;
         if (free_size > sizeof(pool_chunk) * 2) {
             tmp = (pool_chunk *)(void *)((u8 *)cur + size);
             if (prev) prev->next = tmp;
@@ -1109,15 +1119,15 @@ static void *pool_realloc(void *ctx_ptr, void *ptr,
             cur->size += next->size;
         }
         return ptr;
+    } else {
+        /* fallback to malloc and memcpy */
+        void *new_ptr = pool_malloc(ctx_ptr, size - sizeof(pool_chunk));
+        if (new_ptr) {
+            memcpy(new_ptr, ptr, cur->size - sizeof(pool_chunk));
+            pool_free(ctx_ptr, ptr);
+        }
+        return new_ptr;
     }
-    
-    /* fallback to malloc and memcpy */
-    new_ptr = pool_malloc(ctx_ptr, size - sizeof(pool_chunk));
-    if (new_ptr) {
-        memcpy(new_ptr, ptr, cur->size - sizeof(pool_chunk));
-        pool_free(ctx_ptr, ptr);
-    }
-    return new_ptr;
 }
 
 bool yyjson_alc_pool_init(yyjson_alc *alc, void *buf, usize size) {
@@ -1147,6 +1157,161 @@ bool yyjson_alc_pool_init(yyjson_alc *alc, void *buf, usize size) {
 
 
 
+/*==============================================================================
+ * Dynamic Memory Allocator
+ *
+ * This allocator allocates memory on demand and does not immediately release
+ * unused memory. Instead, it places the unused memory into a freelist for
+ * potential reuse in the future. It is only when the entire allocator is
+ * destroyed that all previously allocated memory is released at once.
+ *============================================================================*/
+
+/** memory chunk header */
+typedef struct dyn_chunk {
+    usize size; /* chunk size, include header */
+    struct dyn_chunk *next;
+    /* char mem[]; flexible array member */
+} dyn_chunk;
+
+/** allocator ctx header */
+typedef struct {
+    dyn_chunk free_list; /* dummy header, sorted from small to large */
+    dyn_chunk used_list; /* dummy header */
+} dyn_ctx;
+
+/** align up the input size to chunk size */
+static_inline bool dyn_size_align(usize *size) {
+    usize alc_size = *size + sizeof(dyn_chunk);
+    alc_size = size_align_up(alc_size, YYJSON_ALC_DYN_MIN_SIZE);
+    if (unlikely(alc_size < *size)) return false; /* overflow */
+    *size = alc_size;
+    return true;
+}
+
+/** remove a chunk from list (the chunk must already be in the list) */
+static_inline void dyn_chunk_list_remove(dyn_chunk *list, dyn_chunk *chunk) {
+    dyn_chunk *prev = list, *cur;
+    for (cur = prev->next; cur; cur = cur->next) {
+        if (cur == chunk) {
+            prev->next = cur->next;
+            cur->next = NULL;
+            return;
+        }
+        prev = cur;
+    }
+}
+
+/** add a chunk to list header (the chunk must not be in the list) */
+static_inline void dyn_chunk_list_add(dyn_chunk *list, dyn_chunk *chunk) {
+    chunk->next = list->next;
+    list->next = chunk;
+}
+
+static void *dyn_malloc(void *ctx_ptr, usize size) {
+    /* assert(size != 0) */
+    const yyjson_alc def = YYJSON_DEFAULT_ALC;
+    dyn_ctx *ctx = (dyn_ctx *)ctx_ptr;
+    dyn_chunk *chunk, *prev, *next;
+    if (unlikely(!dyn_size_align(&size))) return NULL;
+    
+    /* freelist is empty, create new chunk */
+    if (!ctx->free_list.next) {
+        chunk = (dyn_chunk *)def.malloc(def.ctx, size);
+        if (unlikely(!chunk)) return NULL;
+        chunk->size = size;
+        chunk->next = NULL;
+        dyn_chunk_list_add(&ctx->used_list, chunk);
+        return (void *)(chunk + 1);
+    }
+    
+    /* find a large enough chunk, or resize the largest chunk */
+    prev = &ctx->free_list;
+    while (true) {
+        chunk = prev->next;
+        if (chunk->size >= size) { /* enough size, reuse this chunk */
+            prev->next = chunk->next;
+            dyn_chunk_list_add(&ctx->used_list, chunk);
+            return (void *)(chunk + 1);
+        }
+        if (!chunk->next) { /* resize the largest chunk */
+            chunk = (dyn_chunk *)def.realloc(def.ctx, chunk, chunk->size, size);
+            if (unlikely(!chunk)) return NULL;
+            prev->next = NULL;
+            chunk->size = size;
+            dyn_chunk_list_add(&ctx->used_list, chunk);
+            return (void *)(chunk + 1);
+        }
+        prev = chunk;
+    }
+}
+
+static void *dyn_realloc(void *ctx_ptr, void *ptr,
+                          usize old_size, usize size) {
+    /* assert(ptr != NULL && size != 0 && old_size < size) */
+    const yyjson_alc def = YYJSON_DEFAULT_ALC;
+    dyn_ctx *ctx = (dyn_ctx *)ctx_ptr;
+    dyn_chunk *prev, *next, *new_chunk;
+    dyn_chunk *chunk = (dyn_chunk *)ptr - 1;
+    if (unlikely(!dyn_size_align(&size))) return NULL;
+    if (chunk->size >= size) return ptr;
+    
+    dyn_chunk_list_remove(&ctx->used_list, chunk);
+    new_chunk = (dyn_chunk *)def.realloc(def.ctx, chunk, chunk->size, size);
+    if (likely(new_chunk)) {
+        new_chunk->size = size;
+        chunk = new_chunk;
+    }
+    dyn_chunk_list_add(&ctx->used_list, chunk);
+    return new_chunk ? (void *)(new_chunk + 1) : NULL;
+}
+
+static void dyn_free(void *ctx_ptr, void *ptr) {
+    /* assert(ptr != NULL) */
+    dyn_ctx *ctx = (dyn_ctx *)ctx_ptr;
+    dyn_chunk *chunk = (dyn_chunk *)ptr - 1, *prev;
+    
+    dyn_chunk_list_remove(&ctx->used_list, chunk);
+    for (prev = &ctx->free_list; prev; prev = prev->next) {
+        if (!prev->next || prev->next->size >= chunk->size) {
+            chunk->next = prev->next;
+            prev->next = chunk;
+            break;
+        }
+    }
+}
+
+yyjson_alc *yyjson_alc_dyn_new(void) {
+    const yyjson_alc def = YYJSON_DEFAULT_ALC;
+    usize hdr_len = sizeof(yyjson_alc) + sizeof(dyn_ctx);
+    yyjson_alc *alc = (yyjson_alc *)def.malloc(def.ctx, hdr_len);
+    dyn_ctx *ctx = (dyn_ctx *)(void *)(alc + 1);
+    if (unlikely(!alc)) return NULL;
+    alc->malloc = dyn_malloc;
+    alc->realloc = dyn_realloc;
+    alc->free = dyn_free;
+    alc->ctx = alc + 1;
+    memset(ctx, 0, sizeof(*ctx));
+    return alc;
+}
+
+void yyjson_alc_dyn_free(yyjson_alc *alc) {
+    const yyjson_alc def = YYJSON_DEFAULT_ALC;
+    dyn_ctx *ctx = (dyn_ctx *)(void *)(alc + 1);
+    dyn_chunk *chunk, *next;
+    if (unlikely(!alc)) return;
+    for (chunk = ctx->free_list.next; chunk; chunk = next) {
+        next = chunk->next;
+        def.free(def.ctx, chunk);
+    }
+    for (chunk = ctx->used_list.next; chunk; chunk = next) {
+        next = chunk->next;
+        def.free(def.ctx, chunk);
+    }
+    def.free(def.ctx, alc);
+}
+
+
+
 /*==============================================================================
  * JSON document and value
  *============================================================================*/
@@ -1305,7 +1470,6 @@ yyjson_mut_val *yyjson_val_mut_copy(yyjson_mut_doc *m_doc,
      We copy them to another contiguous memory as mutable values,
      then reconnect the mutable values with the original relationship.
      */
-    
     usize i_vals_len;
     yyjson_mut_val *m_vals, *m_val;
     yyjson_val *i_val, *i_end;
@@ -1375,7 +1539,6 @@ static yyjson_mut_val *unsafe_yyjson_mut_val_mut_copy(yyjson_mut_doc *m_doc,
      second to last item, which needs to be linked to the last item to close the
      circle.
      */
-    
     yyjson_mut_val *m_val = unsafe_yyjson_mut_val(m_doc, 1);
     if (unlikely(!m_val)) return NULL;
     m_val->tag = m_vals->tag;
@@ -1540,12 +1703,13 @@ static_inline bool unsafe_yyjson_num_equals(void *lhs, void *rhs) {
     yyjson_val_uni *runi = &((yyjson_val *)rhs)->uni;
     yyjson_subtype lt = unsafe_yyjson_get_subtype(lhs);
     yyjson_subtype rt = unsafe_yyjson_get_subtype(rhs);
-    if (lt == rt)
-        return luni->u64 == runi->u64;
-    if (lt == YYJSON_SUBTYPE_SINT && rt == YYJSON_SUBTYPE_UINT)
+    if (lt == rt) return luni->u64 == runi->u64;
+    if (lt == YYJSON_SUBTYPE_SINT && rt == YYJSON_SUBTYPE_UINT) {
         return luni->i64 >= 0 && luni->u64 == runi->u64;
-    if (lt == YYJSON_SUBTYPE_UINT && rt == YYJSON_SUBTYPE_SINT)
+    }
+    if (lt == YYJSON_SUBTYPE_UINT && rt == YYJSON_SUBTYPE_SINT) {
         return runi->i64 >= 0 && luni->u64 == runi->u64;
+    }
     return false;
 }
 
@@ -1571,8 +1735,8 @@ bool unsafe_yyjson_equals(yyjson_val *lhs, yyjson_val *rhs) {
                 while (len-- > 0) {
                     rhs = yyjson_obj_iter_getn(&iter, lhs->uni.str,
                                                unsafe_yyjson_get_len(lhs));
-                    if (!rhs || !unsafe_yyjson_equals(lhs + 1, rhs))
-                        return false;
+                    if (!rhs) return false;
+                    if (!unsafe_yyjson_equals(lhs + 1, rhs)) return false;
                     lhs = unsafe_yyjson_get_next(lhs + 1);
                 }
             }
@@ -1626,8 +1790,8 @@ bool unsafe_yyjson_mut_equals(yyjson_mut_val *lhs, yyjson_mut_val *rhs) {
                 while (len-- > 0) {
                     rhs = yyjson_mut_obj_iter_getn(&iter, lhs->uni.str,
                                                    unsafe_yyjson_get_len(lhs));
-                    if (!rhs || !unsafe_yyjson_mut_equals(lhs->next, rhs))
-                        return false;
+                    if (!rhs) return false;
+                    if (!unsafe_yyjson_mut_equals(lhs->next, rhs)) return false;
                     lhs = lhs->next->next;
                 }
             }
@@ -2506,6 +2670,7 @@ yyjson_mut_val *yyjson_merge_patch(yyjson_mut_doc *doc,
     builder = yyjson_mut_obj(doc);
     if (unlikely(!builder)) return NULL;
     
+    memset(&local_orig, 0, sizeof(local_orig));
     if (!yyjson_is_obj(orig)) {
         orig = &local_orig;
         orig->tag = builder->tag;
@@ -2557,6 +2722,7 @@ yyjson_mut_val *yyjson_mut_merge_patch(yyjson_mut_doc *doc,
     builder = yyjson_mut_obj(doc);
     if (unlikely(!builder)) return NULL;
     
+    memset(&local_orig, 0, sizeof(local_orig));
     if (!yyjson_mut_is_obj(orig)) {
         orig = &local_orig;
         orig->tag = builder->tag;
@@ -3318,8 +3484,6 @@ static_inline void pow10_table_get_exp(i32 exp10, i32 *exp2) {
 
 
 
-#if !YYJSON_DISABLE_READER
-
 /*==============================================================================
  * JSON Character Matcher
  *============================================================================*/
@@ -3513,6 +3677,8 @@ static_inline bool digi_is_digit_or_fp(u8 d) {
 
 
 
+#if !YYJSON_DISABLE_READER
+
 /*==============================================================================
  * Hex Character Reader
  * This function is used by JSON reader to read escaped characters.

src/3rdparty/yyjson/yyjson.h

@@ -527,16 +527,16 @@ extern "C" {
 #define YYJSON_VERSION_MAJOR  0
 
 /** The minor version of yyjson. */
-#define YYJSON_VERSION_MINOR  7
+#define YYJSON_VERSION_MINOR  8
 
 /** The patch version of yyjson. */
 #define YYJSON_VERSION_PATCH  0
 
 /** The version of yyjson in hex: `(major << 16) | (minor << 8) | (patch)`. */
-#define YYJSON_VERSION_HEX    0x000700
+#define YYJSON_VERSION_HEX    0x000800
 
 /** The version string of yyjson. */
-#define YYJSON_VERSION_STRING "0.7.0"
+#define YYJSON_VERSION_STRING "0.8.0"
 
 /** The version of yyjson in hex, same as `YYJSON_VERSION_HEX`. */
 yyjson_api uint32_t yyjson_version(void);
@@ -635,11 +635,11 @@ typedef struct yyjson_alc {
  function, but the amount of memory required to write a JSON cannot be directly 
  calculated.
  
- This is not a general-purpose allocator. If used to read multiple JSON 
- documents and only some of them are released, it may cause memory
- fragmentation, leading to performance degradation and memory waste. Therefore, 
- it is recommended to use this allocator only for reading or writing a single 
- JSON document.
+ This is not a general-purpose allocator. It is designed to handle a single JSON
+ data at a time. If it is used for overly complex memory tasks, such as parsing
+ multiple JSON documents using the same allocator but releasing only a few of
+ them, it may cause memory fragmentation, resulting in performance degradation
+ and memory waste.
  
  @param alc The allocator to be initialized.
     If this parameter is NULL, the function will fail and return false.
@@ -662,9 +662,31 @@ typedef struct yyjson_alc {
     yyjson_doc *doc = yyjson_read_opts(json, strlen(json), 0, &alc, NULL);
     // the memory of `doc` is on the stack
  @endcode
+ 
+ @warning This Allocator is not thread-safe.
  */
 yyjson_api bool yyjson_alc_pool_init(yyjson_alc *alc, void *buf, size_t size);
 
+/**
+ A dynamic allocator.
+ 
+ This allocator has a similar usage to the pool allocator above. However, when
+ there is not enough memory, this allocator will dynamically request more memory
+ using libc's `malloc` function, and frees it all at once when it is destroyed.
+ 
+ @return A new dynamic allocator, or NULL if memory allocation failed.
+ @note The returned value should be freed with `yyjson_alc_dyn_free()`.
+ 
+ @warning This Allocator is not thread-safe.
+ */
+yyjson_api yyjson_alc *yyjson_alc_dyn_new(void);
+
+/**
+ Free a dynamic allocator which is created by `yyjson_alc_dyn_new()`.
+ @param alc The dynamic allocator to be destroyed.
+ */
+yyjson_api void yyjson_alc_dyn_free(yyjson_alc *alc);
+
 
 
 /*==============================================================================
@@ -3556,7 +3578,7 @@ yyjson_api_inline bool yyjson_mut_obj_rotate(yyjson_mut_val *obj,
     The `key` should be a null-terminated UTF-8 string.
     This function allows duplicated key in one object.
     
-    @warning The key string are not copied, you should keep the string
+    @warning The key string is not copied, you should keep the string
         unmodified for the lifetime of this JSON document. */
 yyjson_api_inline bool yyjson_mut_obj_add_null(yyjson_mut_doc *doc,
                                                yyjson_mut_val *obj,
@@ -3566,7 +3588,7 @@ yyjson_api_inline bool yyjson_mut_obj_add_null(yyjson_mut_doc *doc,
     The `key` should be a null-terminated UTF-8 string.
     This function allows duplicated key in one object.
     
-    @warning The key string are not copied, you should keep the string
+    @warning The key string is not copied, you should keep the string
         unmodified for the lifetime of this JSON document. */
 yyjson_api_inline bool yyjson_mut_obj_add_true(yyjson_mut_doc *doc,
                                                yyjson_mut_val *obj,
@@ -3576,7 +3598,7 @@ yyjson_api_inline bool yyjson_mut_obj_add_true(yyjson_mut_doc *doc,
     The `key` should be a null-terminated UTF-8 string.
     This function allows duplicated key in one object.
     
-    @warning The key string are not copied, you should keep the string
+    @warning The key string is not copied, you should keep the string
         unmodified for the lifetime of this JSON document. */
 yyjson_api_inline bool yyjson_mut_obj_add_false(yyjson_mut_doc *doc,
                                                 yyjson_mut_val *obj,
@@ -3586,7 +3608,7 @@ yyjson_api_inline bool yyjson_mut_obj_add_false(yyjson_mut_doc *doc,
     The `key` should be a null-terminated UTF-8 string.
     This function allows duplicated key in one object.
     
-    @warning The key string are not copied, you should keep the string
+    @warning The key string is not copied, you should keep the string
         unmodified for the lifetime of this JSON document. */
 yyjson_api_inline bool yyjson_mut_obj_add_bool(yyjson_mut_doc *doc,
                                                yyjson_mut_val *obj,
@@ -3596,7 +3618,7 @@ yyjson_api_inline bool yyjson_mut_obj_add_bool(yyjson_mut_doc *doc,
     The `key` should be a null-terminated UTF-8 string.
     This function allows duplicated key in one object.
     
-    @warning The key string are not copied, you should keep the string
+    @warning The key string is not copied, you should keep the string
         unmodified for the lifetime of this JSON document. */
 yyjson_api_inline bool yyjson_mut_obj_add_uint(yyjson_mut_doc *doc,
                                                yyjson_mut_val *obj,
@@ -3606,7 +3628,7 @@ yyjson_api_inline bool yyjson_mut_obj_add_uint(yyjson_mut_doc *doc,
     The `key` should be a null-terminated UTF-8 string.
     This function allows duplicated key in one object.
     
-    @warning The key string are not copied, you should keep the string
+    @warning The key string is not copied, you should keep the string
         unmodified for the lifetime of this JSON document. */
 yyjson_api_inline bool yyjson_mut_obj_add_sint(yyjson_mut_doc *doc,
                                                yyjson_mut_val *obj,
@@ -3616,7 +3638,7 @@ yyjson_api_inline bool yyjson_mut_obj_add_sint(yyjson_mut_doc *doc,
     The `key` should be a null-terminated UTF-8 string.
     This function allows duplicated key in one object.
     
-    @warning The key string are not copied, you should keep the string
+    @warning The key string is not copied, you should keep the string
         unmodified for the lifetime of this JSON document. */
 yyjson_api_inline bool yyjson_mut_obj_add_int(yyjson_mut_doc *doc,
                                               yyjson_mut_val *obj,
@@ -3626,7 +3648,7 @@ yyjson_api_inline bool yyjson_mut_obj_add_int(yyjson_mut_doc *doc,
     The `key` should be a null-terminated UTF-8 string.
     This function allows duplicated key in one object.
     
-    @warning The key string are not copied, you should keep the string
+    @warning The key string is not copied, you should keep the string
         unmodified for the lifetime of this JSON document. */
 yyjson_api_inline bool yyjson_mut_obj_add_real(yyjson_mut_doc *doc,
                                                yyjson_mut_val *obj,
@@ -3636,7 +3658,7 @@ yyjson_api_inline bool yyjson_mut_obj_add_real(yyjson_mut_doc *doc,
     The `key` and `val` should be null-terminated UTF-8 strings.
     This function allows duplicated key in one object.
     
-    @warning The key/value string are not copied, you should keep these strings
+    @warning The key/value strings are not copied, you should keep these strings
         unmodified for the lifetime of this JSON document. */
 yyjson_api_inline bool yyjson_mut_obj_add_str(yyjson_mut_doc *doc,
                                               yyjson_mut_val *obj,
@@ -3648,7 +3670,7 @@ yyjson_api_inline bool yyjson_mut_obj_add_str(yyjson_mut_doc *doc,
     The `len` should be the length of the `val`, in bytes.
     This function allows duplicated key in one object.
     
-    @warning The key/value string are not copied, you should keep these strings
+    @warning The key/value strings are not copied, you should keep these strings
         unmodified for the lifetime of this JSON document. */
 yyjson_api_inline bool yyjson_mut_obj_add_strn(yyjson_mut_doc *doc,
                                                yyjson_mut_val *obj,
@@ -3660,7 +3682,7 @@ yyjson_api_inline bool yyjson_mut_obj_add_strn(yyjson_mut_doc *doc,
     The value string is copied.
     This function allows duplicated key in one object.
     
-    @warning The key string are not copied, you should keep the string
+    @warning The key string is not copied, you should keep the string
         unmodified for the lifetime of this JSON document. */
 yyjson_api_inline bool yyjson_mut_obj_add_strcpy(yyjson_mut_doc *doc,
                                                  yyjson_mut_val *obj,
@@ -3673,18 +3695,44 @@ yyjson_api_inline bool yyjson_mut_obj_add_strcpy(yyjson_mut_doc *doc,
     The `len` should be the length of the `val`, in bytes.
     This function allows duplicated key in one object.
     
-    @warning The key/value string are not copied, you should keep these strings
+    @warning The key/value strings are not copied, you should keep these strings
         unmodified for the lifetime of this JSON document. */
 yyjson_api_inline bool yyjson_mut_obj_add_strncpy(yyjson_mut_doc *doc,
                                                   yyjson_mut_val *obj,
                                                   const char *key,
                                                   const char *val, size_t len);
 
+/**
+ Creates and adds a new array to the target object.
+ The `key` should be a null-terminated UTF-8 string.
+ This function allows duplicated key in one object.
+ 
+ @warning The key string is not copied, you should keep these strings
+          unmodified for the lifetime of this JSON document.
+ @return The new array, or NULL on error.
+ */
+yyjson_api_inline yyjson_mut_val *yyjson_mut_obj_add_arr(yyjson_mut_doc *doc,
+                                                         yyjson_mut_val *obj,
+                                                         const char *key);
+
+/**
+ Creates and adds a new object to the target object.
+ The `key` should be a null-terminated UTF-8 string.
+ This function allows duplicated key in one object.
+ 
+ @warning The key string is not copied, you should keep these strings
+          unmodified for the lifetime of this JSON document.
+ @return The new object, or NULL on error.
+ */
+yyjson_api_inline yyjson_mut_val *yyjson_mut_obj_add_obj(yyjson_mut_doc *doc,
+                                                         yyjson_mut_val *obj,
+                                                         const char *key);
+
 /** Adds a JSON value at the end of the object.
     The `key` should be a null-terminated UTF-8 string.
     This function allows duplicated key in one object.
     
-    @warning The key string are not copied, you should keep the string
+    @warning The key string is not copied, you should keep the string
         unmodified for the lifetime of this JSON document. */
 yyjson_api_inline bool yyjson_mut_obj_add_val(yyjson_mut_doc *doc,
                                               yyjson_mut_val *obj,
@@ -6920,6 +6968,22 @@ yyjson_api_inline bool yyjson_mut_obj_add_strncpy(yyjson_mut_doc *doc,
     });
 }
 
+yyjson_api_inline yyjson_mut_val *yyjson_mut_obj_add_arr(yyjson_mut_doc *doc,
+                                                         yyjson_mut_val *obj,
+                                                         const char *_key) {
+    yyjson_mut_val *key = yyjson_mut_str(doc, _key);
+    yyjson_mut_val *val = yyjson_mut_arr(doc);
+    return yyjson_mut_obj_add(obj, key, val) ? val : NULL;
+}
+
+yyjson_api_inline yyjson_mut_val *yyjson_mut_obj_add_obj(yyjson_mut_doc *doc,
+                                                         yyjson_mut_val *obj,
+                                                         const char *_key) {
+    yyjson_mut_val *key = yyjson_mut_str(doc, _key);
+    yyjson_mut_val *val = yyjson_mut_obj(doc);
+    return yyjson_mut_obj_add(obj, key, val) ? val : NULL;
+}
+
 yyjson_api_inline bool yyjson_mut_obj_add_val(yyjson_mut_doc *doc,
                                               yyjson_mut_val *obj,
                                               const char *_key,

src/common/commandoption.c

@@ -1,7 +1,26 @@
 #include "commandoption.h"
+#include "common/printing.h"
+#include "common/time.h"
+#include "fastfetch_datatext.h"
+#include "modules/modules.h"
 #include "util/stringUtils.h"
 
 #include <ctype.h>
+#include <inttypes.h>
+
+static inline yyjson_mut_val* genJson(FFModuleBaseInfo* baseInfo)
+{
+    yyjson_mut_doc* doc = instance.state.resultDoc;
+    if (__builtin_expect(!doc, true)) return NULL;
+
+    yyjson_mut_val* module = yyjson_mut_arr_add_obj(doc, doc->root);
+    yyjson_mut_obj_add_str(doc, module, "type", baseInfo->name);
+    if (baseInfo->generateJson)
+        baseInfo->generateJson(baseInfo, doc, module);
+    else
+        yyjson_mut_obj_add_str(doc, module, "error", "Unsupported for JSON format");
+    return module;
+}
 
 bool ffParseModuleCommand(const char* type)
 {
@@ -12,7 +31,8 @@ bool ffParseModuleCommand(const char* type)
         FFModuleBaseInfo* baseInfo = *modules;
         if (ffStrEqualsIgnCase(type, baseInfo->name))
         {
-            baseInfo->printModule(baseInfo);
+            if (!genJson(baseInfo))
+                baseInfo->printModule(baseInfo);
             return true;
         }
     }
@@ -30,3 +50,91 @@ bool ffParseModuleOptions(const char* key, const char* value)
     }
     return false;
 }
+
+void ffPrepareCommandOption(FFdata* data)
+{
+    //If we don't have a custom structure, use the default one
+    if(data->structure.length == 0)
+        ffStrbufAppendS(&data->structure, FASTFETCH_DATATEXT_STRUCTURE);
+
+    if(ffStrbufContainIgnCaseS(&data->structure, FF_CPUUSAGE_MODULE_NAME))
+        ffPrepareCPUUsage();
+
+    if(ffStrbufContainIgnCaseS(&data->structure, FF_NETIO_MODULE_NAME))
+        ffPrepareNetIO(&instance.config.netIo);
+
+    if(instance.config.multithreading)
+    {
+        if(ffStrbufContainIgnCaseS(&data->structure, FF_PUBLICIP_MODULE_NAME))
+            ffPreparePublicIp(&instance.config.publicIP);
+
+        if(ffStrbufContainIgnCaseS(&data->structure, FF_WEATHER_MODULE_NAME))
+            ffPrepareWeather(&instance.config.weather);
+    }
+}
+
+static void parseStructureCommand(const char* line, FFlist* customValues)
+{
+    // handle `--set` and `--set-keyless`
+    FF_LIST_FOR_EACH(FFCustomValue, customValue, *customValues)
+    {
+        if (ffStrbufEqualS(&customValue->key, line))
+        {
+            __attribute__((__cleanup__(ffDestroyCustomOptions))) FFCustomOptions options;
+            ffInitCustomOptions(&options);
+            if (customValue->printKey)
+                ffStrbufAppend(&options.moduleArgs.key, &customValue->key);
+            ffStrbufAppend(&options.moduleArgs.outputFormat, &customValue->value);
+            ffPrintCustom(&options);
+            return;
+        }
+    }
+
+    if(!ffParseModuleCommand(line))
+        ffPrintErrorString(line, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "<no implementation provided>");
+}
+
+void ffPrintCommandOption(FFdata* data)
+{
+    yyjson_mut_doc* resultDoc = instance.state.resultDoc;
+
+    //Parse the structure and call the modules
+    uint32_t startIndex = 0;
+    while (startIndex < data->structure.length)
+    {
+        uint32_t colonIndex = ffStrbufNextIndexC(&data->structure, startIndex, ':');
+        data->structure.chars[colonIndex] = '\0';
+
+        uint64_t ms = 0;
+        if(instance.config.stat)
+            ms = ffTimeGetTick();
+
+        parseStructureCommand(data->structure.chars + startIndex, &data->customValues);
+
+        if(instance.config.stat)
+        {
+            ms = ffTimeGetTick() - ms;
+
+            if (resultDoc)
+            {
+                yyjson_mut_val* moduleJson = yyjson_mut_arr_get_last(resultDoc->root);
+                yyjson_mut_obj_add_uint(resultDoc, moduleJson, "stat", ms);
+            }
+            else
+            {
+                char str[32];
+                int len = snprintf(str, sizeof str, "%" PRIu64 "ms", ms);
+                if(instance.config.pipe)
+                    puts(str);
+                else
+                    printf("\033[s\033[1A\033[9999999C\033[%dD%s\033[u", len, str); // Save; Up 1; Right 9999999; Left <len>; Print <str>; Load
+            }
+        }
+
+        #if defined(_WIN32)
+            if (!instance.config.noBuffer) fflush(stdout);
+        #endif
+
+        startIndex = colonIndex + 1;
+    }
+}

src/common/commandoption.h

@@ -5,7 +5,24 @@
 
 #include "fastfetch.h"
 
+typedef struct FFCustomValue
+{
+    bool printKey;
+    FFstrbuf key;
+    FFstrbuf value;
+} FFCustomValue;
+
+// Things only needed by fastfetch
+typedef struct FFdata
+{
+    FFstrbuf structure;
+    FFlist customValues; // List of FFCustomValue
+    bool loadUserConfig;
+} FFdata;
+
 bool ffParseModuleCommand(const char* type);
 bool ffParseModuleOptions(const char* key, const char* value);
+void ffPrepareCommandOption(FFdata* data);
+void ffPrintCommandOption(FFdata* data);
 
 #endif

src/common/format.c

@@ -12,6 +12,8 @@ void ffFormatAppendFormatArg(FFstrbuf* buffer, const FFformatarg* formatarg)
         ffStrbufAppendF(buffer, "%i", *(int*)formatarg->value);
     else if(formatarg->type == FF_FORMAT_ARG_TYPE_UINT)
         ffStrbufAppendF(buffer, "%" PRIu32, *(uint32_t*)formatarg->value);
+    else if(formatarg->type == FF_FORMAT_ARG_TYPE_UINT64)
+        ffStrbufAppendF(buffer, "%" PRIu64, *(uint64_t*)formatarg->value);
     else if(formatarg->type == FF_FORMAT_ARG_TYPE_UINT16)
         ffStrbufAppendF(buffer, "%" PRIu16, *(uint16_t*)formatarg->value);
     else if(formatarg->type == FF_FORMAT_ARG_TYPE_UINT8)
@@ -254,7 +256,5 @@ void ffParseFormatString(FFstrbuf* buffer, const FFstrbuf* formatstr, uint32_t n
         ffFormatAppendFormatArg(buffer, &arguments[index - 1]);
     }
 
-    ffStrbufTrimRight(buffer, ' ');
-
     ffStrbufAppendS(buffer, FASTFETCH_TEXT_MODIFIER_RESET);
 }

src/common/format.h

@@ -7,6 +7,7 @@ typedef enum FFformatargtype
 {
     FF_FORMAT_ARG_TYPE_NULL = 0,
     FF_FORMAT_ARG_TYPE_UINT,
+    FF_FORMAT_ARG_TYPE_UINT64,
     FF_FORMAT_ARG_TYPE_UINT16,
     FF_FORMAT_ARG_TYPE_UINT8,
     FF_FORMAT_ARG_TYPE_INT,

src/common/init.c

@@ -27,6 +27,7 @@ static void initState(FFstate* state)
 
     ffPlatformInit(&state->platform);
     state->configDoc = NULL;
+    state->resultDoc = NULL;
 }
 
 static void defaultConfig(void)
@@ -105,6 +106,7 @@ static void defaultConfig(void)
     ffInitMediaOptions(&instance.config.media);
     ffInitMemoryOptions(&instance.config.memory);
     ffInitMonitorOptions(&instance.config.monitor);
+    ffInitNetIOOptions(&instance.config.netIo);
     ffInitOSOptions(&instance.config.os);
     ffInitOpenCLOptions(&instance.config.openCL);
     ffInitOpenGLOptions(&instance.config.openGL);
@@ -234,11 +236,11 @@ void ffStart(void)
             startDetectionThreads();
     #endif
 
-    ffDisableLinewrap = instance.config.disableLinewrap && !instance.config.pipe;
-    ffHideCursor = instance.config.hideCursor && !instance.config.pipe;
+    ffDisableLinewrap = instance.config.disableLinewrap && !instance.config.pipe && !instance.state.resultDoc;
+    ffHideCursor = instance.config.hideCursor && !instance.config.pipe && !instance.state.resultDoc;
 
     #ifdef _WIN32
-    if (!instance.config.noBuffer) setvbuf(stdout, NULL, _IOFBF, 4096);
+    setvbuf(stdout, NULL, _IOFBF, instance.config.noBuffer ? 0 : 4096);
     SetConsoleCtrlHandler(consoleHandler, TRUE);
     HANDLE hStdout = GetStdHandle(STD_OUTPUT_HANDLE);
     DWORD mode = 0;
@@ -254,7 +256,7 @@ void ffStart(void)
     #endif
 
     //reset everything to default before we start printing
-    if(!instance.config.pipe)
+    if(!instance.config.pipe && !instance.state.resultDoc)
         fputs(FASTFETCH_TEXT_MODIFIER_RESET, stdout);
 
     if(ffHideCursor)
@@ -318,6 +320,7 @@ static void destroyConfig(void)
     ffDestroyMediaOptions(&instance.config.media);
     ffDestroyMemoryOptions(&instance.config.memory);
     ffDestroyMonitorOptions(&instance.config.monitor);
+    ffDestroyNetIOOptions(&instance.config.netIo);
     ffDestroyOSOptions(&instance.config.os);
     ffDestroyOpenCLOptions(&instance.config.openCL);
     ffDestroyOpenGLOptions(&instance.config.openGL);
@@ -375,6 +378,7 @@ static void destroyState(void)
 {
     ffPlatformDestroy(&instance.state.platform);
     yyjson_doc_free(instance.state.configDoc);
+    yyjson_mut_doc_free(instance.state.resultDoc);
 }
 
 void ffDestroyInstance(void)

src/common/io/io.h

@@ -12,6 +12,7 @@
     typedef HANDLE FFNativeFD;
 #else
     #include <unistd.h>
+    #include <dirent.h>
     typedef int FFNativeFD;
 #endif
 
@@ -84,6 +85,8 @@ typedef enum FFPathType
 bool ffPathExists(const char* path, FFPathType pathType);
 bool ffPathExpandEnv(const char* in, FFstrbuf* out);
 
+#define FF_IO_TERM_RESP_WAIT_MS 100 // #554
+
 FF_C_SCANF(2, 3)
 const char* ffGetTerminalResponse(const char* request, const char* format, ...);
 
@@ -130,4 +133,25 @@ static inline bool wrapFclose(FILE** pfile)
 }
 #define FF_AUTO_CLOSE_FILE __attribute__((__cleanup__(wrapFclose)))
 
+#ifndef _WIN32
+static inline bool wrapClosedir(DIR** pdir)
+{
+    assert(pdir);
+    if (!*pdir)
+        return false;
+    closedir(*pdir);
+    return true;
+}
+#else
+static inline bool wrapClosedir(HANDLE* pdir)
+{
+    assert(pdir);
+    if (!*pdir)
+        return false;
+    FindClose(*pdir);
+    return true;
+}
+#endif
+#define FF_AUTO_CLOSE_DIR __attribute__((__cleanup__(wrapClosedir)))
+
 #endif // FF_INCLUDED_common_io_io

src/common/io/io_unix.c

@@ -54,24 +54,20 @@ bool ffAppendFDBuffer(int fd, FFstrbuf* buffer)
     uint32_t free = ffStrbufGetFree(buffer);
 
     while(
-        (readed = read(fd, buffer->chars + buffer->length, free)) > 0 &&
-        (uint32_t) readed == free
+        (readed = read(fd, buffer->chars + buffer->length, free)) > 0
     ) {
         buffer->length += (uint32_t) readed;
-        ffStrbufEnsureFree(buffer, buffer->allocated - 1); // Doubles capacity every round. -1 for the null byte.
+        if((uint32_t) readed == free)
+            ffStrbufEnsureFree(buffer, buffer->allocated - 1); // Doubles capacity every round. -1 for the null byte.
         free = ffStrbufGetFree(buffer);
     }
 
-    // In case of failure, read returns -1. We don't want to substract the length of the buffer.
-    if(readed > 0)
-        buffer->length += (uint32_t) readed;
-
     buffer->chars[buffer->length] = '\0';
 
     ffStrbufTrimRight(buffer, '\n');
     ffStrbufTrimRight(buffer, ' ');
 
-    return readed >= 0;
+    return buffer->length > 0;
 }
 
 ssize_t ffReadFileData(const char* fileName, size_t dataSize, void* data)
@@ -150,7 +146,7 @@ const char* ffGetTerminalResponse(const char* request, const char* format, ...)
     fflush(stdout);
 
     //Give the terminal 35ms to respond
-    if(poll(&(struct pollfd) { .fd = STDIN_FILENO, .events = POLLIN }, 1, 35) <= 0)
+    if(poll(&(struct pollfd) { .fd = STDIN_FILENO, .events = POLLIN }, 1, FF_IO_TERM_RESP_WAIT_MS) <= 0)
     {
         tcsetattr(STDIN_FILENO, TCSANOW, &oldTerm);
         return "poll() timeout or failed";

src/common/io/io_windows.c

@@ -44,16 +44,14 @@ bool ffAppendFDBuffer(HANDLE handle, FFstrbuf* buffer)
     bool success;
     while(
         (success = !!ReadFile(handle, buffer->chars + buffer->length, free, &readed, NULL)) &&
-        (uint32_t) readed == free
+        readed > 0
     ) {
         buffer->length += (uint32_t) readed;
-        ffStrbufEnsureFree(buffer, buffer->allocated - 1); // Doubles capacity every round. -1 for the null byte.
+        if((uint32_t) readed == free)
+            ffStrbufEnsureFree(buffer, buffer->allocated - 1); // Doubles capacity every round. -1 for the null byte.
         free = ffStrbufGetFree(buffer);
     }
 
-    if(readed > 0)
-        buffer->length += (uint32_t) readed;
-
     buffer->chars[buffer->length] = '\0';
 
     ffStrbufTrimRight(buffer, '\n');
@@ -173,7 +171,7 @@ const char* ffGetTerminalResponse(const char* request, const char* format, ...)
 
     while (true)
     {
-        if (WaitForSingleObjectEx(hInput, 35, TRUE) != WAIT_OBJECT_0)
+        if (WaitForSingleObjectEx(hInput, FF_IO_TERM_RESP_WAIT_MS, TRUE) != WAIT_OBJECT_0)
         {
             SetConsoleMode(hInput, prev_mode);
             return "WaitForSingleObject() failed or timeout";

src/common/jsonconfig.c

@@ -70,6 +70,20 @@ const char* ffJsonConfigParseEnum(yyjson_val* val, int* result, FFKeyValuePair p
         return "Invalid enum value type; must be a string or integer";
 }
 
+static inline yyjson_mut_val* genJson(FFModuleBaseInfo* baseInfo)
+{
+    yyjson_mut_doc* doc = instance.state.resultDoc;
+    if (__builtin_expect(!doc, true)) return NULL;
+
+    yyjson_mut_val* module = yyjson_mut_arr_add_obj(doc, doc->root);
+    yyjson_mut_obj_add_str(doc, module, "type", baseInfo->name);
+    if (baseInfo->generateJson)
+        baseInfo->generateJson(baseInfo, doc, module);
+    else
+        yyjson_mut_obj_add_str(doc, module, "error", "Unsupported for JSON format");
+    return module;
+}
+
 static bool parseModuleJsonObject(const char* type, yyjson_val* jsonVal)
 {
     if(!isalpha(type[0])) return false;
@@ -80,7 +94,8 @@ static bool parseModuleJsonObject(const char* type, yyjson_val* jsonVal)
         if (ffStrEqualsIgnCase(type, baseInfo->name))
         {
             if (jsonVal) baseInfo->parseJsonObject(baseInfo, jsonVal);
-            baseInfo->printModule(baseInfo);
+            if (!genJson(baseInfo))
+                baseInfo->printModule(baseInfo);
             return true;
         }
     }
@@ -97,6 +112,14 @@ static void prepareModuleJsonObject(const char* type, yyjson_val* module)
                 ffPrepareCPUUsage();
             break;
         }
+        case 'n': case 'N': {
+            if (ffStrEqualsIgnCase(type, FF_NETIO_MODULE_NAME))
+            {
+                if (module) ffParseNetIOJsonObject(&cfg->netIo, module);
+                ffPrepareNetIO(&cfg->netIo);
+            }
+            break;
+        }
         case 'p': case 'P': {
             if (ffStrEqualsIgnCase(type, FF_PUBLICIP_MODULE_NAME))
             {
@@ -128,6 +151,8 @@ static const char* printJsonConfig(bool prepare)
     if (!modules) return NULL;
     if (!yyjson_is_arr(modules)) return "Property 'modules' must be an array of strings or objects";
 
+    yyjson_mut_doc* resultDoc = instance.state.resultDoc;
+
     yyjson_val* item;
     size_t idx, max;
     yyjson_arr_foreach(modules, idx, max, item)
@@ -157,16 +182,25 @@ static const char* printJsonConfig(bool prepare)
 
         if(!prepare && instance.config.stat)
         {
-            char str[32];
-            int len = snprintf(str, sizeof str, "%" PRIu64 "ms", ffTimeGetTick() - ms);
-            if(instance.config.pipe)
-                puts(str);
+            ms = ffTimeGetTick() - ms;
+            if (resultDoc)
+            {
+                yyjson_mut_val* moduleJson = yyjson_mut_arr_get_last(resultDoc->root);
+                yyjson_mut_obj_add_uint(resultDoc, moduleJson, "stat", ms);
+            }
             else
-                printf("\033[s\033[1A\033[9999999C\033[%dD%s\033[u", len, str); // Save; Up 1; Right 9999999; Left <len>; Print <str>; Load
+            {
+                char str[32];
+                int len = snprintf(str, sizeof str, "%" PRIu64 "ms", ms);
+                if(instance.config.pipe)
+                    puts(str);
+                else
+                    printf("\033[s\033[1A\033[9999999C\033[%dD%s\033[u", len, str); // Save; Up 1; Right 9999999; Left <len>; Print <str>; Load
+            }
         }
 
         #if defined(_WIN32)
-        if (!instance.config.noBuffer) fflush(stdout);
+        if (!instance.config.noBuffer && !resultDoc) fflush(stdout);
         #endif
     }
 

src/common/jsonconfig.h

@@ -8,3 +8,16 @@ void ffPrintJsonConfig(bool prepare);
 const char* ffParseGeneralJsonConfig(void);
 const char* ffParseDisplayJsonConfig(void);
 const char* ffParseLibraryJsonConfig(void);
+
+yyjson_api_inline bool yyjson_mut_obj_add_strbuf(yyjson_mut_doc *doc,
+                                                  yyjson_mut_val *obj,
+                                                  const char *_key,
+                                                  const FFstrbuf* buf) {
+    return yyjson_mut_obj_add_strncpy(doc, obj, _key, buf->chars, buf->length);
+}
+
+yyjson_api_inline bool yyjson_mut_arr_add_strbuf(yyjson_mut_doc *doc,
+                                                  yyjson_mut_val *obj,
+                                                  const FFstrbuf* buf) {
+    return yyjson_mut_arr_add_strncpy(doc, obj, buf->chars, buf->length);
+}

src/common/modules.c

@@ -82,6 +82,7 @@ static FFModuleBaseInfo* M[] = {
 };
 
 static FFModuleBaseInfo* N[] = {
+    (void*) &instance.config.netIo,
     NULL,
 };
 

src/common/netif/netif.c

@@ -0,0 +1,30 @@
+#include "netif.h"
+
+#ifndef _WIN32
+    #include <net/if.h>
+#else
+    #define IF_NAMESIZE 16
+#endif
+
+bool ffNetifGetDefaultRouteImpl(char iface[IF_NAMESIZE + 1], uint32_t* ifIndex);
+enum { IF_INDEX_UNINITIALIZED = (uint32_t) -1, IF_INDEX_INVALID = (uint32_t) -2 };
+static uint32_t ifIndex = IF_INDEX_UNINITIALIZED;
+static char ifName[IF_NAMESIZE + 1];
+
+static inline void init()
+{
+    if (ifIndex == (uint32_t) IF_INDEX_UNINITIALIZED && !ffNetifGetDefaultRouteImpl(ifName, &ifIndex))
+        ifIndex = (uint32_t) IF_INDEX_INVALID;
+}
+
+const char* ffNetifGetDefaultRouteIfName()
+{
+    init();
+    return ifName;
+}
+
+uint32_t ffNetifGetDefaultRouteIfIndex()
+{
+    init();
+    return ifIndex;
+}

src/common/netif/netif.h

@@ -0,0 +1,9 @@
+#pragma once
+
+#include "fastfetch.h"
+
+#ifndef _WIN32
+const char* ffNetifGetDefaultRouteIfName();
+#endif
+
+uint32_t ffNetifGetDefaultRouteIfIndex();

src/common/netif/netif_bsd.c

@@ -0,0 +1,98 @@
+#include "netif.h"
+
+#include "common/io/io.h"
+
+#include <net/if.h>
+#include <net/if_dl.h>
+#include <net/route.h>
+#include <netinet/in.h>
+#include <sys/socket.h>
+
+#define ROUNDUP2(a, n)       ((a) > 0 ? (1 + (((a) - 1U) | ((n) - 1))) : (n))
+
+#if defined(__APPLE__)
+# define ROUNDUP(a)           ROUNDUP2((a), sizeof(int))
+#elif defined(__NetBSD__)
+# define ROUNDUP(a)           ROUNDUP2((a), sizeof(uint64_t))
+#elif defined(__FreeBSD__)
+# define ROUNDUP(a)           ROUNDUP2((a), sizeof(int))
+#elif defined(__OpenBSD__)
+# define ROUNDUP(a)           ROUNDUP2((a), sizeof(int))
+#else
+# error unknown platform
+#endif
+
+static struct sockaddr *
+get_rt_address(struct rt_msghdr *rtm, int desired)
+{
+    struct sockaddr *sa = (struct sockaddr *)(rtm + 1);
+
+    for (int i = 0; i < RTAX_MAX; i++)
+    {
+        if (rtm->rtm_addrs & (1 << i))
+        {
+            if ((1 <<i ) == desired)
+                return sa;
+            sa = (struct sockaddr *)(ROUNDUP(sa->sa_len) + (char *)sa);
+        }
+    }
+    return NULL;
+}
+
+bool ffNetifGetDefaultRouteImpl(char iface[IF_NAMESIZE + 1], uint32_t* ifIndex)
+{
+    //https://github.com/hashPirate/copenheimer-masscan-fork/blob/36f1ed9f7b751a7dccd5ed27874e2e703db7d481/src/rawsock-getif.c#L104
+
+    FF_AUTO_CLOSE_FD int pfRoute = socket(PF_ROUTE, SOCK_RAW, AF_INET);
+    if (pfRoute < 0)
+        return false;
+
+    {
+        struct timeval timeout = {1, 0};
+        setsockopt(pfRoute, SOL_SOCKET, SO_RCVTIMEO, (char *)&timeout, sizeof(timeout));
+        setsockopt(pfRoute, SOL_SOCKET, SO_SNDTIMEO, (char *)&timeout, sizeof(timeout));
+    }
+
+    int pid = getpid();
+
+    struct {
+        struct rt_msghdr hdr;
+        struct sockaddr_in dst;
+        uint8_t data[512];
+    } rtmsg = {
+        .hdr = {
+            .rtm_type = RTM_GET,
+            .rtm_flags = RTF_UP | RTF_GATEWAY,
+            .rtm_version = RTM_VERSION,
+            .rtm_addrs = RTA_DST | RTA_IFP,
+            .rtm_msglen = sizeof(rtmsg.hdr) + sizeof(rtmsg.dst),
+            .rtm_pid = pid,
+            .rtm_seq = 1,
+        },
+        .dst = {
+            .sin_family = AF_INET,
+            .sin_len = sizeof(rtmsg.dst),
+        },
+    };
+
+    if (write(pfRoute, &rtmsg, rtmsg.hdr.rtm_msglen) != rtmsg.hdr.rtm_msglen)
+        return false;
+
+    while (read(pfRoute, &rtmsg, sizeof(rtmsg)) > 0)
+    {
+        if (rtmsg.hdr.rtm_seq == 1 && rtmsg.hdr.rtm_pid == pid)
+        {
+            struct sockaddr_dl* sdl = (struct sockaddr_dl *)get_rt_address(&rtmsg.hdr, RTA_IFP);
+            if (sdl)
+            {
+                assert(sdl->sdl_nlen <= IF_NAMESIZE);
+                memcpy(iface, sdl->sdl_data, sdl->sdl_nlen);
+                iface[sdl->sdl_nlen] = '\0';
+                *ifIndex = sdl->sdl_index;
+                return true;
+            }
+            return false;
+        }
+    }
+    return false;
+}

src/common/netif/netif_linux.c

@@ -0,0 +1,28 @@
+#include "netif.h"
+#include "common/io/io.h"
+
+#include <net/if.h>
+#include <stdio.h>
+
+#define FF_STR_INDIR(x) #x
+#define FF_STR(x) FF_STR_INDIR(x)
+
+bool ffNetifGetDefaultRouteImpl(char iface[IF_NAMESIZE + 1], uint32_t* ifIndex)
+{
+    FILE* FF_AUTO_CLOSE_FILE netRoute = fopen("/proc/net/route", "r");
+    if (!netRoute) return false;
+
+    // skip first line
+    flockfile(netRoute);
+    while (getc_unlocked(netRoute) != '\n');
+    funlockfile(netRoute);
+    unsigned long long destination; //, gateway, flags, refCount, use, metric, mask, mtu,
+
+    while (fscanf(netRoute, "%" FF_STR(IF_NAMESIZE) "s%llx%*[^\n]", iface, &destination) == 2)
+    {
+        if (destination != 0) continue;
+        *ifIndex = if_nametoindex(iface);
+        return true;
+    }
+    return false;
+}

src/common/netif/netif_windows.c

@@ -0,0 +1,27 @@
+#include "netif.h"
+#include "util/mallocHelper.h"
+
+#include <iphlpapi.h>
+
+bool ffNetifGetDefaultRouteImpl(FF_MAYBE_UNUSED char* iface/* unsupported */, uint32_t* ifIndex)
+{
+    ULONG size = 0;
+    if (GetIpForwardTable(NULL, &size, TRUE) != ERROR_INSUFFICIENT_BUFFER)
+        return false;
+
+    FF_AUTO_FREE MIB_IPFORWARDTABLE* pIpForwardTable = (MIB_IPFORWARDTABLE*) malloc(size);
+    if (GetIpForwardTable(pIpForwardTable, &size, TRUE) != ERROR_SUCCESS)
+        return false;
+
+    for (uint32_t i = 0; i < pIpForwardTable->dwNumEntries; ++i)
+    {
+        MIB_IPFORWARDROW* ipForwardRow = &pIpForwardTable->table[i];
+        if (ipForwardRow->dwForwardDest == 0 && ipForwardRow->dwForwardMask == 0)
+        {
+            *ifIndex = ipForwardRow->dwForwardIfIndex;
+            break;
+        }
+    }
+
+    return true;
+}

src/common/networking_linux.c

@@ -77,7 +77,8 @@ bool ffNetworkingSendHttpRequest(FFNetworkingState* state, const char* host, con
 bool ffNetworkingRecvHttpResponse(FFNetworkingState* state, FFstrbuf* buffer, uint32_t timeout)
 {
     #ifdef FF_HAVE_THREADS
-        ffThreadJoin(state->thread);
+        if (!ffThreadJoin(state->thread, timeout))
+            return false;
     #endif
     if(state->sockfd == -1)
         return false;
@@ -85,8 +86,8 @@ bool ffNetworkingRecvHttpResponse(FFNetworkingState* state, FFstrbuf* buffer, ui
     if(timeout > 0)
     {
         struct timeval timev;
-        timev.tv_sec = 0;
-        timev.tv_usec = (__typeof__(timev.tv_usec)) (timeout * 1000); //milliseconds to microseconds
+        timev.tv_sec = timeout / 1000;
+        timev.tv_usec = (__typeof__(timev.tv_usec)) ((timeout % 1000) * 1000); //milliseconds to microseconds
         setsockopt(state->sockfd, SOL_SOCKET, SO_RCVTIMEO, &timev, sizeof(timev));
     }
 

src/common/option.h

@@ -3,14 +3,21 @@
 #include "util/FFstrbuf.h"
 
 struct yyjson_val;
+struct yyjson_mut_doc;
+struct yyjson_mut_val;
 
 // Must be the first field of FFModuleOptions
 typedef struct FFModuleBaseInfo
 {
     const char* name;
+    // A dirty polymorphic implementation in C.
+    // This is UB, because `void*` is not compatible with `FF*Options*`.
+    // However we can't do it better unless we move to C++, so that `option` becomes a `this` pointer
+    // https://stackoverflow.com/questions/559581/casting-a-function-pointer-to-another-type
     bool (*parseCommandOptions)(void* options, const char* key, const char* value);
     void (*parseJsonObject)(void* options, struct yyjson_val *module);
     void (*printModule)(void* options);
+    void (*generateJson)(void* options, struct yyjson_mut_doc* doc, struct yyjson_mut_val* module);
 } FFModuleBaseInfo;
 
 static inline void ffOptionInitModuleBaseInfo(
@@ -18,13 +25,15 @@ static inline void ffOptionInitModuleBaseInfo(
     const char* name,
     void* parseCommandOptions, // bool (*const parseCommandOptions)(void* options, const char* key, const char* value)
     void* parseJsonObject, // void (*const parseJsonObject)(void* options, yyjson_val *module)
-    void* printModule // void (*const printModule)(void* options)
+    void* printModule, // void (*const printModule)(void* options)
+    void* generateJson // void (*const generateJson)(void* options, yyjson_mut_doc* doc, yyjson_mut_val* obj)
 )
 {
     baseInfo->name = name;
     baseInfo->parseCommandOptions = (__typeof__(baseInfo->parseCommandOptions)) parseCommandOptions;
     baseInfo->parseJsonObject = (__typeof__(baseInfo->parseJsonObject)) parseJsonObject;
     baseInfo->printModule = (__typeof__(baseInfo->printModule)) printModule;
+    baseInfo->generateJson = (__typeof__(baseInfo->generateJson)) generateJson;
 }
 
 typedef struct FFModuleArgs

src/common/printing.c

@@ -10,6 +10,10 @@ void ffPrintLogoAndKey(const char* moduleName, uint8_t moduleIndex, const FFModu
     if(moduleName == NULL)
         return;
 
+    //This is used as a magic value for hiding keys
+    if(moduleArgs && ffStrbufEqualS(&moduleArgs->key, " "))
+        return;
+
     if(!instance.config.pipe)
     {
         fputs(FASTFETCH_TEXT_MODIFIER_RESET, stdout);
@@ -112,9 +116,7 @@ void ffPrintColor(const FFstrbuf* colorValue)
     if(colorValue->length == 0)
         return;
 
-    fputs("\033[", stdout);
-    ffStrbufWriteTo(colorValue, stdout);
-    fputc('m', stdout);
+    printf("\e[%sm", colorValue->chars);
 }
 
 void ffPrintCharTimes(char c, uint32_t times)

src/common/processing_linux.c

@@ -38,6 +38,7 @@ const char* ffProcessAppendOutput(FFstrbuf* buffer, char* const argv[], bool use
         close(pipes[0]);
         close(pipes[1]);
         close(useStdErr ? STDOUT_FILENO : STDERR_FILENO);
+        setenv("LANG", "C", 1);
         execvp(argv[0], argv);
         exit(901);
     }

src/common/thread.h

@@ -10,6 +10,7 @@
         #include <handleapi.h>
         #include <synchapi.h>
         #include <process.h>
+        #include <processthreadsapi.h>
         #define FF_THREAD_MUTEX_INITIALIZER SRWLOCK_INIT
         typedef SRWLOCK FFThreadMutex;
         typedef HANDLE FFThreadType;
@@ -21,9 +22,23 @@
         #define FF_THREAD_ENTRY_DECL_WRAPPER(fn, paramType) static __stdcall unsigned fn ## ThreadMain (void* data) { fn((paramType)data); return 0; }
         #define FF_THREAD_ENTRY_DECL_WRAPPER_NOPARAM(fn) static __stdcall unsigned fn ## ThreadMain () { fn(); return 0; }
         static inline void ffThreadDetach(FFThreadType thread) { CloseHandle(thread); }
-        static inline void ffThreadJoin(FFThreadType thread) { WaitForSingleObject(thread, 0xffffffff /*INFINITE*/); }
+        static inline bool ffThreadJoin(FFThreadType thread, uint32_t timeout)
+        {
+            if (WaitForSingleObject(thread, timeout == 0 ? (DWORD) -1 : timeout) != 0 /*WAIT_OBJECT_0*/)
+            {
+                TerminateThread(thread, (DWORD) -1);
+                CloseHandle(thread);
+                return false;
+            }
+            CloseHandle(thread);
+            return true;
+        }
     #else
         #include <pthread.h>
+        #include <signal.h>
+        #if __has_include(<pthread_np.h>)
+            #include <pthread_np.h>
+        #endif
         #define FF_THREAD_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER
         typedef pthread_mutex_t FFThreadMutex;
         typedef pthread_t FFThreadType;
@@ -37,7 +52,28 @@
         #define FF_THREAD_ENTRY_DECL_WRAPPER(fn, paramType) static void* fn ## ThreadMain (void* data) { fn((paramType)data); return NULL; }
         #define FF_THREAD_ENTRY_DECL_WRAPPER_NOPARAM(fn) static void* fn ## ThreadMain () { fn(); return NULL; }
         static inline void ffThreadDetach(FFThreadType thread) { pthread_detach(thread); }
-        static inline void ffThreadJoin(FFThreadType thread) { pthread_join(thread, NULL); }
+        static inline bool ffThreadJoin(FFThreadType thread, FF_MAYBE_UNUSED uint32_t timeout)
+        {
+            #if (defined(__linux__) && !defined(__ANDROID__)) || __has_include(<pthread_np.h>)
+                if (timeout > 0)
+                {
+                    struct timespec ts;
+                    if (clock_gettime(CLOCK_REALTIME, &ts) == 0)
+                    {
+                        ts.tv_sec += ts.tv_sec / 1000;
+                        ts.tv_nsec += (ts.tv_nsec % 1000) * 1000000;
+                        if (pthread_timedjoin_np(thread, NULL, &ts) != 0)
+                        {
+                            pthread_kill(thread, SIGTERM);
+                            return false;
+                        }
+                        return true;
+                    }
+                }
+            #endif
+            pthread_join(thread, NULL);
+            return true;
+        }
     #endif
 #else //FF_HAVE_THREADS
     #define FF_THREAD_MUTEX_INITIALIZER 0

src/common/time.h

@@ -7,6 +7,7 @@
 #ifdef _WIN32
     #include <synchapi.h>
     #include <profileapi.h>
+    #include <sysinfoapi.h>
 #else
     #include <time.h>
 #endif
@@ -26,6 +27,19 @@ static inline uint64_t ffTimeGetTick() //In msec
     #endif
 }
 
+static inline uint64_t ffTimeGetNow()
+{
+    #ifdef _WIN32
+        uint64_t timeNow;
+        GetSystemTimeAsFileTime((FILETIME*) &timeNow);
+        return (timeNow - 116444736000000000ull) / 10000ull;
+    #else
+        struct timespec timeNow;
+        clock_gettime(CLOCK_REALTIME, &timeNow);
+        return (uint64_t)((timeNow.tv_sec * 1000) + (timeNow.tv_nsec / 1000000));
+    #endif
+}
+
 static inline void ffTimeSleep(uint32_t msec)
 {
     #ifdef _WIN32

src/data/config_user.txt

@@ -360,7 +360,7 @@
 #--terminal-key Terminal
 #--terminalfont-key Terminal Font
 #--cpu-key CPU
-#--cpu-usage-key CPU Usage
+#--cpuusage-key CPU Usage
 #--gpu-key GPU {1}
 #--memory-key Memory
 #--swap-key Swap
@@ -370,6 +370,7 @@
 #--lm-key LM
 #--locale-key Locale
 #--localip-key Local IP ({1})
+#--netio-key Network IO ({1})
 #--publicip-key Public IP
 #--wifi-key Wifi
 #--weather-key Weather
@@ -391,6 +392,7 @@
 # For information on format strings, see "fastfetch --help format".
 # To see the parameter they take and their default value, see "fastfetch --help *-format", e.g. "fastfetch --help os-format".
 # An empty format string (As they are currently below) will behave as if it was not set.
+#--title-format
 #--os-format
 #--host-format
 #--chassis-format
@@ -411,7 +413,7 @@
 #--terminal-format
 #--terminalfont-format
 #--cpu-format
-#--cpu-usage-format
+#--cpuusage-format
 #--gpu-format
 #--memory-format
 #--swap-format
@@ -421,6 +423,7 @@
 #--lm-format
 #--locale-format
 #--localip-format
+#--netio-format
 #--publicip-format
 #--weather-format
 #--monitor-format
@@ -439,6 +442,7 @@
 
 # Key color options:
 # Overrides the global `--color-keys` for one specified module
+#--title-key-color
 #--os-key-color
 #--host-key-color
 #--chassis-key-color
@@ -459,7 +463,7 @@
 #--terminal-key-color
 #--terminalfont-key-color
 #--cpu-key-color
-#--cpu-usage-key-color
+#--cpuusage-key-color
 #--gpu-key-color
 #--memory-key-color
 #--swap-key-color
@@ -469,6 +473,7 @@
 #--lm-key-color
 #--locale-key-color
 #--localip-key-color
+#--netio-key-color
 #--publicip-key-color
 #--weather-key-color
 #--monitor-key-color

src/data/help.txt

@@ -147,9 +147,11 @@ Module specific options:
     --localip-show-ipv6 <?value>:            Show IPv6 addresses in local ip module. Default is false
     --localip-show-mac <?value>:             Show mac addresses in local ip module. Default is false
     --localip-show-loop <?value>:            Show loop back addresses (127.0.0.1) in local ip module. Default is false
-    --localip-name-prefix <str>:             Show IPs with given name prefix only. Default is empty
-    --localip-default-route-only <?value>:   Show ips that are used for default routing only. Default is false
+    --localip-name-prefix <str>:             Show interfaces with given interface name prefix only. Default is empty
+    --localip-default-route-only <?value>:   Show the interface that is used for default routing only. Default is false
     --localip-compact <?value>:              Show all IPs in one line. Default is false
+    --netio-name-prefix <str>:            Show interfaces with given name prefix only. Default is empty
+    --netio-default-route-only <?value>:  Show the interfac that is used for default routing only. Default is false
     --publicip-timeout:                      Time in milliseconds to wait for the public ip server to respond. Default is disabled (0)
     --publicip-url:                          The URL of public IP detection server to be used.
     --weather-location:                      Set the location to be used. It must be URI encoded (eg a whitespace must be encoded as `+`).

src/detection/battery/battery.h

@@ -7,7 +7,7 @@
 
 #define FF_BATTERY_TEMP_UNSET (0/0.0)
 
-typedef struct BatteryResult
+typedef struct FFBatteryResult
 {
     FFstrbuf manufacturer;
     FFstrbuf modelName;
@@ -15,7 +15,7 @@ typedef struct BatteryResult
     double capacity;
     FFstrbuf status;
     double temperature;
-} BatteryResult;
+} FFBatteryResult;
 
 const char* ffDetectBattery(FFBatteryOptions* options, FFlist* results);
 

src/detection/battery/battery_android.c

@@ -33,7 +33,7 @@ static const char* parseTermuxApi(FFBatteryOptions* options, FFlist* results)
     if (!yyjson_is_obj(root))
         return "Battery info result is not a JSON object";
 
-    BatteryResult* battery = ffListAdd(results);
+    FFBatteryResult* battery = ffListAdd(results);
     battery->temperature = FF_BATTERY_TEMP_UNSET;
     ffStrbufInit(&battery->manufacturer);
     ffStrbufInit(&battery->modelName);
@@ -68,7 +68,7 @@ static const char* parseDumpsys(FFBatteryOptions* options, FFlist* results)
         return NULL;
     ffStrbufClear(&temp);
 
-    BatteryResult* battery = ffListAdd(results);
+    FFBatteryResult* battery = ffListAdd(results);
     battery->temperature = FF_BATTERY_TEMP_UNSET;
     ffStrbufInit(&battery->manufacturer);
     ffStrbufInit(&battery->modelName);
@@ -78,7 +78,7 @@ static const char* parseDumpsys(FFBatteryOptions* options, FFlist* results)
     if (ffParsePropLines(start, "AC powered: ", &temp) && ffStrbufEqualS(&temp, "true"))
         ffStrbufAppendS(&battery->status, "AC powered");
     ffStrbufClear(&temp);
-    
+
     if (ffParsePropLines(start, "USB powered: ", &temp) && ffStrbufEqualS(&temp, "true"))
     {
         if (battery->status.length) ffStrbufAppendS(&battery->status, ", ");

src/detection/battery/battery_apple.c

@@ -38,7 +38,7 @@ const char* ffDetectBattery(FFBatteryOptions* options, FFlist* results)
         bool boolValue;
         const char* error;
 
-        BatteryResult* battery = ffListAdd(results);
+        FFBatteryResult* battery = ffListAdd(results);
         battery->capacity = 0.0/0.0;
         int currentCapacity, maxCapacity;
 

src/detection/battery/battery_bsd.c

@@ -32,7 +32,7 @@ const char* ffDetectBattery(FF_MAYBE_UNUSED FFBatteryOptions* options, FFlist* r
         if(ioctl(acpifd, ACPIIO_BATT_GET_BATTINFO, &battio) < 0 || (battio.battinfo.state == ACPI_BATT_STAT_NOT_PRESENT))
             continue;
 
-        BatteryResult* battery = ffListAdd(results);
+        FFBatteryResult* battery = ffListAdd(results);
         battery->temperature = FF_BATTERY_TEMP_UNSET;
         ffStrbufInit(&battery->manufacturer);
         ffStrbufInit(&battery->modelName);

src/detection/battery/battery_linux.c

@@ -27,7 +27,7 @@ static void parseBattery(FFstrbuf* dir, FFlist* results)
     if(ffStrbufIgnCaseCompS(&testBatteryBuffer, "Device") == 0)
         return;
 
-    BatteryResult* result = ffListAdd(results);
+    FFBatteryResult* result = ffListAdd(results);
 
     //capacity must exist and be not empty
     ffStrbufAppendS(dir, "/capacity");

src/detection/battery/battery_windows.c

@@ -74,7 +74,7 @@ const char* ffDetectBattery(FFBatteryOptions* options, FFlist* results)
             if(!(bi.Capabilities & BATTERY_SYSTEM_BATTERY))
                 continue;
 
-            BatteryResult* battery = (BatteryResult*)ffListAdd(results);
+            FFBatteryResult* battery = (FFBatteryResult*)ffListAdd(results);
 
             if(memcmp(bi.Chemistry, "PbAc", 4) == 0)
                 ffStrbufInitS(&battery->technology, "Lead Acid");
@@ -143,7 +143,7 @@ const char* ffDetectBattery(FFBatteryOptions* options, FFlist* results)
         SYSTEM_BATTERY_STATE info;
         if (NT_SUCCESS(NtPowerInformation(SystemBatteryState, NULL, 0, &info, sizeof(info))) && info.BatteryPresent)
         {
-            BatteryResult* battery = (BatteryResult*)ffListAdd(results);
+            FFBatteryResult* battery = (FFBatteryResult*)ffListAdd(results);
             ffStrbufInit(&battery->modelName);
             ffStrbufInit(&battery->manufacturer);
             ffStrbufInit(&battery->technology);

src/detection/bluetooth/bluetooth.h

@@ -5,15 +5,15 @@
 
 #include "fastfetch.h"
 
-typedef struct FFBluetoothDevice
+typedef struct FFBluetoothResult
 {
     FFstrbuf name;
     FFstrbuf address;
     FFstrbuf type;
     uint8_t battery; // 0-100%
     bool connected;
-} FFBluetoothDevice;
+} FFBluetoothResult;
 
-const char* ffDetectBluetooth(FFlist* devices /* FFBluetoothDevice */);
+const char* ffDetectBluetooth(FFlist* devices /* FFBluetoothResult */);
 
 #endif

src/detection/bluetooth/bluetooth_apple.m

@@ -2,7 +2,7 @@
 
 #import <IOBluetooth/IOBluetooth.h>
 
-const char* ffDetectBluetooth(FFlist* devices /* FFBluetoothDevice */)
+const char* ffDetectBluetooth(FFlist* devices /* FFBluetoothResult */)
 {
     NSArray<IOBluetoothDevice*>* ioDevices = IOBluetoothDevice.pairedDevices;
     if(!ioDevices)
@@ -10,7 +10,7 @@ const char* ffDetectBluetooth(FFlist* devices /* FFBluetoothDevice */)
 
     for(IOBluetoothDevice* ioDevice in ioDevices)
     {
-        FFBluetoothDevice* device = ffListAdd(devices);
+        FFBluetoothResult* device = ffListAdd(devices);
         ffStrbufInitS(&device->name, ioDevice.name.UTF8String);
         ffStrbufInitS(&device->address, ioDevice.addressString.UTF8String);
         ffStrbufInit(&device->type);

src/detection/bluetooth/bluetooth_linux.c

@@ -44,7 +44,7 @@ array [                                                     //root
 ]
 */
 
-static void detectBluetoothValue(FFDBusData* dbus, DBusMessageIter* iter, FFBluetoothDevice* device)
+static void detectBluetoothValue(FFDBusData* dbus, DBusMessageIter* iter, FFBluetoothResult* device)
 {
     if(dbus->lib->ffdbus_message_iter_get_arg_type(iter) != DBUS_TYPE_DICT_ENTRY)
         return;
@@ -72,7 +72,7 @@ static void detectBluetoothValue(FFDBusData* dbus, DBusMessageIter* iter, FFBlue
         ffDBusGetBool(dbus, &dictIter, &device->connected);
 }
 
-static void detectBluetoothProperty(FFDBusData* dbus, DBusMessageIter* iter, FFBluetoothDevice* device)
+static void detectBluetoothProperty(FFDBusData* dbus, DBusMessageIter* iter, FFBluetoothResult* device)
 {
     if(dbus->lib->ffdbus_message_iter_get_arg_type(iter) != DBUS_TYPE_DICT_ENTRY)
         return;
@@ -130,7 +130,7 @@ static void detectBluetoothObject(FFlist* devices, FFDBusData* dbus, DBusMessage
     DBusMessageIter arrayIter;
     dbus->lib->ffdbus_message_iter_recurse(&dictIter, &arrayIter);
 
-    FFBluetoothDevice* device = ffListAdd(devices);
+    FFBluetoothResult* device = ffListAdd(devices);
     ffStrbufInit(&device->name);
     ffStrbufInit(&device->address);
     ffStrbufInit(&device->type);
@@ -193,7 +193,7 @@ static const char* detectBluetooth(FFlist* devices)
 
 #endif
 
-const char* ffDetectBluetooth(FF_MAYBE_UNUSED FFlist* devices /* FFBluetoothDevice */)
+const char* ffDetectBluetooth(FF_MAYBE_UNUSED FFlist* devices /* FFBluetoothResult */)
 {
     #ifdef FF_HAVE_DBUS
         return detectBluetooth(devices);

src/detection/bluetooth/bluetooth_nosupport.c

@@ -1,6 +1,6 @@
 #include "bluetooth.h"
 
-const char* ffDetectBluetooth(FF_MAYBE_UNUSED FFlist* devices /* FFBluetoothDevice */)
+const char* ffDetectBluetooth(FF_MAYBE_UNUSED FFlist* devices /* FFBluetoothResult */)
 {
     return "Not supported on this platform";
 }

src/detection/bluetooth/bluetooth_windows.c

@@ -7,7 +7,7 @@
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wpointer-sign"
 
-const char* ffDetectBluetooth(FFlist* devices /* FFBluetoothDevice */)
+const char* ffDetectBluetooth(FFlist* devices /* FFBluetoothResult */)
 {
     BLUETOOTH_DEVICE_SEARCH_PARAMS btsp = {
         .fReturnConnected = TRUE,
@@ -25,7 +25,7 @@ const char* ffDetectBluetooth(FFlist* devices /* FFBluetoothDevice */)
         return "BluetoothFindFirstDevice() failed or no devices found";
 
     do {
-        FFBluetoothDevice* device = ffListAdd(devices);
+        FFBluetoothResult* device = ffListAdd(devices);
         ffStrbufInit(&device->name);
         ffStrbufInit(&device->address);
         ffStrbufInit(&device->type);
@@ -33,9 +33,14 @@ const char* ffDetectBluetooth(FFlist* devices /* FFBluetoothDevice */)
         device->connected = !!btdi.fConnected;
 
         ffStrbufSetWS(&device->name, btdi.szName);
-        for (uint32_t i = 0; i < sizeof(btdi.Address.rgBytes) / sizeof(btdi.Address.rgBytes); ++i)
-            ffStrbufAppendF(&device->address, "%X:", btdi.Address.rgBytes[i]);
-        ffStrbufTrimRight(&device->name, ':');
+
+        ffStrbufAppendF(&device->address, "%02x:%02x:%02x:%02x:%02x:%02x",
+            btdi.Address.rgBytes[0],
+            btdi.Address.rgBytes[1],
+            btdi.Address.rgBytes[2],
+            btdi.Address.rgBytes[3],
+            btdi.Address.rgBytes[4],
+            btdi.Address.rgBytes[5]);
         //https://btprodspecificationrefs.blob.core.windows.net/assigned-numbers/Assigned%20Number%20Types/Assigned%20Numbers.pdf
 
         if(BitTest(&btdi.ulClassofDevice, 13))

src/detection/brightness/brightness.h

@@ -9,7 +9,7 @@
 typedef struct FFBrightnessResult
 {
     FFstrbuf name;
-    float value;
+    double min, max, current;
 } FFBrightnessResult;
 
 const char* ffDetectBrightness(FFlist* result); // list of FFBrightnessResult

src/detection/brightness/brightness_apple.c

@@ -20,7 +20,9 @@ static const char* detectWithDisplayServices(const FFDisplayServerResult* displa
             if(DisplayServicesGetBrightness((CGDirectDisplayID) display->id, &value) == kCGErrorSuccess)
             {
                 FFBrightnessResult* brightness = (FFBrightnessResult*) ffListAdd(result);
-                brightness->value = value * 100;
+                brightness->current = value;
+                brightness->max = 1;
+                brightness->min = 0;
                 ffStrbufInitCopy(&brightness->name, &display->name);
             }
         }
@@ -90,7 +92,9 @@ FF_MAYBE_UNUSED static const char* detectWithDdcci(FFlist* result)
             uint32_t max = ((uint32_t) i2cOut[6] << 8u) + (uint32_t) i2cOut[7];
 
             FFBrightnessResult* brightness = (FFBrightnessResult*) ffListAdd(result);
-            brightness->value = (float) current * 100.f / max;
+            brightness->max = max;
+            brightness->min = 0;
+            brightness->current = current;
             ffStrbufInit(&brightness->name);
 
             uint8_t edid[128] = {};

src/detection/brightness/brightness_bsd.c

@@ -26,13 +26,16 @@ const char* ffDetectBrightness(FFlist* result)
         if(ioctl(blfd, BACKLIGHTGETSTATUS, &status) < 0)
             continue;
 
-        FFBrightnessResult* display = (FFBrightnessResult*) ffListAdd(result);
-        ffStrbufInit(&display->name);
-        display->value = (float) status.brightness / BACKLIGHTMAXLEVELS;
+        FFBrightnessResult* brightness = (FFBrightnessResult*) ffListAdd(result);
+        ffStrbufInit(&brightness->name);
+
+        brightness->max = BACKLIGHTMAXLEVELS;
+        brightness->min = 0;
+        brightness->current = status.brightness;
 
         struct backlight_info info;
         if(ioctl(blfd, BACKLIGHTGETINFO, &info) < 0)
-            ffStrbufAppendS(&display->name, info.name);
+            ffStrbufAppendS(&brightness->name, info.name);
     }
     return NULL;
 }
@@ -44,4 +47,4 @@ const char* ffDetectBrightness(FF_MAYBE_UNUSED FFlist* result)
     return "Backlight is supported only on FreeBSD 13 and newer";
 }
 
-#endif
+#endif

src/detection/brightness/brightness_linux.c

@@ -72,8 +72,9 @@ static const char* detectWithBacklight(FFlist* result)
                 }
                 else
                     ffStrbufInitS(&brightness->name, entry->d_name);
-                double maxBrightness = ffStrbufToDouble(&buffer);
-                brightness->value = (float) (actualBrightness * 100 / maxBrightness);
+                brightness->max = ffStrbufToDouble(&buffer);
+                brightness->min = 0;
+                brightness->current = actualBrightness;
             }
         }
         ffStrbufSubstrBefore(&backlightDir, backlightDirLength);
@@ -123,7 +124,9 @@ static const char* detectWithDdcci(FFlist* result)
                 ffddca_free_any_vcp_value(vcpValue);
 
                 FFBrightnessResult* brightness = (FFBrightnessResult*) ffListAdd(result);
-                brightness->value = (float) current * 100.f / (float) max;
+                brightness->max = max;
+                brightness->min = 0;
+                brightness->current = current;
                 ffStrbufInitS(&brightness->name, display->model_name);
             }
             ffddca_close_display(handle);

src/detection/brightness/brightness_windows.cpp

@@ -20,7 +20,9 @@ static const char* detectWithWmi(FFlist* result)
         if(FFWmiVariant vtValue = record.get(L"CurrentBrightness"))
         {
             FFBrightnessResult* brightness = (FFBrightnessResult*) ffListAdd(result);
-            brightness->value = vtValue.get<uint8_t>();
+            brightness->max = 100;
+            brightness->min = 0;
+            brightness->current = vtValue.get<uint8_t>();
 
             ffStrbufInit(&brightness->name);
             if (FFWmiVariant vtName = record.get(L"InstanceName"))
@@ -51,7 +53,9 @@ static char* detectWithDdcci(const FFDisplayServerResult* displayServer, FFlist*
                 else
                     ffStrbufInitWS(&brightness->name, physicalMonitor.szPhysicalMonitorDescription);
 
-                brightness->value = (float) (curr - min) * 100.f / (float) (max - min);
+                brightness->max = max;
+                brightness->min = min;
+                brightness->current = curr;
             }
         }
     }

src/detection/chassis/chassis_linux.c

@@ -25,7 +25,7 @@ const char* ffDetectChassis(FFChassisResult* result)
 
     if(result->type.length)
     {
-        const char* typeStr = ffChassisTypeToString(ffStrbufToUInt16(&result->type, 9999));
+        const char* typeStr = ffChassisTypeToString((uint32_t) ffStrbufToUInt(&result->type, 9999));
         if(typeStr)
             ffStrbufSetS(&result->type, typeStr);
     }

src/detection/cpu/cpu_apple.c

@@ -2,17 +2,6 @@
 #include "common/sysctl.h"
 #include "detection/temps/temps_apple.h"
 
-static double getFrequency(const char* propName)
-{
-    double herz = (double) ffSysctlGetInt64(propName, 0);
-    if(herz <= 0.0)
-        return herz;
-
-    herz /= 1000.0; //to KHz
-    herz /= 1000.0; //to MHz
-    return herz / 1000.0; //to GHz
-}
-
 static double detectCpuTemp(const FFstrbuf* cpuName)
 {
     double result = 0;
@@ -31,11 +20,85 @@ static double detectCpuTemp(const FFstrbuf* cpuName)
     return result;
 }
 
+#ifdef __aarch64__
+#include "util/apple/cf_helpers.h"
+
+#include <IOKit/IOKitLib.h>
+
+static const char* detectFrequency(FFCPUResult* cpu)
+{
+    // https://github.com/giampaolo/psutil/pull/2222/files
+
+    CFMutableDictionaryRef matchDict = IOServiceMatching("AppleARMIODevice");
+    if (matchDict == NULL)
+        return "IOServiceMatching(\"AppleARMIODevice\") failed";
+
+    io_iterator_t iterator;
+    if(IOServiceGetMatchingServices(MACH_PORT_NULL, matchDict, &iterator) != kIOReturnSuccess)
+        return "IOServiceGetMatchingServices() failed";
+
+    io_registry_entry_t registryEntry;
+    while((registryEntry = IOIteratorNext(iterator)) != 0)
+    {
+        CFMutableDictionaryRef properties;
+        if(IORegistryEntryCreateCFProperties(registryEntry, &properties, kCFAllocatorDefault, kNilOptions) != kIOReturnSuccess)
+        {
+            IOObjectRelease(registryEntry);
+            continue;
+        }
+
+        io_name_t name;
+        if (IORegistryEntryGetName(registryEntry, name) != KERN_SUCCESS)
+            continue;
+        if (strcmp(name, "pmgr") != 0)
+            continue;
+
+        uint32_t pMin, eMin, aMax, pCoreLength;
+        ffCfDictGetData(properties, CFSTR("voltage-states5-sram"), 0, 4, (uint8_t*) &pMin, &pCoreLength); // pCore
+        ffCfDictGetData(properties, CFSTR("voltage-states1-sram"), 0, 4, (uint8_t*) &eMin, NULL); // eCore
+        cpu->frequencyMin = (pMin < eMin ? pMin : eMin) / (1000.0 * 1000 * 1000);
+
+        if (pCoreLength >= 8)
+        {
+            ffCfDictGetData(properties, CFSTR("voltage-states5-sram"), pCoreLength - 8, 4, (uint8_t*) &aMax, NULL);
+            cpu->frequencyMax = aMax / (1000.0 * 1000 * 1000);
+        }
+        else
+            cpu->frequencyMax = 0.0;
+
+        CFRelease(properties);
+        IOObjectRelease(registryEntry);
+    }
+
+    IOObjectRelease(iterator);
+    return NULL;
+}
+#else
+static const char* detectFrequency(FFCPUResult* cpu)
+{
+    cpu->frequencyMin = ffSysctlGetInt64("hw.cpufrequency_min", 0) / 1000.0 / 1000.0 / 1000.0;
+    cpu->frequencyMax = ffSysctlGetInt64("hw.cpufrequency_max", 0);
+    if(cpu->frequencyMax > 0.0)
+        cpu->frequencyMax /= 1000.0 * 1000.0 * 1000.0;
+    else
+    {
+        unsigned current = 0;
+        size_t size = sizeof(current);
+        if (sysctl((int[]){ CTL_HW, HW_CPU_FREQ }, 2, &current, &size, NULL, 0) == 0)
+            cpu->frequencyMax = (double) current / 1000.0 / 1000.0 / 1000.0;
+    }
+    return NULL;
+}
+#endif
+
 const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
 {
     if (ffSysctlGetString("machdep.cpu.brand_string", &cpu->name) != NULL)
         return "sysctlbyname(machdep.cpu.brand_string) failed";
+
     ffSysctlGetString("machdep.cpu.vendor", &cpu->vendor);
+    if (cpu->vendor.length == 0 && ffStrbufStartsWithS(&cpu->name, "Apple "))
+        ffStrbufAppendS(&cpu->vendor, "Apple");
 
     cpu->coresPhysical = (uint16_t) ffSysctlGetInt("hw.physicalcpu_max", 1);
     if(cpu->coresPhysical == 1)
@@ -49,10 +112,7 @@ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
     if(cpu->coresOnline == 1)
         cpu->coresOnline = (uint16_t) ffSysctlGetInt("hw.activecpu", 1);
 
-    cpu->frequencyMin = getFrequency("hw.cpufrequency_min");
-    cpu->frequencyMax = getFrequency("hw.cpufrequency_max");
-    if(cpu->frequencyMax == 0.0)
-        cpu->frequencyMax = getFrequency("hw.cpufrequency");
+    detectFrequency(cpu);
 
     cpu->temperature = options->temp ? detectCpuTemp(&cpu->name) : FF_CPU_TEMP_UNSET;
 

src/detection/cpu/cpu_linux.c

@@ -1,5 +1,6 @@
 #include "cpu.h"
 #include "common/io/io.h"
+#include "common/processing.h"
 #include "common/properties.h"
 #include "detection/temps/temps_linux.h"
 #include "util/mallocHelper.h"
@@ -128,7 +129,7 @@ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
     const char* error = parseCpuInfo(cpu, &physicalCoresBuffer, &cpuMHz, &cpuIsa, &cpuUarch);
     if (error) return error;
 
-    cpu->coresPhysical = ffStrbufToUInt16(&physicalCoresBuffer, 1);
+    cpu->coresPhysical = (uint16_t) ffStrbufToUInt(&physicalCoresBuffer, 1);
 
     cpu->coresLogical = (uint16_t) get_nprocs_conf();
     cpu->coresOnline = (uint16_t) get_nprocs();
@@ -163,5 +164,17 @@ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
     detectAndroid(cpu);
     #endif
 
+    #ifdef __linux__
+    if (cpu->name.length == 0)
+    {
+        FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
+        if (!ffProcessAppendStdOut(&buffer, (char *const[]) { "lscpu", NULL }))
+        {
+            ffParsePropLines(buffer.chars, "Model name:", &cpu->name);
+            if (ffStrbufEqualS(&cpu->name, "-")) ffStrbufClear(&cpu->name);
+        }
+    }
+    #endif
+
     return NULL;
 }

src/detection/cpu/cpu_windows.c

@@ -35,7 +35,7 @@ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
             return "GetLogicalProcessorInformationEx(RelationAll, pProcessorInfo, &length) failed";
     }
 
-    FF_HKEY_AUTO_DESTROY hKey;
+    FF_HKEY_AUTO_DESTROY hKey = NULL;
     if(!ffRegOpenKeyForRead(HKEY_LOCAL_MACHINE, L"HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0", &hKey, NULL))
         return "ffRegOpenKeyForRead(HKEY_LOCAL_MACHINE, L\"HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0\", &hKey, NULL) failed";
 

src/detection/datetime/datetime.c

@@ -1,71 +0,0 @@
-#include "fastfetch.h"
-#include "detection/datetime/datetime.h"
-#include "common/thread.h"
-
-#include <time.h>
-
-const FFDateTimeResult* ffDetectDateTime(void)
-{
-    static FFDateTimeResult result;
-    static FFThreadMutex mutex = FF_THREAD_MUTEX_INITIALIZER;
-    static bool init = false;
-
-    ffThreadMutexLock(&mutex);
-    if (init)
-    {
-        ffThreadMutexUnlock(&mutex);
-        return &result;
-    }
-    init = true;
-
-    const time_t t = time(NULL);
-    struct tm* tm = localtime(&t);
-
-    result.year = (uint16_t) (tm->tm_year + 1900);
-    result.yearShort = (uint8_t) (result.year % 100);
-    result.month = (uint8_t) (tm->tm_mon + 1);
-
-    ffStrbufInitA(&result.monthPretty, FASTFETCH_STRBUF_DEFAULT_ALLOC);
-    result.monthPretty.length = (uint32_t) strftime(result.monthPretty.chars, ffStrbufGetFree(&result.monthPretty), "%m", tm);
-
-    ffStrbufInitA(&result.monthName, FASTFETCH_STRBUF_DEFAULT_ALLOC);
-    result.monthName.length = (uint32_t) strftime(result.monthName.chars, ffStrbufGetFree(&result.monthName), "%B", tm);
-
-    ffStrbufInitA(&result.monthNameShort, FASTFETCH_STRBUF_DEFAULT_ALLOC);
-    result.monthNameShort.length = (uint32_t) strftime(result.monthNameShort.chars, ffStrbufGetFree(&result.monthNameShort), "%b", tm);
-
-    result.week = (uint8_t) (tm->tm_yday / 7 + 1);
-
-    ffStrbufInitA(&result.weekday, FASTFETCH_STRBUF_DEFAULT_ALLOC);
-    result.weekday.length = (uint32_t) strftime(result.weekday.chars, ffStrbufGetFree(&result.weekday), "%A", tm);
-
-    ffStrbufInitA(&result.weekdayShort, FASTFETCH_STRBUF_DEFAULT_ALLOC);
-    result.weekdayShort.length = (uint32_t) strftime(result.weekdayShort.chars, ffStrbufGetFree(&result.weekdayShort), "%a", tm);
-
-    result.dayInYear = (uint8_t) (tm->tm_yday + 1);
-    result.dayInMonth = (uint8_t) tm->tm_mday;
-    result.dayInWeek = tm->tm_wday == 0 ? 7 : (uint8_t) tm->tm_wday;
-
-    result.hour = (uint8_t) tm->tm_hour;
-
-    ffStrbufInitA(&result.hourPretty, FASTFETCH_STRBUF_DEFAULT_ALLOC);
-    result.hourPretty.length = (uint32_t) strftime(result.hourPretty.chars, ffStrbufGetFree(&result.hourPretty), "%H", tm);
-
-    result.hour12 = (uint8_t) (result.hour % 12);
-
-    ffStrbufInitA(&result.hour12Pretty, FASTFETCH_STRBUF_DEFAULT_ALLOC);
-    result.hour12Pretty.length = (uint32_t) strftime(result.hour12Pretty.chars, ffStrbufGetFree(&result.hour12Pretty), "%I", tm);
-
-    result.minute = (uint8_t) tm->tm_min;
-
-    ffStrbufInitA(&result.minutePretty, FASTFETCH_STRBUF_DEFAULT_ALLOC);
-    result.minutePretty.length = (uint32_t) strftime(result.minutePretty.chars, ffStrbufGetFree(&result.minutePretty), "%M", tm);
-
-    result.second = (uint8_t) tm->tm_sec;
-
-    ffStrbufInitA(&result.secondPretty, FASTFETCH_STRBUF_DEFAULT_ALLOC);
-    result.secondPretty.length = (uint32_t) strftime(result.secondPretty.chars, ffStrbufGetFree(&result.secondPretty), "%S", tm);
-
-    ffThreadMutexUnlock(&mutex);
-    return &result;
-}

src/detection/datetime/datetime.h

@@ -1,35 +0,0 @@
-#pragma once
-
-#ifndef FF_INCLUDED_detection_datetime_datetime
-#define FF_INCLUDED_detection_datetime_datetime
-
-#include "fastfetch.h"
-
-typedef struct FFDateTimeResult
-{
-    //Examples for 21.02.2022 - 15:18:37
-    uint16_t year; //2022
-    uint8_t yearShort; //22
-    uint8_t month; //2
-    FFstrbuf monthPretty; //02
-    FFstrbuf monthName; //February
-    FFstrbuf monthNameShort; //Feb
-    uint8_t week; //8
-    FFstrbuf weekday; //Monday
-    FFstrbuf weekdayShort; //Mon
-    uint16_t dayInYear; //52
-    uint8_t dayInMonth; //21
-    uint8_t dayInWeek; //1
-    uint8_t hour; //15
-    FFstrbuf hourPretty; //15
-    uint8_t hour12; //3
-    FFstrbuf hour12Pretty; //03
-    uint8_t minute; //18
-    FFstrbuf minutePretty; //18
-    uint8_t second; //37
-    FFstrbuf secondPretty; //37
-} FFDateTimeResult;
-
-const FFDateTimeResult* ffDetectDateTime();
-
-#endif

src/detection/disk/disk.h

@@ -5,12 +5,21 @@
 
 #include "fastfetch.h"
 
+typedef enum FFDiskPhysicalType
+{
+    FF_DISK_PHYSICAL_TYPE_UNKNOWN,
+    FF_DISK_PHYSICAL_TYPE_HDD,
+    FF_DISK_PHYSICAL_TYPE_SSD,
+} FFDiskPhysicalType;
+
 typedef struct FFDisk
 {
+    FFstrbuf mountFrom;
     FFstrbuf mountpoint;
     FFstrbuf filesystem;
     FFstrbuf name;
     FFDiskVolumeType type;
+    FFDiskPhysicalType physicalType;
 
     uint64_t bytesUsed;
     uint64_t bytesFree;

src/detection/disk/disk_apple.m

@@ -1,17 +0,0 @@
-#include "disk.h"
-
-#include <sys/mount.h>
-#import <Foundation/Foundation.h>
-
-void detectFsInfo(struct statfs* fs, FFDisk* disk)
-{
-    // FreeBSD doesn't support these flags
-    if(fs->f_flags & MNT_DONTBROWSE)
-        disk->type = FF_DISK_VOLUME_TYPE_HIDDEN_BIT;
-    else if(fs->f_flags & MNT_REMOVABLE)
-        disk->type = FF_DISK_VOLUME_TYPE_EXTERNAL_BIT;
-    else
-        disk->type = FF_DISK_VOLUME_TYPE_REGULAR_BIT;
-
-    ffStrbufInitS(&disk->name, [NSFileManager.defaultManager displayNameAtPath:@(fs->f_mntonname)].UTF8String);
-}

src/detection/disk/disk_bsd.c

@@ -1,42 +1,68 @@
 #include "disk.h"
+#include "util/mallocHelper.h"
+#include "util/stringUtils.h"
 
 #include <sys/mount.h>
 
 #ifdef __FreeBSD__
-#include "util/stringUtils.h"
-
 static void detectFsInfo(struct statfs* fs, FFDisk* disk)
 {
     if(ffStrbufEqualS(&disk->filesystem, "zfs"))
     {
-        disk->type = !ffStrStartsWith(fs->f_mntfromname, "zroot/") || ffStrStartsWith(fs->f_mntfromname, "zroot/ROOT/")
+        disk->type = !ffStrbufStartsWithS(&disk->mountFrom, "zroot/") || ffStrbufStartsWithS(&disk->mountFrom, "zroot/ROOT/")
             ? FF_DISK_VOLUME_TYPE_REGULAR_BIT
             : FF_DISK_VOLUME_TYPE_SUBVOLUME_BIT;
     }
-    else if(!ffStrStartsWith(fs->f_mntfromname, "/dev/"))
+    else if(ffStrbufStartsWithS(&disk->mountpoint, "/boot") || ffStrbufStartsWithS(&disk->mountpoint, "/efi"))
         disk->type = FF_DISK_VOLUME_TYPE_HIDDEN_BIT;
     else if(!(fs->f_flags & MNT_LOCAL))
         disk->type = FF_DISK_VOLUME_TYPE_EXTERNAL_BIT;
     else
         disk->type = FF_DISK_VOLUME_TYPE_REGULAR_BIT;
-
-    ffStrbufInit(&disk->name);
 }
-#else
-void detectFsInfo(struct statfs* fs, FFDisk* disk);
+#elif __APPLE__
+#include <sys/attr.h>
+#include <unistd.h>
+
+struct VolAttrBuf {
+    uint32_t       length;
+    attrreference_t volNameRef;
+    char            volNameSpace[MAXPATHLEN];
+} __attribute__((aligned(4), packed));
+
+void detectFsInfo(struct statfs* fs, FFDisk* disk)
+{
+    if(fs->f_flags & MNT_DONTBROWSE)
+        disk->type = FF_DISK_VOLUME_TYPE_HIDDEN_BIT;
+    else if(fs->f_flags & MNT_REMOVABLE || !(fs->f_flags & MNT_LOCAL))
+        disk->type = FF_DISK_VOLUME_TYPE_EXTERNAL_BIT;
+    else
+        disk->type = FF_DISK_VOLUME_TYPE_REGULAR_BIT;
+
+    struct VolAttrBuf attrBuf;
+    if (getattrlist(disk->mountpoint.chars, &(struct attrlist) {
+        .bitmapcount = ATTR_BIT_MAP_COUNT,
+        .volattr = ATTR_VOL_INFO | ATTR_VOL_NAME,
+    }, &attrBuf, sizeof(attrBuf), 0) == 0)
+        ffStrbufInitNS(&disk->name, attrBuf.volNameRef.attr_length - 1 /* excluding '\0' */, attrBuf.volNameSpace);
+}
 #endif
 
 const char* ffDetectDisksImpl(FFlist* disks)
 {
-    struct statfs* buf;
+    int size = getfsstat(NULL, 0, MNT_WAIT);
 
-    int size = getmntinfo(&buf, MNT_WAIT);
     if(size <= 0)
-        return "getmntinfo(&buf, MNT_WAIT) failed";
+        return "getfsstat(NULL, 0, MNT_WAIT) failed";
+
+    FF_AUTO_FREE struct statfs* buf = malloc(sizeof(*buf) * (unsigned) size);
+    if(getfsstat(buf, (int) (sizeof(*buf) * (unsigned) size), MNT_NOWAIT) <= 0)
+        return "getfsstat(buf, size, MNT_NOWAIT) failed";
 
     for(struct statfs* fs = buf; fs < buf + size; ++fs)
     {
-        FFDisk* disk = ffListAdd(disks);
+        if(!ffStrStartsWith(fs->f_mntfromname, "/dev/") && !ffStrEquals(fs->f_fstypename, "zfs"))
+            continue;
 
         #ifdef __FreeBSD__
         // f_bavail and f_ffree are signed on FreeBSD...
@@ -44,6 +70,9 @@ const char* ffDetectDisksImpl(FFlist* disks)
         if(fs->f_ffree < 0) fs->f_ffree = 0;
         #endif
 
+        FFDisk* disk = ffListAdd(disks);
+        disk->physicalType = FF_DISK_PHYSICAL_TYPE_UNKNOWN;
+
         disk->bytesTotal = fs->f_blocks * fs->f_bsize;
         disk->bytesFree = (uint64_t)fs->f_bfree * fs->f_bsize;
         disk->bytesAvailable = (uint64_t)fs->f_bavail * fs->f_bsize;
@@ -52,8 +81,11 @@ const char* ffDetectDisksImpl(FFlist* disks)
         disk->filesTotal = (uint32_t) fs->f_files;
         disk->filesUsed = (uint32_t) (disk->filesTotal - (uint64_t)fs->f_ffree);
 
+        ffStrbufInitS(&disk->mountFrom, fs->f_mntfromname);
         ffStrbufInitS(&disk->mountpoint, fs->f_mntonname);
         ffStrbufInitS(&disk->filesystem, fs->f_fstypename);
+        ffStrbufInit(&disk->name);
+        disk->type = 0;
         detectFsInfo(fs, disk);
 
         if(fs->f_flags & MNT_RDONLY)

src/detection/disk/disk_linux.c

@@ -1,5 +1,6 @@
 #include "disk.h"
 
+#include "common/io/io.h"
 #include "util/stringUtils.h"
 
 #include <limits.h>
@@ -7,6 +8,8 @@
 #include <dirent.h>
 #include <sys/stat.h>
 #include <sys/statvfs.h>
+#include <mntent.h>
+#include <sys/mount.h>
 
 #ifdef __USE_LARGEFILE64
     #define stat stat64
@@ -15,77 +18,60 @@
     #define readdir readdir64
 #endif
 
-static bool isPhysicalDevice(FFstrbuf* device)
+static bool isPhysicalDevice(const struct mntent* device)
 {
     #ifndef __ANDROID__ //On Android, `/dev` is not accessable, so that the following checks always fail
 
-    //https://askubuntu.com/a/1289123
-    if(ffStrbufEqualS(device, "/cow"))
+    //Always show the root path
+    if(ffStrEquals(device->mnt_dir, "/"))
         return true;
 
     //DrvFs is a filesystem plugin to WSL that was designed to support interop between WSL and the Windows filesystem.
-    if(ffStrbufEqualS(device, "drvfs"))
+    if(ffStrEquals(device->mnt_fsname, "drvfs"))
         return true;
 
-    //ZFS root pool. The format is rpool/<POOL_NAME>/<VOLUME_NAME>/<SUBVOLUME_NAME>
-    if(ffStrbufStartsWithS(device, "rpool/"))
+    //ZFS pool
+    if(ffStrEquals(device->mnt_type, "zfs"))
         return true;
 
+    //Pseudo filesystems don't have a device in /dev
+    if(!ffStrStartsWith(device->mnt_fsname, "/dev/"))
+        return false;
+
+    if(
+        ffStrStartsWith(device->mnt_fsname + 5, "loop") || //Ignore loop devices
+        ffStrStartsWith(device->mnt_fsname + 5, "ram")  || //Ignore ram devices
+        ffStrStartsWith(device->mnt_fsname + 5, "fd")      //Ignore fd devices
+    ) return false;
+
     struct stat deviceStat;
-    if(stat(device->chars, &deviceStat) != 0)
+    if(stat(device->mnt_fsname, &deviceStat) != 0)
         return false;
 
     //Ignore all devices that are not block devices
     if(!S_ISBLK(deviceStat.st_mode))
         return false;
 
+    #else
+
     //Pseudo filesystems don't have a device in /dev
-    if(!ffStrbufStartsWithS(device, "/dev/"))
+    if(!ffStrStartsWith(device->mnt_fsname, "/dev/"))
         return false;
 
-    #endif // __ANDROID__
-
     if(
-        ffStrbufStartsWithS(device, "/dev/loop") || //Ignore loop devices
-        ffStrbufStartsWithS(device, "/dev/ram")  || //Ignore ram devices
-        ffStrbufStartsWithS(device, "/dev/fd")      //Ignore fd devices
+        ffStrStartsWith(device->mnt_fsname + 5, "loop") || //Ignore loop devices
+        ffStrStartsWith(device->mnt_fsname + 5, "ram")  || //Ignore ram devices
+        ffStrStartsWith(device->mnt_fsname + 5, "fd")      //Ignore fd devices
     ) return false;
 
+    #endif // __ANDROID__
+
     return true;
 }
 
-static void appendNextEntry(FFstrbuf* buffer, char** source)
-{
-    //Read the current entry into the buffer
-    while(**source != '\0' && !isspace(**source))
-    {
-        //After a backslash the next 3 characters are octal ascii codes
-        if(**source == '\\' && strnlen(*source, 4) == 4)
-        {
-            char octal[4] = {0};
-            strncpy(octal, *source + 1, 3);
-
-            long value = strtol(octal, NULL, 8); //Returns 0 on error, so no need to check endptr
-            if(value > 0 && value < CHAR_MAX)
-            {
-                ffStrbufAppendC(buffer, (char) value);
-                *source += 4;
-                continue;
-            }
-        }
-
-        ffStrbufAppendC(buffer, **source);
-        ++*source;
-    }
-
-    //Skip whitespace
-    while(isspace(**source))
-        ++*source;
-}
-
 static void detectNameFromPath(FFDisk* disk, const struct stat* deviceStat, FFstrbuf* basePath)
 {
-    DIR* dir = opendir(basePath->chars);
+    FF_AUTO_CLOSE_DIR DIR* dir = opendir(basePath->chars);
     if(dir == NULL)
         return;
 
@@ -110,18 +96,24 @@ static void detectNameFromPath(FFDisk* disk, const struct stat* deviceStat, FFst
         ffStrbufAppendS(&disk->name, entry->d_name);
         break;
     }
-
-    closedir(dir);
 }
 
-static void detectName(FFDisk* disk, const FFstrbuf* device)
+static void detectName(FFDisk* disk)
 {
     struct stat deviceStat;
-    if(stat(device->chars, &deviceStat) != 0)
+    if(stat(disk->mountFrom.chars, &deviceStat) != 0)
         return;
 
     FF_STRBUF_AUTO_DESTROY basePath = ffStrbufCreate();
 
+    //Detect USB devices. Code is put here to reuse deviceStat
+    //https://stackoverflow.com/a/73302717
+    ffStrbufAppendS(&basePath, "/dev/disk/by-id/");
+    detectNameFromPath(disk, &deviceStat, &basePath);
+    if (ffStrbufStartsWithS(&disk->name, "usb-"))
+        disk->type = FF_DISK_VOLUME_TYPE_EXTERNAL_BIT;
+    ffStrbufClear(&disk->name);
+
     //Try label first
     ffStrbufSetS(&basePath, "/dev/disk/by-label/");
     detectNameFromPath(disk, &deviceStat, &basePath);
@@ -133,6 +125,8 @@ static void detectName(FFDisk* disk, const FFstrbuf* device)
         detectNameFromPath(disk, &deviceStat, &basePath);
     }
 
+    if (disk->name.length == 0) return;
+
     // Basic\x20data\x20partition
     for (uint32_t i = ffStrbufFirstIndexS(&disk->name, "\\x");
         i != disk->name.length;
@@ -152,7 +146,7 @@ static void detectName(FFDisk* disk, const FFstrbuf* device)
 
 #ifdef __ANDROID__
 
-static void detectType(FF_MAYBE_UNUSED const FFlist* devices, FFDisk* currentDisk, FF_MAYBE_UNUSED const char* options)
+static void detectType(FF_MAYBE_UNUSED const FFlist* disks, FFDisk* currentDisk)
 {
     if(ffStrbufEqualS(&currentDisk->mountpoint, "/") || ffStrbufEqualS(&currentDisk->mountpoint, "/storage/emulated"))
         currentDisk->type = FF_DISK_VOLUME_TYPE_REGULAR_BIT;
@@ -164,36 +158,95 @@ static void detectType(FF_MAYBE_UNUSED const FFlist* devices, FFDisk* currentDis
 
 #else
 
-static bool isSubvolume(const FFlist* devices)
+static bool isSubvolume(const FFlist* disks, FFDisk* currentDisk)
 {
-    const FFstrbuf* current = ffListGet(devices, devices->length - 1);
-
-    if(ffStrbufEqualS(current, "drvfs")) // WSL Windows drives
+    if(ffStrbufEqualS(&currentDisk->mountFrom, "drvfs")) // WSL Windows drives
         return false;
 
-    //Filter all disks which device was already found. This catches BTRFS subvolumes.
-    for(uint32_t i = 0; i < devices->length - 1; i++)
+    if(ffStrbufEqualS(&currentDisk->filesystem, "zfs"))
     {
-        const FFstrbuf* otherDevice = ffListGet(devices, i);
+        //ZFS subvolumes
+        uint32_t index = ffStrbufFirstIndexC(&currentDisk->mountFrom, '/');
+        if (index == currentDisk->mountFrom.length)
+            return false;
 
-        if(ffStrbufEqual(current, otherDevice))
-            return true;
+        FF_STRBUF_AUTO_DESTROY zpoolName = ffStrbufCreateNS(index, currentDisk->mountFrom.chars);
+        for(uint32_t i = 0; i < disks->length - 1; i++)
+        {
+            const FFDisk* otherDevice = ffListGet(disks, i);
+            if(ffStrbufEqualS(&otherDevice->filesystem, "zfs") && ffStrbufStartsWith(&otherDevice->mountFrom, &zpoolName))
+                return true;
+        }
+
+        return false;
     }
+    else
+    {
+        //Filter all disks which device was already found. This catches BTRFS subvolumes.
+        for(uint32_t i = 0; i < disks->length - 1; i++)
+        {
+            const FFDisk* otherDevice = ffListGet(disks, i);
 
-    //ZFS subvolumes: rpool/<POOL_NAME>/<VOLUME_NAME>/<SUBVOLUME_NAME>.
-    //Test if the third slash is present.
-    if(ffStrbufStartsWithS(current, "rpool/") && ffStrHasNChars(current->chars, '/', 3))
-        return true;
+            if(ffStrbufEqual(&currentDisk->mountFrom, &otherDevice->mountFrom))
+                return true;
+        }
+    }
 
     return false;
 }
 
-static void detectType(const FFlist* devices, FFDisk* currentDisk, const char* options)
+static bool detectPhysicalTypeAndReturnRemovable(FFDisk* currentDisk)
 {
-    if(isSubvolume(devices))
-        currentDisk->type = FF_DISK_VOLUME_TYPE_SUBVOLUME_BIT;
-    else if(strstr(options, "nosuid") != NULL || strstr(options, "nodev") != NULL)
+    // https://stackoverflow.com/a/73302025
+    // Note my USB mobile hard disk isn't detected as removable, but my USB flash disk does.
+    // USB devices should be handled in detectName
+    FF_STRBUF_AUTO_DESTROY basePath = ffStrbufCreateS("/sys/block/");
+
+    FF_AUTO_CLOSE_DIR DIR* dir = opendir(basePath.chars);
+    if(dir == NULL)
+        return false;
+
+    uint32_t index = ffStrbufLastIndexC(&currentDisk->mountFrom, '/');
+    const char* partitionName = index == currentDisk->mountFrom.length ? NULL : currentDisk->mountFrom.chars + index + 1;
+    if (!partitionName || !*partitionName) return false;
+
+    struct dirent* entry;
+    while((entry = readdir(dir)) != NULL)
+    {
+        if(entry->d_name[0] == '.')
+            continue;
+
+        if (!ffStrStartsWith(partitionName, entry->d_name)) continue;
+
+        ffStrbufAppendS(&basePath, entry->d_name);
+        index = basePath.length;
+        // /sys/block/sdx/queue/rotational
+        ffStrbufAppendS(&basePath, "/queue/rotational");
+        FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
+        if (ffReadFileBuffer(basePath.chars, &buffer))
+            currentDisk->physicalType = ffStrbufEqualS(&buffer, "1") ? FF_DISK_PHYSICAL_TYPE_HDD : FF_DISK_PHYSICAL_TYPE_SSD;
+        else
+            currentDisk->physicalType = FF_DISK_PHYSICAL_TYPE_UNKNOWN;
+        ffStrbufSubstrBefore(&basePath, index);
+
+        // /sys/block/sdx/removable
+        ffStrbufAppendS(&basePath, "/removable");
+
+        return ffReadFileBuffer(basePath.chars, &buffer) && ffStrbufEqualS(&buffer, "1");
+    }
+
+    return false;
+}
+
+static void detectType(const FFlist* disks, FFDisk* currentDisk)
+{
+    bool isRemovable = detectPhysicalTypeAndReturnRemovable(currentDisk);
+
+    if(currentDisk->type != FF_DISK_VOLUME_TYPE_NONE) return;
+    if(isRemovable)
         currentDisk->type = FF_DISK_VOLUME_TYPE_EXTERNAL_BIT;
+    else if(isSubvolume(disks, currentDisk))
+        currentDisk->type = FF_DISK_VOLUME_TYPE_SUBVOLUME_BIT;
     else if(ffStrbufStartsWithS(&currentDisk->mountpoint, "/boot") || ffStrbufStartsWithS(&currentDisk->mountpoint, "/efi"))
         currentDisk->type = FF_DISK_VOLUME_TYPE_HIDDEN_BIT;
     else
@@ -222,61 +275,43 @@ static void detectStats(FFDisk* disk)
 
 const char* ffDetectDisksImpl(FFlist* disks)
 {
-    FILE* mountsFile = fopen("/proc/mounts", "r");
+    FILE* mountsFile = setmntent("/proc/mounts", "r");
     if(mountsFile == NULL)
-        return "fopen(\"/proc/mounts\", \"r\") == NULL";
+        return "setmntent(\"/proc/mounts\", \"r\") == NULL";
 
-    FF_LIST_AUTO_DESTROY devices = ffListCreate(sizeof(FFstrbuf));
+    struct mntent* device;
 
-    char* line = NULL;
-    size_t len = 0;
-
-    while(getline(&line, &len, mountsFile) != EOF)
+    while((device = getmntent(mountsFile)))
     {
-        //Format of the file: "<device> <mountpoint> <filesystem> <options> ..." (Same as fstab)
-        char* currentPos = line;
-
-        //detect device
-        FFstrbuf* device = ffListAdd(&devices);
-        ffStrbufInit(device);
-        appendNextEntry(device, &currentPos);
-
         if(!isPhysicalDevice(device))
-        {
-            ffStrbufDestroy(device);
-            devices.length--;
             continue;
-        }
 
         //We have a valid device, add it to the list
         FFDisk* disk = ffListAdd(disks);
+        disk->type = FF_DISK_VOLUME_TYPE_NONE;
+        disk->physicalType = FF_DISK_PHYSICAL_TYPE_UNKNOWN;
+
+        //detect mountFrom
+        ffStrbufInitS(&disk->mountFrom, device->mnt_fsname);
 
         //detect mountpoint
-        ffStrbufInit(&disk->mountpoint);
-        appendNextEntry(&disk->mountpoint, &currentPos);
+        ffStrbufInitS(&disk->mountpoint, device->mnt_dir);
 
         //detect filesystem
-        ffStrbufInit(&disk->filesystem);
-        appendNextEntry(&disk->filesystem, &currentPos);
+        ffStrbufInitS(&disk->filesystem, device->mnt_type);
 
         //detect name
         ffStrbufInit(&disk->name);
-        detectName(disk, device);
+        detectName(disk); // Also detects external devices
 
         //detect type
-        detectType(&devices, disk, currentPos);
+        detectType(disks, disk);
 
         //Detects stats
         detectStats(disk);
     }
 
-    if(line != NULL)
-        free(line);
-
-    FF_LIST_FOR_EACH(FFstrbuf, device, devices)
-        ffStrbufDestroy(device);
-
-    fclose(mountsFile);
+    endmntent(mountsFile);
 
     return NULL;
 }

src/detection/disk/disk_windows.c

@@ -1,7 +1,9 @@
 #include "disk.h"
+#include "common/io/io.h"
 #include "util/windows/unicode.h"
 
 #include <windows.h>
+#include <winioctl.h>
 #include <assert.h>
 
 const char* ffDetectDisksImpl(FFlist* disks)
@@ -25,6 +27,41 @@ const char* ffDetectDisksImpl(FFlist* disks)
         FFDisk* disk = ffListAdd(disks);
         ffStrbufInitWS(&disk->mountpoint, mountpoint);
 
+        wchar_t volumeName[64];
+
+        disk->physicalType = FF_DISK_PHYSICAL_TYPE_UNKNOWN;
+        if(mountpoint[1] == ':')
+        {
+            memcpy(volumeName, L"\\\\.\\ :", sizeof(L"\\\\.\\ :"));
+            volumeName[4] = mountpoint[0];
+            FF_AUTO_CLOSE_FD HANDLE handle = CreateFileW(volumeName, FILE_READ_ATTRIBUTES, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
+            if (handle != INVALID_HANDLE_VALUE)
+            {
+                DEVICE_SEEK_PENALTY_DESCRIPTOR dspd = {};
+                if(DeviceIoControl(
+                    handle,
+                    IOCTL_STORAGE_QUERY_PROPERTY,
+                    &(STORAGE_PROPERTY_QUERY) {
+                        .PropertyId = StorageDeviceSeekPenaltyProperty,
+                        .QueryType = PropertyStandardQuery,
+                    },
+                    sizeof(STORAGE_PROPERTY_QUERY),
+                    &dspd,
+                    sizeof(dspd),
+                    NULL,
+                    NULL
+                ))
+                    disk->physicalType = dspd.IncursSeekPenalty ? FF_DISK_PHYSICAL_TYPE_HDD : FF_DISK_PHYSICAL_TYPE_SSD;
+            }
+        }
+
+        if(GetVolumeNameForVolumeMountPointW(mountpoint, volumeName, sizeof(volumeName) / sizeof(*volumeName)))
+        {
+            ffStrbufInitWS(&disk->mountFrom, volumeName);
+        }
+        else
+            ffStrbufInit(&disk->mountFrom);
+
         if(!GetDiskFreeSpaceExW(
             mountpoint,
             (PULARGE_INTEGER)&disk->bytesAvailable,

src/detection/displayserver/displayserver_android.c

@@ -80,9 +80,9 @@ static bool detectWithGetprop(FFDisplayServerResult* ds)
         ffStrbufContainC(&buffer, ','))
     {
         // 1440,3200,560 => width,height,ppi
-        uint32_t width = ffStrbufToUInt16(&buffer, 0);
+        uint32_t width = (uint32_t) ffStrbufToUInt(&buffer, 0);
         ffStrbufSubstrAfterFirstC(&buffer, ',');
-        uint32_t height = ffStrbufToUInt16(&buffer, 0);
+        uint32_t height = (uint32_t) ffStrbufToUInt(&buffer, 0);
         return ffdsAppendDisplay(ds,
             width,
             height,

src/detection/displayserver/linux/wmde.c

@@ -233,6 +233,23 @@ static void getXFCE4(FFDisplayServerResult* result)
     ffStrbufSetS(&result->dePrettyName, FF_DE_PRETTY_XFCE4);
     ffParsePropFileData("gtk-doc/html/libxfce4ui/index.html", "<div><p class=\"releaseinfo\">Version", &result->deVersion);
 
+    #ifdef __FreeBSD__
+    if(result->deVersion.length == 0)
+    {
+        FF_AUTO_CLOSE_DIR DIR* dirp = opendir("/usr/local/share/licenses/");
+        if (dirp)
+        {
+            struct dirent* entry;
+            while((entry = readdir(dirp)) != NULL)
+            {
+                if(!ffStrStartsWith(entry->d_name, "xfce-") || !isdigit(entry->d_name[5]))
+                    continue;
+                ffStrbufAppendS(&result->deVersion, &entry->d_name[5]);
+            }
+        }
+    }
+    #endif
+
     if(result->deVersion.length == 0 && instance.config.allowSlowOperations)
     {
         //This is somewhat slow

src/detection/gamepad/gamepad_windows.c

@@ -130,7 +130,7 @@ const char* ffDetectGamepad(FFlist* devices /* List of FFGamepadDevice */)
             if (hHidFile && HidD_GetProductString(hHidFile, displayName, sizeof(wchar_t) * 126))
                 ffStrbufSetWS(&device->name, displayName);
             else
-                ffStrbufSetF(&device->name, "Unknown gamepad %4X-%4X", rdi.hid.dwVendorId, rdi.hid.dwProductId);
+                ffStrbufSetF(&device->name, "Unknown gamepad %4X-%4X", (unsigned) rdi.hid.dwVendorId, (unsigned) rdi.hid.dwProductId);
         }
     }
 

src/detection/gpu/gpu_linux.c

@@ -311,6 +311,12 @@ static const char* pciDetectGPUs(const FFGPUOptions* options, FFlist* gpus)
 
 const char* ffDetectGPUImpl(const FFGPUOptions* options, FFlist* gpus)
 {
+    #ifdef FF_HAVE_DIRECTX_HEADERS
+        const char* ffGPUDetectByDirectX(const FFGPUOptions* options, FFlist* gpus);
+        if (!ffGPUDetectByDirectX(options, gpus))
+            return NULL;
+    #endif
+
     #ifdef FF_HAVE_LIBPCI
         return pciDetectGPUs(options, gpus);
     #else

src/detection/gpu/gpu_wsl.cpp

@@ -0,0 +1,102 @@
+#ifdef FF_HAVE_DIRECTX_HEADERS
+
+#define INITGUID
+extern "C" {
+#include "common/library.h"
+#include "detection/gpu/gpu.h"
+}
+
+#include <wsl/winadapter.h>
+#include <directx/dxcore.h>
+#include <directx/d3d12.h>
+#include <dxguids/dxguids.h>
+#include <utility>
+#include <cinttypes>
+
+template <typename Fn>
+struct on_scope_exit {
+    on_scope_exit(Fn &&fn): _fn(std::move(fn)) {}
+    ~on_scope_exit() { this->_fn(); }
+
+private:
+    Fn _fn;
+};
+
+extern "C"
+const char* ffGPUDetectByDirectX(FF_MAYBE_UNUSED const FFGPUOptions* options, FFlist* gpus)
+{
+    FF_LIBRARY_LOAD(libdxcore, nullptr, "dlopen libdxcore.so failed. Make sure WSLg is enabled", "/usr/lib/wsl/lib/libdxcore" FF_LIBRARY_EXTENSION, 4)
+    // DXCoreCreateAdapterFactory is a reloaded function, so we can't use FF_LIBRARY_LOAD_SYMBOL_MESSAGE here
+    typedef HRESULT (*DXCoreCreateAdapterFactory_t)(REFIID riid, void** ppvFactory);
+    auto ffDXCoreCreateAdapterFactory = (DXCoreCreateAdapterFactory_t) dlsym(libdxcore, "DXCoreCreateAdapterFactory");
+    if(ffDXCoreCreateAdapterFactory == nullptr) return "dlsym DXCoreCreateAdapterFactory failed";
+
+    IDXCoreAdapterFactory *factory = nullptr;
+
+    if (FAILED(ffDXCoreCreateAdapterFactory(IID_PPV_ARGS(&factory))))
+        return "DXCoreCreateAdapterFactory(IID_PPV_ARGS(&factory)) failed";
+    on_scope_exit destroyFactory([&] { factory->Release(); });
+
+    IDXCoreAdapterList *list = NULL;
+    if (FAILED(factory->CreateAdapterList(1, &DXCORE_ADAPTER_ATTRIBUTE_D3D11_GRAPHICS, &list)))
+        return "factory->CreateAdapterList(1, &DXCORE_ADAPTER_ATTRIBUTE_D3D11_GRAPHICS, &list) failed";
+    on_scope_exit destroyList([&] { list->Release(); });
+
+    for (uint32_t i = 0, count = list->GetAdapterCount(); i < count; i++)
+    {
+        IDXCoreAdapter *adapter = nullptr;
+        if (FAILED(list->GetAdapter(i, &adapter)))
+            continue;
+        on_scope_exit destroyAdapter([&] { adapter->Release(); });
+
+        // https://learn.microsoft.com/en-us/windows/win32/api/dxcore_interface/ne-dxcore_interface-dxcoreadapterproperty
+        {
+            bool value = 0;
+            if (SUCCEEDED(adapter->GetProperty(DXCoreAdapterProperty::IsHardware, sizeof(value), &value)) && !value)
+                continue;
+        }
+
+        char desc[256];
+        if (FAILED(adapter->GetProperty(DXCoreAdapterProperty::DriverDescription, sizeof(desc), desc)))
+            continue;
+
+        FFGPUResult* gpu = (FFGPUResult*) ffListAdd(gpus);
+        ffStrbufInitS(&gpu->name, desc);
+        gpu->coreCount = FF_GPU_CORE_COUNT_UNSET;
+        gpu->temperature = FF_GPU_TEMP_UNSET;
+
+        ffStrbufInit(&gpu->driver);
+        uint64_t value = 0;
+        if (SUCCEEDED(adapter->GetProperty(DXCoreAdapterProperty::DriverVersion, sizeof(value), &value)))
+        {
+            ffStrbufSetF(&gpu->driver, "%" PRIu64 ".%" PRIu64 ".%" PRIu64 ".%" PRIu64,
+                (value >> 48) & 0xFFFF,
+                (value >> 32) & 0xFFFF,
+                (value >> 16) & 0xFFFF,
+                (value >>  0) & 0xFFFF);
+        }
+
+        gpu->dedicated.used = gpu->shared.used = gpu->dedicated.total = gpu->shared.total = FF_GPU_VMEM_SIZE_UNSET;
+        if (SUCCEEDED(adapter->GetProperty(DXCoreAdapterProperty::DedicatedAdapterMemory, sizeof(value), &value)))
+            gpu->dedicated.total = value;
+        if (SUCCEEDED(adapter->GetProperty(DXCoreAdapterProperty::SharedSystemMemory, sizeof(value), &value)))
+            gpu->shared.total = value;
+
+        gpu->type = FF_GPU_TYPE_UNKNOWN;
+        bool integrated;
+        if (SUCCEEDED(adapter->GetProperty(DXCoreAdapterProperty::IsIntegrated, sizeof(integrated), &integrated)))
+            gpu->type = integrated ? FF_GPU_TYPE_INTEGRATED : FF_GPU_TYPE_DISCRETE;
+
+        ffStrbufInit(&gpu->vendor);
+        DXCoreHardwareID hardwareId;
+        if (SUCCEEDED(adapter->GetProperty(DXCoreAdapterProperty::HardwareID, sizeof(hardwareId), &hardwareId)))
+        {
+            const char* vendorStr = ffGetGPUVendorString((unsigned) hardwareId.vendorID);
+            ffStrbufAppendS(&gpu->vendor, vendorStr);
+        }
+    }
+
+    return NULL;
+}
+
+#endif

src/detection/localip/localip.h

@@ -12,10 +12,6 @@ typedef struct FFLocalIpResult
     FFstrbuf ipv6;
     FFstrbuf mac;
     bool defaultRoute;
-
-    #ifdef _WIN32
-    uint32_t ifIndex;
-    #endif
 } FFLocalIpResult;
 
 const char* ffDetectLocalIps(const FFLocalIpOptions* options, FFlist* results);

src/detection/localip/localip_linux.c

@@ -1,5 +1,7 @@
 #include "localip.h"
 #include "common/io/io.h"
+#include "common/netif/netif.h"
+#include "util/stringUtils.h"
 
 #include <string.h>
 #include <ctype.h>
@@ -11,124 +13,11 @@
 
 #if defined(__FreeBSD__) || defined(__APPLE__)
 #include <net/if_dl.h>
-#include <net/route.h>
-#include <sys/socket.h>
 #else
 #include <netpacket/packet.h>
 #endif
 
-#if defined(__linux__)
-static bool getDefaultRoute(char iface[IF_NAMESIZE + 1])
-{
-    FILE* FF_AUTO_CLOSE_FILE netRoute = fopen("/proc/net/route", "r");
-    if (!netRoute) return false;
-
-    // skip first line
-    flockfile(netRoute);
-    while (getc_unlocked(netRoute) != '\n');
-    funlockfile(netRoute);
-    unsigned long long destination; //, gateway, flags, refCount, use, metric, mask, mtu,
-
-    static_assert(IF_NAMESIZE >= 16, "IF_NAMESIZE is too small");
-    while (fscanf(netRoute, "%16s%llx%*[^\n]", iface, &destination) == 2)
-    {
-        if (destination == 0)
-            return true;
-    }
-    return false;
-}
-#elif defined(__FreeBSD__) || defined(__APPLE__)
-
-#define ROUNDUP2(a, n)       ((a) > 0 ? (1 + (((a) - 1U) | ((n) - 1))) : (n))
-
-#if defined(__APPLE__)
-# define ROUNDUP(a)           ROUNDUP2((a), sizeof(int))
-#elif defined(__NetBSD__)
-# define ROUNDUP(a)           ROUNDUP2((a), sizeof(uint64_t))
-#elif defined(__FreeBSD__)
-# define ROUNDUP(a)           ROUNDUP2((a), sizeof(int))
-#elif defined(__OpenBSD__)
-# define ROUNDUP(a)           ROUNDUP2((a), sizeof(int))
-#else
-# error unknown platform
-#endif
-
-static struct sockaddr *
-get_rt_address(struct rt_msghdr *rtm, int desired)
-{
-    struct sockaddr *sa = (struct sockaddr *)(rtm + 1);
-
-    for (int i = 0; i < RTAX_MAX; i++)
-    {
-        if (rtm->rtm_addrs & (1 << i))
-        {
-            if ((1 <<i ) == desired)
-                return sa;
-            sa = (struct sockaddr *)(ROUNDUP(sa->sa_len) + (char *)sa);
-        }
-    }
-    return NULL;
-}
-
-static bool getDefaultRoute(char iface[IF_NAMESIZE + 1])
-{
-    //https://github.com/hashPirate/copenheimer-masscan-fork/blob/36f1ed9f7b751a7dccd5ed27874e2e703db7d481/src/rawsock-getif.c#L104
-
-    FF_AUTO_CLOSE_FD int pfRoute = socket(PF_ROUTE, SOCK_RAW, AF_INET);
-    if (pfRoute < 0)
-        return false;
-
-    {
-        struct timeval timeout = {1, 0};
-        setsockopt(pfRoute, SOL_SOCKET, SO_RCVTIMEO, (char *)&timeout, sizeof(timeout));
-        setsockopt(pfRoute, SOL_SOCKET, SO_SNDTIMEO, (char *)&timeout, sizeof(timeout));
-    }
-
-    int pid = getpid();
-
-    struct {
-        struct rt_msghdr hdr;
-        struct sockaddr_in dst;
-        uint8_t data[512];
-    } rtmsg = {
-        .hdr = {
-            .rtm_type = RTM_GET,
-            .rtm_flags = RTF_UP | RTF_GATEWAY,
-            .rtm_version = RTM_VERSION,
-            .rtm_addrs = RTA_DST | RTA_IFP,
-            .rtm_msglen = sizeof(rtmsg.hdr) + sizeof(rtmsg.dst),
-            .rtm_pid = pid,
-            .rtm_seq = 1,
-        },
-        .dst = {
-            .sin_family = AF_INET,
-            .sin_len = sizeof(rtmsg.dst),
-        },
-    };
-
-    if (write(pfRoute, &rtmsg, rtmsg.hdr.rtm_msglen) != rtmsg.hdr.rtm_msglen)
-        return false;
-
-    while (read(pfRoute, &rtmsg, sizeof(rtmsg)) > 0)
-    {
-        if (rtmsg.hdr.rtm_seq == 1 && rtmsg.hdr.rtm_pid == pid)
-        {
-            struct sockaddr_dl* sdl = (struct sockaddr_dl *)get_rt_address(&rtmsg.hdr, RTA_IFP);
-            if (sdl)
-            {
-                assert(sdl->sdl_nlen <= IF_NAMESIZE);
-                memcpy(iface, sdl->sdl_data, sdl->sdl_nlen);
-                iface[sdl->sdl_nlen] = 0;
-                return true;
-            }
-            return false;
-        }
-    }
-    return false;
-}
-#endif
-
-static void addNewIp(FFlist* list, const char* name, const char* addr, int type)
+static void addNewIp(FFlist* list, const char* name, const char* addr, int type, bool defaultRoute)
 {
     FFLocalIpResult* ip = NULL;
 
@@ -145,7 +34,7 @@ static void addNewIp(FFlist* list, const char* name, const char* addr, int type)
         ffStrbufInit(&ip->ipv4);
         ffStrbufInit(&ip->ipv6);
         ffStrbufInit(&ip->mac);
-        ip->defaultRoute = false;
+        ip->defaultRoute = defaultRoute;
     }
 
     switch (type)
@@ -168,11 +57,17 @@ const char* ffDetectLocalIps(const FFLocalIpOptions* options, FFlist* results)
     if(getifaddrs(&ifAddrStruct) < 0)
         return "getifaddrs(&ifAddrStruct) failed";
 
+    const char* defaultRouteIfName = ffNetifGetDefaultRouteIfName();
+
     for (struct ifaddrs* ifa = ifAddrStruct; ifa; ifa = ifa->ifa_next)
     {
         if (!ifa->ifa_addr || !(ifa->ifa_flags & IFF_RUNNING))
             continue;
 
+        bool isDefaultRoute = ffStrEquals(defaultRouteIfName, ifa->ifa_name);
+        if (options->defaultRouteOnly && !isDefaultRoute)
+            continue;
+
         if ((ifa->ifa_flags & IFF_LOOPBACK) && !(options->showType & FF_LOCALIP_TYPE_LOOP_BIT))
             continue;
 
@@ -187,7 +82,7 @@ const char* ffDetectLocalIps(const FFLocalIpOptions* options, FFlist* results)
             struct sockaddr_in* ipv4 = (struct sockaddr_in*) ifa->ifa_addr;
             char addressBuffer[INET_ADDRSTRLEN];
             inet_ntop(AF_INET, &ipv4->sin_addr, addressBuffer, INET_ADDRSTRLEN);
-            addNewIp(results, ifa->ifa_name, addressBuffer, AF_INET);
+            addNewIp(results, ifa->ifa_name, addressBuffer, AF_INET, isDefaultRoute);
         }
         else if (ifa->ifa_addr->sa_family == AF_INET6)
         {
@@ -197,7 +92,7 @@ const char* ffDetectLocalIps(const FFLocalIpOptions* options, FFlist* results)
             struct sockaddr_in6* ipv6 = (struct sockaddr_in6 *)ifa->ifa_addr;
             char addressBuffer[INET6_ADDRSTRLEN];
             inet_ntop(AF_INET6, &ipv6->sin6_addr, addressBuffer, INET6_ADDRSTRLEN);
-            addNewIp(results, ifa->ifa_name, addressBuffer, AF_INET6);
+            addNewIp(results, ifa->ifa_name, addressBuffer, AF_INET6, isDefaultRoute);
         }
         #if defined(__FreeBSD__) || defined(__APPLE__)
         else if (ifa->ifa_addr->sa_family == AF_LINK)
@@ -209,7 +104,7 @@ const char* ffDetectLocalIps(const FFLocalIpOptions* options, FFlist* results)
             uint8_t* ptr = (uint8_t*) LLADDR((struct sockaddr_dl *)ifa->ifa_addr);
             snprintf(addressBuffer, sizeof(addressBuffer), "%02x:%02x:%02x:%02x:%02x:%02x",
                         ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5]);
-            addNewIp(results, ifa->ifa_name, addressBuffer, -1);
+            addNewIp(results, ifa->ifa_name, addressBuffer, -1, isDefaultRoute);
         }
         #else
         else if (ifa->ifa_addr->sa_family == AF_PACKET)
@@ -221,18 +116,12 @@ const char* ffDetectLocalIps(const FFLocalIpOptions* options, FFlist* results)
             uint8_t* ptr = ((struct sockaddr_ll *)ifa->ifa_addr)->sll_addr;
             snprintf(addressBuffer, sizeof(addressBuffer), "%02x:%02x:%02x:%02x:%02x:%02x",
                         ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5]);
-            addNewIp(results, ifa->ifa_name, addressBuffer, -1);
+            addNewIp(results, ifa->ifa_name, addressBuffer, -1, isDefaultRoute);
         }
         #endif
     }
 
     if (ifAddrStruct) freeifaddrs(ifAddrStruct);
 
-    char iface[16 /*IF_NAMESIZE*/ + 1];
-    if (getDefaultRoute(iface))
-    {
-        FF_LIST_FOR_EACH(FFLocalIpResult, ip, *results)
-            ip->defaultRoute = ffStrbufEqualS(&ip->name, iface);
-    }
     return NULL;
 }

src/detection/localip/localip_windows.c

@@ -1,39 +1,12 @@
-#include <winsock2.h>
 #include <ws2tcpip.h>
 #include <iphlpapi.h>
 
+#include "common/netif/netif.h"
 #include "util/mallocHelper.h"
 #include "util/windows/unicode.h"
 #include "localip.h"
 
-static void setDefaultRoute(FFlist* ips)
-{
-    ULONG size = 0;
-    if (GetIpForwardTable(NULL, &size, TRUE) != ERROR_INSUFFICIENT_BUFFER)
-        return;
-
-    FF_AUTO_FREE MIB_IPFORWARDTABLE* pIpForwardTable = (MIB_IPFORWARDTABLE*) malloc(size);
-    if (GetIpForwardTable(pIpForwardTable, &size, TRUE) != ERROR_SUCCESS)
-        return;
-
-    for (uint32_t i = 0; i < pIpForwardTable->dwNumEntries; ++i)
-    {
-        MIB_IPFORWARDROW* ipForwardRow = &pIpForwardTable->table[i];
-        if (ipForwardRow->dwForwardDest == 0 && ipForwardRow->dwForwardMask == 0)
-        {
-            FF_LIST_FOR_EACH(FFLocalIpResult, ip, *ips)
-            {
-                if (ip->ifIndex == ipForwardRow->dwForwardIfIndex)
-                {
-                    ip->defaultRoute = true;
-                    break;
-                }
-            }
-        }
-    }
-}
-
-static void addNewIp(FFlist* list, const char* name, const char* value, int type, bool newIp, uint32_t ifIndex)
+static void addNewIp(FFlist* list, const char* name, const char* value, int type, bool newIp, bool defaultRoute)
 {
     FFLocalIpResult* ip = NULL;
 
@@ -44,8 +17,7 @@ static void addNewIp(FFlist* list, const char* name, const char* value, int type
         ffStrbufInit(&ip->ipv4);
         ffStrbufInit(&ip->ipv6);
         ffStrbufInit(&ip->mac);
-        ip->defaultRoute = false;
-        ip->ifIndex = ifIndex;
+        ip->defaultRoute = defaultRoute;
     }
     else
     {
@@ -70,14 +42,16 @@ const char* ffDetectLocalIps(const FFLocalIpOptions* options, FFlist* results)
 {
     IP_ADAPTER_ADDRESSES* FF_AUTO_FREE adapter_addresses = NULL;
 
-    // Start with a 16 KB buffer and resize if needed -
-    // multiple attempts in case interfaces change while
+    // Multiple attempts in case interfaces change while
     // we are in the middle of querying them.
-    DWORD adapter_addresses_buffer_size = 16 * 1024;
-    for (int attempts = 0; attempts != 3; ++attempts)
+    DWORD adapter_addresses_buffer_size = 0;
+    for (int attempts = 0;; ++attempts)
     {
-        adapter_addresses = (IP_ADAPTER_ADDRESSES*)realloc(adapter_addresses, adapter_addresses_buffer_size);
-        assert(adapter_addresses);
+        if (adapter_addresses_buffer_size)
+        {
+            adapter_addresses = (IP_ADAPTER_ADDRESSES*)realloc(adapter_addresses, adapter_addresses_buffer_size);
+            assert(adapter_addresses);
+        }
 
         DWORD error = GetAdaptersAddresses(
             options->showType & FF_LOCALIP_TYPE_IPV4_BIT
@@ -90,15 +64,21 @@ const char* ffDetectLocalIps(const FFLocalIpOptions* options, FFlist* results)
 
         if (error == ERROR_SUCCESS)
             break;
-        else if (ERROR_BUFFER_OVERFLOW == error)
+        else if (ERROR_BUFFER_OVERFLOW == error && attempts < 4)
             continue;
         else
             return "GetAdaptersAddresses() failed";
     }
 
+    uint32_t defaultRouteIfIndex = ffNetifGetDefaultRouteIfIndex();
+
     // Iterate through all of the adapters
     for (IP_ADAPTER_ADDRESSES* adapter = adapter_addresses; adapter; adapter = adapter->Next)
     {
+        bool isDefaultRoute = adapter->IfIndex == defaultRouteIfIndex;
+        if (options->defaultRouteOnly && !isDefaultRoute)
+            continue;
+
         bool isLoop = adapter->IfType == IF_TYPE_SOFTWARE_LOOPBACK;
         if (isLoop && !(options->showType & FF_LOCALIP_TYPE_LOOP_BIT))
             continue;
@@ -116,7 +96,7 @@ const char* ffDetectLocalIps(const FFLocalIpOptions* options, FFlist* results)
             uint8_t* ptr = adapter->PhysicalAddress;
             snprintf(addressBuffer, sizeof(addressBuffer), "%02x:%02x:%02x:%02x:%02x:%02x",
                         ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5]);
-            addNewIp(results, name, addressBuffer, -1, newIp, adapter->IfIndex);
+            addNewIp(results, name, addressBuffer, -1, newIp, isDefaultRoute);
             newIp = false;
         }
 
@@ -127,7 +107,7 @@ const char* ffDetectLocalIps(const FFLocalIpOptions* options, FFlist* results)
                 SOCKADDR_IN* ipv4 = (SOCKADDR_IN*) ifa->Address.lpSockaddr;
                 char addressBuffer[INET_ADDRSTRLEN];
                 inet_ntop(AF_INET, &ipv4->sin_addr, addressBuffer, INET_ADDRSTRLEN);
-                addNewIp(results, name, addressBuffer, AF_INET, newIp, adapter->IfIndex);
+                addNewIp(results, name, addressBuffer, AF_INET, newIp, isDefaultRoute);
                 newIp = false;
             }
             else if (ifa->Address.lpSockaddr->sa_family == AF_INET6)
@@ -135,13 +115,11 @@ const char* ffDetectLocalIps(const FFLocalIpOptions* options, FFlist* results)
                 SOCKADDR_IN6* ipv6 = (SOCKADDR_IN6*) ifa->Address.lpSockaddr;
                 char addressBuffer[INET6_ADDRSTRLEN];
                 inet_ntop(AF_INET6, &ipv6->sin6_addr, addressBuffer, INET6_ADDRSTRLEN);
-                addNewIp(results, name, addressBuffer, AF_INET6, newIp, adapter->IfIndex);
+                addNewIp(results, name, addressBuffer, AF_INET6, newIp, isDefaultRoute);
                 newIp = false;
             }
         }
     }
 
-    setDefaultRoute(results);
-
     return NULL;
 }

src/detection/netio/netio.c

@@ -0,0 +1,67 @@
+#include "netio.h"
+
+#include "common/time.h"
+
+const char* ffNetIOGetIoCounters(FFlist* result, FFNetIOOptions* options);
+
+static FFlist ioCounters1;
+static uint64_t time1;
+
+void ffPrepareNetIO(FFNetIOOptions* options)
+{
+    ffListInit(&ioCounters1, sizeof(FFNetIOResult));
+    ffNetIOGetIoCounters(&ioCounters1, options);
+    time1 = ffTimeGetNow();
+}
+
+const char* ffDetectNetIO(FFlist* result, FFNetIOOptions* options)
+{
+    const char* error = NULL;
+    if (time1 == 0)
+    {
+        ffListInit(&ioCounters1, sizeof(FFNetIOResult));
+        error = ffNetIOGetIoCounters(&ioCounters1, options);
+        if (error)
+            return error;
+        time1 = ffTimeGetNow();
+    }
+
+    if (ioCounters1.length == 0)
+        return "No network interfaces found";
+
+    uint64_t time2 = ffTimeGetNow();
+    while (time2 - time1 < 1000)
+    {
+        ffTimeSleep((uint32_t) (1000 - (time2 - time1)));
+        time2 = ffTimeGetNow();
+    }
+
+    error = ffNetIOGetIoCounters(result, options);
+    if (error)
+        return error;
+
+    if (result->length != ioCounters1.length)
+        return "Different number of network interfaces. Network change?";
+
+    for (uint32_t i = 0; i < result->length; ++i)
+    {
+        FFNetIOResult* icPrev = (FFNetIOResult*)ffListGet(&ioCounters1, i);
+        FFNetIOResult* icCurr = (FFNetIOResult*)ffListGet(result, i);
+        if (!ffStrbufEqual(&icPrev->name, &icCurr->name))
+            return "Network interface name changed";
+
+        static_assert(sizeof(FFNetIOResult) - offsetof(FFNetIOResult, txBytes) == sizeof(uint64_t) * 8, "Unexpected struct FFNetIOResult layout");
+        for (size_t off = offsetof(FFNetIOResult, txBytes); off < sizeof(FFNetIOResult); off += sizeof(uint64_t))
+        {
+            uint64_t* prevValue = (uint64_t*) ((uint8_t*) icPrev + off);
+            uint64_t* currValue = (uint64_t*) ((uint8_t*) icCurr + off);
+            uint64_t temp = *currValue;
+            *currValue -= *prevValue;
+            *currValue /= (time2 - time1) / 1000 /* seconds */;
+            *prevValue = temp;
+        }
+    }
+    time1 = time2;
+
+    return NULL;
+}

src/detection/netio/netio.h

@@ -0,0 +1,17 @@
+#include "fastfetch.h"
+
+typedef struct FFNetIOResult
+{
+    FFstrbuf name;
+    bool defaultRoute;
+    uint64_t txBytes;
+    uint64_t rxBytes;
+    uint64_t txPackets;
+    uint64_t rxPackets;
+    uint64_t rxErrors;
+    uint64_t txErrors;
+    uint64_t rxDrops;
+    uint64_t txDrops;
+} FFNetIOResult;
+
+const char* ffDetectNetIO(FFlist* result, FFNetIOOptions* options);

src/detection/netio/netio_bsd.c

@@ -0,0 +1,58 @@
+#include "netio.h"
+
+#include "common/io/io.h"
+#include "common/netif/netif.h"
+#include "util/stringUtils.h"
+#include "util/mallocHelper.h"
+
+#include <net/if.h>
+#include <net/if_dl.h>
+#include <net/if_types.h>
+#include <net/route.h>
+#include <sys/sysctl.h>
+#include <sys/socket.h>
+
+const char* ffNetIOGetIoCounters(FFlist* result, FFNetIOOptions* options)
+{
+    uint32_t defaultRouteIfIndex = ffNetifGetDefaultRouteIfIndex();
+
+    size_t bufSize = 0;
+    if (sysctl((int[]) { CTL_NET, PF_ROUTE, 0, 0, NET_RT_IFLIST, (options->defaultRouteOnly ? (int) defaultRouteIfIndex : 0) }, 6, NULL, &bufSize, 0, 0) < 0)
+        return "sysctl({ CTL_NET, PF_ROUTE, 0, 0, NET_RT_IFLIST, ifIndex }, 6, NULL, &bufSize, 0, 0) failed";
+
+    FF_AUTO_FREE struct if_msghdr* buf = (struct if_msghdr*) malloc(bufSize);
+    if (sysctl((int[]) { CTL_NET, PF_ROUTE, 0, 0, NET_RT_IFLIST, (options->defaultRouteOnly ? (int) defaultRouteIfIndex : 0) }, 6, buf, &bufSize, 0, 0) < 0)
+        return "sysctl({ CTL_NET, PF_ROUTE, 0, 0, NET_RT_IFLIST, ifIndex }, 6, buf, &bufSize, 0, 0) failed";
+
+    for (struct if_msghdr* ifm = buf;
+        ifm < (struct if_msghdr*) ((uint8_t*) buf + bufSize);
+        ifm = (struct if_msghdr*) ((uint8_t*) ifm + ifm->ifm_msglen))
+    {
+        if (ifm->ifm_type != RTM_IFINFO || !(ifm->ifm_flags & IFF_RUNNING) || (ifm->ifm_flags & IFF_NOARP)) continue;
+
+        struct sockaddr_dl* sdl = (struct sockaddr_dl*) (ifm + 1);
+        assert(sdl->sdl_family == AF_LINK);
+        if (sdl->sdl_type != IFT_ETHER && !(ifm->ifm_flags & IFF_LOOPBACK)) continue;
+
+        sdl->sdl_data[sdl->sdl_nlen] = 0;
+
+        if (options->namePrefix.length && strncmp(sdl->sdl_data, options->namePrefix.chars, options->namePrefix.length) != 0)
+            continue;
+
+        FFNetIOResult* counters = (FFNetIOResult*) ffListAdd(result);
+        *counters = (FFNetIOResult) {
+            .name = ffStrbufCreateNS(sdl->sdl_nlen, sdl->sdl_data),
+            .txBytes = ifm->ifm_data.ifi_obytes,
+            .rxBytes = ifm->ifm_data.ifi_ibytes,
+            .txPackets = ifm->ifm_data.ifi_opackets,
+            .rxPackets = ifm->ifm_data.ifi_ipackets,
+            .txErrors = ifm->ifm_data.ifi_oerrors,
+            .rxErrors = ifm->ifm_data.ifi_ierrors,
+            .txDrops = 0, // unsupported
+            .rxDrops = ifm->ifm_data.ifi_iqdrops,
+            .defaultRoute = sdl->sdl_index == defaultRouteIfIndex,
+        };
+    }
+
+    return NULL;
+}

src/detection/netio/netio_linux.c

@@ -0,0 +1,97 @@
+#include "netio.h"
+
+#include "common/io/io.h"
+#include "common/netif/netif.h"
+#include "util/stringUtils.h"
+
+#include <net/if.h>
+
+static void getData(FFstrbuf* buffer, const char* ifName, bool isDefaultRoute, FFstrbuf* path, FFlist* result)
+{
+    ffStrbufSetF(path, "/sys/class/net/%s/operstate", ifName);
+    if(!ffReadFileBuffer(path->chars, buffer) || !ffStrbufEqualS(buffer, "up"))
+        return;
+
+    FFNetIOResult* counters = (FFNetIOResult*) ffListAdd(result);
+    ffStrbufInitS(&counters->name, ifName);
+    counters->defaultRoute = isDefaultRoute;
+
+    ffStrbufSetF(path, "/sys/class/net/%s/statistics/", ifName);
+    uint32_t statLen = path->length;
+
+    ffStrbufAppendS(path, "rx_bytes");
+    if (ffReadFileBuffer(path->chars, buffer))
+        counters->rxBytes = ffStrbufToUInt(buffer, 0);
+    ffStrbufSubstrBefore(path, statLen);
+
+    ffStrbufAppendS(path, "tx_bytes");
+    if (ffReadFileBuffer(path->chars, buffer))
+        counters->txBytes = ffStrbufToUInt(buffer, 0);
+    ffStrbufSubstrBefore(path, statLen);
+
+    ffStrbufAppendS(path, "rx_packets");
+    if (ffReadFileBuffer(path->chars, buffer))
+        counters->rxPackets = ffStrbufToUInt(buffer, 0);
+    ffStrbufSubstrBefore(path, statLen);
+
+    ffStrbufAppendS(path, "tx_packets");
+    if (ffReadFileBuffer(path->chars, buffer))
+        counters->txPackets = ffStrbufToUInt(buffer, 0);
+    ffStrbufSubstrBefore(path, statLen);
+
+    ffStrbufAppendS(path, "rx_errors");
+    if (ffReadFileBuffer(path->chars, buffer))
+        counters->rxErrors = ffStrbufToUInt(buffer, 0);
+    ffStrbufSubstrBefore(path, statLen);
+
+    ffStrbufAppendS(path, "tx_errors");
+    if (ffReadFileBuffer(path->chars, buffer))
+        counters->txErrors = ffStrbufToUInt(buffer, 0);
+    ffStrbufSubstrBefore(path, statLen);
+
+    ffStrbufAppendS(path, "rx_dropped");
+    if (ffReadFileBuffer(path->chars, buffer))
+        counters->rxDrops = ffStrbufToUInt(buffer, 0);
+    ffStrbufSubstrBefore(path, statLen);
+
+    ffStrbufAppendS(path, "tx_dropped");
+    if (ffReadFileBuffer(path->chars, buffer))
+        counters->txDrops = ffStrbufToUInt(buffer, 0);
+    ffStrbufSubstrBefore(path, statLen);
+}
+
+const char* ffNetIOGetIoCounters(FFlist* result, FFNetIOOptions* options)
+{
+    FF_AUTO_CLOSE_DIR DIR* dirp = opendir("/sys/class/net");
+    if (!dirp) return "opendir(\"/sys/class/net\") == NULL";
+
+    FF_STRBUF_AUTO_DESTROY path = ffStrbufCreateA(64);
+    FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
+
+    const char* defaultRouteIfName = ffNetifGetDefaultRouteIfName();
+
+    if (options->defaultRouteOnly)
+    {
+        if (options->namePrefix.length && strncmp(defaultRouteIfName, options->namePrefix.chars, options->namePrefix.length) != 0)
+            return NULL;
+
+       getData(&buffer, defaultRouteIfName, true, &path, result);
+    }
+    else
+    {
+        struct dirent* entry;
+        while((entry = readdir(dirp)) != NULL)
+        {
+            const char* ifName = entry->d_name;
+            if(ifName[0] == '.')
+                continue;
+
+            if (options->namePrefix.length && strncmp(ifName, options->namePrefix.chars, options->namePrefix.length) != 0)
+                continue;
+
+            getData(&buffer, ifName, ffStrEquals(ifName, defaultRouteIfName), &path, result);
+        }
+    }
+
+    return NULL;
+}

src/detection/netio/netio_windows.c

@@ -0,0 +1,74 @@
+#include "netio.h"
+
+#include "common/netif/netif.h"
+#include "util/mallocHelper.h"
+#include "util/windows/unicode.h"
+
+#include <ws2tcpip.h>
+#include <iphlpapi.h>
+
+const char* ffNetIOGetIoCounters(FFlist* result, FFNetIOOptions* options)
+{
+    IP_ADAPTER_ADDRESSES* FF_AUTO_FREE adapter_addresses = NULL;
+
+    // Multiple attempts in case interfaces change while
+    // we are in the middle of querying them.
+    DWORD adapter_addresses_buffer_size = 0;
+    for (int attempts = 0;; ++attempts)
+    {
+        if (adapter_addresses_buffer_size)
+        {
+            adapter_addresses = (IP_ADAPTER_ADDRESSES*)realloc(adapter_addresses, adapter_addresses_buffer_size);
+            assert(adapter_addresses);
+        }
+
+        DWORD error = GetAdaptersAddresses(
+            AF_UNSPEC,
+            GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST | GAA_FLAG_SKIP_DNS_SERVER,
+            NULL,
+            adapter_addresses,
+            &adapter_addresses_buffer_size);
+
+        if (error == ERROR_SUCCESS)
+            break;
+        else if (ERROR_BUFFER_OVERFLOW == error && attempts < 4)
+            continue;
+        else
+            return "GetAdaptersAddresses() failed";
+    }
+
+    uint32_t defaultRouteIfIndex = ffNetifGetDefaultRouteIfIndex();
+
+    // Iterate through all of the adapters
+    for (IP_ADAPTER_ADDRESSES* adapter = adapter_addresses; adapter; adapter = adapter->Next)
+    {
+        bool isDefaultRoute = adapter->IfIndex == defaultRouteIfIndex;
+        if (options->defaultRouteOnly && !isDefaultRoute)
+            continue;
+
+        char name[128];
+        WideCharToMultiByte(CP_UTF8, 0, adapter->FriendlyName, -1, name, sizeof(name), NULL, NULL);
+        if (options->namePrefix.length && strncmp(name, options->namePrefix.chars, options->namePrefix.length) != 0)
+            continue;
+
+        MIB_IF_ROW2 ifRow = { .InterfaceIndex = adapter->IfIndex };
+        if (GetIfEntry2(&ifRow) == NO_ERROR)
+        {
+            FFNetIOResult* counters = (FFNetIOResult*) ffListAdd(result);
+            *counters = (FFNetIOResult) {
+                .name = ffStrbufCreateS(name),
+                .txBytes = ifRow.OutOctets,
+                .rxBytes = ifRow.InOctets,
+                .txPackets = (ifRow.OutUcastPkts + ifRow.OutNUcastPkts),
+                .rxPackets = (ifRow.InUcastPkts + ifRow.InNUcastPkts),
+                .rxErrors = ifRow.InErrors,
+                .txErrors = ifRow.OutErrors,
+                .rxDrops = ifRow.InDiscards,
+                .txDrops = ifRow.OutDiscards,
+                .defaultRoute = isDefaultRoute,
+            };
+        }
+    }
+
+    return NULL;
+}

src/detection/opencl/opencl.c

@@ -49,14 +49,17 @@ static const char* openCLHandleData(OpenCLData* data, FFOpenCLResult* result)
     if(ffStrStartsWithIgnCase(version, "OpenCL "))
         versionPretty = version + strlen("OpenCL ");
     ffStrbufSetS(&result->version, versionPretty);
+    ffStrbufTrim(&result->version, ' ');
 
     ffStrbufEnsureFree(&result->device, 128);
     data->ffclGetDeviceInfo(deviceID, CL_DEVICE_NAME, result->device.allocated, result->device.chars, NULL);
     ffStrbufRecalculateLength(&result->device);
+    ffStrbufTrim(&result->device, ' ');
 
     ffStrbufEnsureFree(&result->vendor, 32);
     data->ffclGetDeviceInfo(deviceID, CL_DEVICE_VENDOR, result->vendor.allocated, result->vendor.chars, NULL);
     ffStrbufRecalculateLength(&result->vendor);
+    ffStrbufTrim(&result->vendor, ' ');
 
     return NULL;
 }

src/detection/opengl/opengl_linux.c

@@ -363,7 +363,7 @@ const char* ffDetectOpenGL(FFOpenGLOptions* options, FFOpenGLResult* result)
 
     #else
 
-        FF_UNUSED(result);
+        FF_UNUSED(options, result);
         return "Fastfetch was built without gl support.";
 
     #endif //FF_HAVE_GL

src/detection/os/os_linux.c

@@ -1,6 +1,7 @@
 #include "os.h"
 #include "common/properties.h"
 #include "common/parsing.h"
+#include "common/io/io.h"
 #include "util/stringUtils.h"
 
 #include <string.h>
@@ -121,6 +122,15 @@ static void getUbuntuFlavour(FFOSResult* result)
     }
 }
 
+static void getDebianVersion(FFOSResult* result)
+{
+    FF_STRBUF_AUTO_DESTROY debianVersion = ffStrbufCreate();
+    ffAppendFileBuffer("/etc/debian_version", &debianVersion);
+    if (!debianVersion.length) return;
+    ffStrbufSet(&result->version, &debianVersion);
+    ffStrbufSet(&result->versionID, &debianVersion);
+}
+
 static void detectOS(FFOSResult* os)
 {
     if(instance.config.osFile.length > 0)
@@ -169,6 +179,8 @@ void ffDetectOSImpl(FFOSResult* os)
 
     detectOS(os);
 
-    if(ffStrbufIgnCaseCompS(&os->id, "ubuntu") == 0)
+    if(ffStrbufIgnCaseEqualS(&os->id, "ubuntu"))
         getUbuntuFlavour(os);
+    else if(ffStrbufIgnCaseEqualS(&os->id, "debian"))
+        getDebianVersion(os);
 }

src/detection/packages/packages.h

@@ -27,6 +27,7 @@ typedef struct FFPackagesResult
     uint32_t rpm;
     uint32_t scoop;
     uint32_t snap;
+    uint32_t winget;
     uint32_t xbps;
 
     uint32_t all; //Make sure this goes last

src/detection/packages/packages_linux.c

@@ -197,6 +197,9 @@ static uint32_t getSnap(FFstrbuf* baseDir)
 {
     uint32_t result = getNumElements(baseDir, "/snap", DT_DIR);
 
+    if (result == 0)
+        result = getNumElements(baseDir, "/var/lib/snapd/snap", DT_DIR);
+
     //Accounting for the /snap/bin folder
     return result > 0 ? result - 1 : 0;
 }
@@ -262,7 +265,7 @@ static uint32_t getRpmFromLibrpm(void)
 static void getPackageCounts(FFstrbuf* baseDir, FFPackagesResult* packageCounts)
 {
     packageCounts->apk += getNumStrings(baseDir, "/lib/apk/db/installed", "C:Q");
-    packageCounts->dpkg += getNumStrings(baseDir, "/var/lib/dpkg/status", "Status: ");
+    packageCounts->dpkg += getNumStrings(baseDir, "/var/lib/dpkg/status", "Status: install ok installed");
     packageCounts->emerge += countFilesRecursive(baseDir, "/var/db/pkg", "SIZE");
     packageCounts->eopkg += getNumElements(baseDir, "/var/lib/eopkg/package", DT_DIR);
     packageCounts->flatpakSystem += getFlatpak(baseDir, "/var/lib/flatpak");

src/detection/packages/packages_windows.c

@@ -1,4 +1,5 @@
 #include "packages.h"
+#include "common/processing.h"
 #include "util/stringUtils.h"
 
 #include <handleapi.h>
@@ -62,7 +63,7 @@ static void detectChoco(FF_MAYBE_UNUSED FFPackagesResult* result)
     result->choco = getNumElements(chocoPath, FILE_ATTRIBUTE_DIRECTORY, "choco");
 }
 
-static void detectPacman(FF_MAYBE_UNUSED FFPackagesResult* result)
+static void detectPacman(FFPackagesResult* result)
 {
     const char* msystemPrefix = getenv("MSYSTEM_PREFIX");
     if(!msystemPrefix)
@@ -75,9 +76,40 @@ static void detectPacman(FF_MAYBE_UNUSED FFPackagesResult* result)
     result->pacman = getNumElements(pacmanPath, FILE_ATTRIBUTE_DIRECTORY, NULL);
 }
 
+static void detectWinget(FFPackagesResult* result)
+{
+    FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
+    if (ffProcessAppendStdOut(&buffer, (char* []) {
+        "winget.exe",
+        "list",
+        "--disable-interactivity",
+        NULL,
+    }))
+        return;
+
+    uint32_t index = ffStrbufFirstIndexS(&buffer, "--\r\n"); // Ignore garbage and table headers
+    if (index == buffer.length)
+        return;
+
+    uint32_t count = 0;
+    for (
+        index += strlen("--\r\n");
+        (index = ffStrbufNextIndexC(&buffer, index, '\n')) < buffer.length;
+        ++index
+    )
+        ++count;
+
+    if (buffer.chars[buffer.length - 1] != '\n') // count last line
+        ++count;
+
+    result->winget = count;
+}
+
 void ffDetectPackagesImpl(FFPackagesResult* result)
 {
     detectScoop(result);
     detectChoco(result);
     detectPacman(result);
+    if (instance.config.allowSlowOperations)
+        detectWinget(result);
 }

src/detection/poweradapter/poweradapter.h

@@ -5,14 +5,14 @@
 
 #include "fastfetch.h"
 
-typedef struct PowerAdapterResult
+typedef struct FFPowerAdapterResult
 {
     FFstrbuf description;
     FFstrbuf name;
     FFstrbuf modelName;
     FFstrbuf manufacturer;
     int watts;
-} PowerAdapterResult;
+} FFPowerAdapterResult;
 
 const char* ffDetectPowerAdapterImpl(FFlist* results);
 

src/detection/poweradapter/poweradapter_apple.c

@@ -24,7 +24,7 @@ const char* ffDetectPowerAdapterImpl(FFlist* results)
             continue;
         }
 
-        PowerAdapterResult* adapter = ffListAdd(results);
+        FFPowerAdapterResult* adapter = ffListAdd(results);
 
         ffStrbufInit(&adapter->name);
         ffStrbufInit(&adapter->description);

src/detection/processes/processes_windows.c

@@ -6,18 +6,26 @@
 
 const char* ffDetectProcesses(uint32_t* result)
 {
+    SYSTEM_PROCESS_INFORMATION* FF_AUTO_FREE pstart = NULL;
+
+    // Multiple attempts in case processes change while
+    // we are in the middle of querying them.
     ULONG size = 0;
-    if(NtQuerySystemInformation(SystemProcessInformation, NULL, 0, &size) != STATUS_INFO_LENGTH_MISMATCH)
-        return "NtQuerySystemInformation(SystemProcessInformation, NULL) failed";
-
-    size += sizeof(SystemProcessInformation) * 5; //What if new processes are created during two syscalls?
-
-    SYSTEM_PROCESS_INFORMATION* FF_AUTO_FREE pstart = (SYSTEM_PROCESS_INFORMATION*)malloc(size);
-    if(!pstart)
-        return "malloc(size) failed";
-
-    if(!NT_SUCCESS(NtQuerySystemInformation(SystemProcessInformation, pstart, size, NULL)))
-        return "NtQuerySystemInformation(SystemProcessInformation, pstart) failed";
+    for (int attempts = 0;; ++attempts)
+    {
+        if (size)
+        {
+            pstart = (SYSTEM_PROCESS_INFORMATION*)realloc(pstart, size);
+            assert(pstart);
+        }
+        NTSTATUS status = NtQuerySystemInformation(SystemProcessInformation, pstart, size, &size);
+        if(NT_SUCCESS(status))
+            break;
+        else if(status == STATUS_INFO_LENGTH_MISMATCH && attempts < 4)
+            size += sizeof(SYSTEM_PROCESS_INFORMATION) * 5;
+        else
+            return "NtQuerySystemInformation(SystemProcessInformation) failed";
+    }
 
     *result = 1; //Init with 1 because we test for ptr->NextEntryOffset
     for (SYSTEM_PROCESS_INFORMATION* ptr = pstart; ptr->NextEntryOffset; ptr = (SYSTEM_PROCESS_INFORMATION*)((uint8_t*)ptr + ptr->NextEntryOffset))

src/detection/publicip/publicip.c

@@ -0,0 +1,73 @@
+#include "publicip.h"
+#include "common/networking.h"
+
+static FFNetworkingState state;
+static int status = -1;
+
+void ffPreparePublicIp(FFPublicIpOptions* options)
+{
+    if (status != -1)
+    {
+        fputs("Error: this module can only be used once due to internal limitations\n", stderr);
+        exit(1);
+    }
+
+    if (options->url.length == 0)
+        status = ffNetworkingSendHttpRequest(&state, "ipinfo.io", "/json", NULL);
+    else
+    {
+        FF_STRBUF_AUTO_DESTROY host = ffStrbufCreateCopy(&options->url);
+        ffStrbufSubstrAfterFirstS(&host, "://");
+        uint32_t pathStartIndex = ffStrbufFirstIndexC(&host, '/');
+
+        FF_STRBUF_AUTO_DESTROY path = ffStrbufCreate();
+        if(pathStartIndex != host.length)
+        {
+            ffStrbufAppendNS(&path, pathStartIndex, host.chars + (host.length - pathStartIndex));
+            host.length = pathStartIndex;
+            host.chars[pathStartIndex] = '\0';
+        }
+
+        status = ffNetworkingSendHttpRequest(&state, host.chars, path.length == 0 ? "/" : path.chars, NULL);
+    }
+}
+
+static inline void wrapYyjsonFree(yyjson_doc** doc)
+{
+    assert(doc);
+    if (*doc)
+        yyjson_doc_free(*doc);
+}
+
+const char* ffDetectPublicIp(FFPublicIpOptions* options, FFPublicIpResult* result)
+{
+    if (status == -1)
+        ffPreparePublicIp(options);
+
+    if (status == 0)
+        return "Failed to connect to an IP detection server";
+
+    FF_STRBUF_AUTO_DESTROY response = ffStrbufCreateA(4096);
+    bool success = ffNetworkingRecvHttpResponse(&state, &response, options->timeout);
+    if (success) ffStrbufSubstrAfterFirstS(&response, "\r\n\r\n");
+
+    if (!success || response.length == 0)
+        return "Failed to receive the server response";
+
+    if (options->url.length == 0)
+    {
+        yyjson_doc* __attribute__((__cleanup__(wrapYyjsonFree))) doc = yyjson_read_opts(response.chars, response.length, 0, NULL, NULL);
+        if (doc)
+        {
+            yyjson_val* root = yyjson_doc_get_root(doc);
+            ffStrbufAppendS(&result->ip, yyjson_get_str(yyjson_obj_get(root, "ip")));
+            ffStrbufDestroy(&result->location);
+            ffStrbufInitF(&result->location, "%s, %s", yyjson_get_str(yyjson_obj_get(root, "city")), yyjson_get_str(yyjson_obj_get(root, "country")));
+            return NULL;
+        }
+    }
+
+    ffStrbufDestroy(&result->ip);
+    ffStrbufInitMove(&result->ip, &response);
+    return NULL;
+}

src/detection/publicip/publicip.h

@@ -0,0 +1,17 @@
+#pragma once
+
+#ifndef FF_INCLUDED_detection_publicip_publicip
+#define FF_INCLUDED_detection_publicip_publicip
+
+#include "fastfetch.h"
+
+typedef struct FFPublicIpResult
+{
+    FFstrbuf ip;
+    FFstrbuf location;
+} FFPublicIpResult;
+
+void ffPreparePublicIp(FFPublicIpOptions* options);
+const char* ffDetectPublicIp(FFPublicIpOptions* options, FFPublicIpResult* result);
+
+#endif

src/detection/terminalfont/terminalfont.c

@@ -237,7 +237,7 @@ static void detectFromWindowsTeriminal(const FFstrbuf* terminalExe, FFTerminalFo
 
 #endif //defined(_WIN32) || defined(__linux__)
 
-FF_MAYBE_UNUSED static bool detectKitty(FFTerminalFontResult* result)
+FF_MAYBE_UNUSED static bool detectKitty(const FFstrbuf* exe, FFTerminalFontResult* result)
 {
     FF_STRBUF_AUTO_DESTROY fontName = ffStrbufCreate();
     FF_STRBUF_AUTO_DESTROY fontSize = ffStrbufCreate();
@@ -247,6 +247,23 @@ FF_MAYBE_UNUSED static bool detectKitty(FFTerminalFontResult* result)
         {"font_size ", &fontSize},
     };
 
+    if(instance.config.allowSlowOperations)
+    {
+        FF_STRBUF_AUTO_DESTROY buf = ffStrbufCreate();
+        if(!ffProcessAppendStdOut(&buf, (char* const[]){
+            exe->chars,
+            "+kitten",
+            "query-terminal",
+            NULL,
+        }))
+        {
+            ffParsePropLines(buf.chars, "font_family: ", &fontName);
+            ffParsePropLines(buf.chars, "font_size: ", &fontSize);
+            ffFontInitValues(&result->font, fontName.chars, fontSize.chars);
+            return true;
+        }
+    }
+
     if(!ffParsePropFileConfigValues("kitty/kitty.conf", 2, fontQuery))
         return false;
 
@@ -338,6 +355,35 @@ static bool detectTabby(FFTerminalFontResult* result)
     return true;
 }
 
+static bool detectContour(const FFstrbuf* exe, FFTerminalFontResult* result)
+{
+    FF_STRBUF_AUTO_DESTROY buf = ffStrbufCreate();
+    if(ffProcessAppendStdOut(&buf, (char* const[]){
+        exe->chars,
+        "font-locator",
+        NULL
+    }))
+    {
+        ffStrbufAppendS(&result->error, "`contour font-locator` failed");
+        return false;
+    }
+
+    //[error] Missing key .logging.enabled. Using default: false.
+    //[error] ...
+    //Matching fonts using  : Fontconfig
+    //Font description      : (family=Sarasa Term SC Nerd weight=Regular slant=Roman spacing=Monospace, strict_spacing=yes)
+    //Number of fonts found : 49
+    //  path /usr/share/fonts/google-noto/NotoSansMono-Regular.ttf Regular Roman
+    //  path ...
+
+    uint32_t index = ffStrbufFirstIndexS(&buf, "Font description      : (family=");
+    if(index >= buf.length) return false;
+    index += (uint32_t) strlen("Font description      : (family=");
+    ffStrbufSubstrBefore(&buf, ffStrbufNextIndexS(&buf, index, " weight="));
+    ffFontInitCopy(&result->font, buf.chars + index);
+    return true;
+}
+
 void ffDetectTerminalFontPlatform(const FFTerminalShellResult* terminalShell, FFTerminalFontResult* terminalFont);
 
 static bool detectTerminalFontCommon(const FFTerminalShellResult* terminalShell, FFTerminalFontResult* terminalFont)
@@ -350,12 +396,14 @@ static bool detectTerminalFontCommon(const FFTerminalShellResult* terminalShell,
         detectWezterm(terminalFont);
     else if(ffStrbufStartsWithIgnCaseS(&terminalShell->terminalProcessName, "tabby"))
         detectTabby(terminalFont);
+    else if(ffStrbufStartsWithIgnCaseS(&terminalShell->terminalProcessName, "contour"))
+        detectContour(&terminalShell->terminalExe, terminalFont);
 
     #ifndef _WIN32
     else if(ffStrbufStartsWithIgnCaseS(&terminalShell->terminalExe, "/dev/pts/"))
         ffStrbufAppendS(&terminalFont->error, "Terminal font detection is not supported on PTS");
     else if(ffStrbufIgnCaseEqualS(&terminalShell->terminalProcessName, "kitty"))
-        detectKitty(terminalFont);
+        detectKitty(&terminalShell->terminalExe, terminalFont);
     else if(ffStrbufStartsWithIgnCaseS(&terminalShell->terminalExe, "/dev/tty"))
         detectTTY(terminalFont);
     #endif

src/detection/terminalfont/terminalfont_android.c

@@ -55,7 +55,7 @@ exit:
 
 void ffDetectTerminalFontPlatform(const FFTerminalShellResult* terminalShell, FFTerminalFontResult* terminalFont)
 {
-    if(ffStrbufCompS(&terminalShell->terminalProcessName, "Termux") != 0)
+    if(ffStrbufCompS(&terminalShell->terminalProcessName, "com.termux") != 0)
     {
         ffStrbufSetS(&terminalFont->error, "Unsupported terminal");
         return;

src/detection/terminalshell/terminalshell.c

@@ -128,6 +128,13 @@ static bool getShellVersionOksh(FFstrbuf* exe, FFstrbuf* version)
     return true;
 }
 
+static bool getShellVersionNushell(FFstrbuf* exe, FFstrbuf* version)
+{
+    ffStrbufSetS(version, getenv("NU_VERSION"));
+    if (version->length) return true;
+    return getExeVersionRaw(exe, version); //0.73.0
+}
+
 #ifdef _WIN32
 static bool getShellVersionWinPowerShell(FFstrbuf* exe, FFstrbuf* version)
 {
@@ -158,7 +165,7 @@ bool fftsGetShellVersion(FFstrbuf* exe, const char* exeName, FFstrbuf* version)
     if(strcasecmp(exeName, "csh") == 0 || strcasecmp(exeName, "tcsh") == 0)
         return getExeVersionGeneral(exe, version); //tcsh 6.24.07 (Astron) 2022-12-21 (aarch64-apple-darwin) options wide,nls,dl,al,kan,sm,rh,color,filec
     if(strcasecmp(exeName, "nu") == 0)
-        return getExeVersionRaw(exe, version); //0.73.0
+        return getShellVersionNushell(exe, version);
     if(strcasecmp(exeName, "ksh") == 0)
         return getShellVersionKsh(exe, version);
     if(strcasecmp(exeName, "oksh") == 0)
@@ -263,6 +270,20 @@ FF_MAYBE_UNUSED static bool getTerminalVersionXterm(FFstrbuf* exe, FFstrbuf* ver
     return version->length > 0;
 }
 
+static bool getTerminalVersionContour(FFstrbuf* exe, FFstrbuf* version)
+{
+    const char* env = getenv("TERMINAL_VERSION_STRING");
+    if (env)
+    {
+        ffStrbufAppendS(version, env);
+        return true;
+    }
+    if(!getExeVersionRaw(exe, version)) return false;
+    // Contour Terminal Emulator 0.3.12.262
+    ffStrbufSubstrAfterFirstC(version, ' ');
+    return version->length > 0;
+}
+
 #ifdef _WIN32
 
 static bool getTerminalVersionWindowsTerminal(FFstrbuf* exe, FFstrbuf* version)
@@ -296,7 +317,7 @@ bool fftsGetTerminalVersion(FFstrbuf* processName, FF_MAYBE_UNUSED FFstrbuf* exe
 {
     #ifdef __ANDROID__
 
-    if(ffStrbufEqualS(processName, "Termux"))
+    if(ffStrbufEqualS(processName, "com.termux"))
         return getTerminalVersionTermux(version);
 
     #endif
@@ -361,6 +382,9 @@ bool fftsGetTerminalVersion(FFstrbuf* processName, FF_MAYBE_UNUSED FFstrbuf* exe
     if(ffStrbufStartsWithIgnCaseS(processName, "alacritty"))
         return getExeVersionGeneral(exe, version);
 
+    if(ffStrbufStartsWithIgnCaseS(processName, "contour"))
+        return getTerminalVersionContour(exe, version);
+
     const char* termProgramVersion = getenv("TERM_PROGRAM_VERSION");
     if(termProgramVersion)
     {

src/detection/terminalshell/terminalshell.h

@@ -20,10 +20,6 @@ typedef struct FFTerminalShellResult
     const char* terminalExeName; //pointer to a char in terminalExe
     FFstrbuf terminalVersion;
     uint32_t terminalPid;
-
-    FFstrbuf userShellExe;
-    const char* userShellExeName; //pointer to a char in userShellExe
-    FFstrbuf userShellVersion;
 } FFTerminalShellResult;
 
 const FFTerminalShellResult* ffDetectTerminalShell();

src/detection/terminalshell/terminalshell_linux.c

@@ -56,7 +56,7 @@ static void getProcessInformation(pid_t pid, FFstrbuf* processName, FFstrbuf* ex
         exe->chars, &size,
         NULL, 0
     ))
-        exe->length = (uint32_t)size;
+        exe->length = (uint32_t)size - 1;
 
     #endif
 
@@ -237,7 +237,7 @@ static void getTerminalFromEnv(FFTerminalShellResult* result)
         getenv("TERMUX_VERSION") != NULL ||
         getenv("TERMUX_MAIN_PACKAGE_FORMAT") != NULL ||
         getenv("TMUX_TMPDIR") != NULL
-    )) term = "Termux";
+    )) term = "com.termux";
     #endif
 
     #ifdef __linux__
@@ -269,18 +269,12 @@ static void getTerminalFromEnv(FFTerminalShellResult* result)
 
 static void getUserShellFromEnv(FFTerminalShellResult* result)
 {
-    ffStrbufSet(&result->userShellExe, &instance.state.platform.userShell);
-    if(result->userShellExe.length == 0)
-        return;
-
-    setExeName(&result->userShellExe, &result->userShellExeName);
-
     //If shell detection via processes failed
-    if(result->shellProcessName.length == 0 && result->userShellExe.length > 0)
+    if(result->shellProcessName.length == 0 && instance.state.platform.userShell.length > 0)
     {
-        ffStrbufAppendS(&result->shellProcessName, result->userShellExeName);
-        ffStrbufSet(&result->shellExe, &result->userShellExe);
+        ffStrbufSet(&result->shellExe, &instance.state.platform.userShell);
         setExeName(&result->shellExe, &result->shellExeName);
+        ffStrbufAppendS(&result->shellProcessName, result->shellExeName);
     }
 }
 
@@ -331,6 +325,8 @@ const FFTerminalShellResult* ffDetectTerminalShell()
     const uint32_t exePathLen = PROC_PIDPATHINFO_MAXSIZE;
     #elif defined(MAXPATH)
     const uint32_t exePathLen = MAXPATH;
+    #elif defined(PATH_MAX)
+    const uint32_t exePathLen = PATH_MAX;
     #else
     const uint32_t exePathLen = 260;
     #endif
@@ -346,10 +342,6 @@ const FFTerminalShellResult* ffDetectTerminalShell()
     result.terminalExeName = result.terminalExe.chars;
     result.terminalPid = 0;
 
-    ffStrbufInit(&result.userShellExe);
-    result.userShellExeName = result.userShellExe.chars;
-    ffStrbufInit(&result.userShellVersion);
-
     getTerminalShell(&result, getppid());
 
     getTerminalFromEnv(&result);
@@ -358,11 +350,6 @@ const FFTerminalShellResult* ffDetectTerminalShell()
     ffStrbufClear(&result.shellVersion);
     getShellVersion(&result.shellExe, result.shellExeName, &result.shellVersion);
 
-    if(strcasecmp(result.shellExeName, result.userShellExeName) != 0)
-        getShellVersion(&result.userShellExe, result.userShellExeName, &result.userShellVersion);
-    else
-        ffStrbufSet(&result.userShellVersion, &result.shellVersion);
-
     if(ffStrbufEqualS(&result.shellProcessName, "pwsh"))
         ffStrbufInitStatic(&result.shellPrettyName, "PowerShell");
     else if(ffStrbufEqualS(&result.shellProcessName, "nu"))
@@ -388,7 +375,13 @@ const FFTerminalShellResult* ffDetectTerminalShell()
 
     if(ffStrbufEqualS(&result.terminalProcessName, "wezterm-gui"))
         ffStrbufInitStatic(&result.terminalPrettyName, "WezTerm");
-    #if defined(__linux__) || defined(__FreeBSD__)
+
+    #if defined(__ANDROID__)
+
+    else if(ffStrbufEqualS(&result.terminalProcessName, "com.termux"))
+        ffStrbufInitStatic(&result.terminalPrettyName, "Termux");
+
+    #elif defined(__linux__) || defined(__FreeBSD__)
 
     else if(ffStrbufStartsWithS(&result.terminalProcessName, "gnome-terminal-"))
         ffStrbufInitStatic(&result.terminalPrettyName, "gnome-terminal");

src/detection/terminalshell/terminalshell_windows.c

@@ -379,10 +379,6 @@ const FFTerminalShellResult* ffDetectTerminalShell(void)
     ffStrbufInit(&result.terminalPrettyName);
     result.terminalPid = 0;
 
-    ffStrbufInit(&result.userShellExe);
-    result.userShellExeName = "";
-    ffStrbufInit(&result.userShellVersion);
-
     uint32_t ppid;
     if(!getProcessInfo(0, &ppid, NULL, NULL, NULL))
         goto exit;

src/detection/uptime/uptime.h

@@ -5,6 +5,12 @@
 
 #include "fastfetch.h"
 
-const char* ffDetectUptime(uint64_t* result);
+typedef struct FFUptimeResult
+{
+    uint64_t bootTime;
+    uint64_t uptime;
+} FFUptimeResult;
+
+const char* ffDetectUptime(FFUptimeResult* result);
 
 #endif