[FEAT] An attemp on adding qi package detection.

[lidgnulinux]

Hello, I'm using Dragora GNU/Linux and trying to add its package detection. Dragora's using qi package manager and it doesn't have feature to count installed packages other than counting parent directory under /usr/pkg, but I managed to make list installed packages and it can be used. I'm trying to add qi package detection for fastfetch but when I build it failed. These are my codes :

diff --git a/src/detection/packages/packages.h b/src/detection/packages/packages.h
index 4e954b96..20d97c16 100644
--- a/src/detection/packages/packages.h
+++ b/src/detection/packages/packages.h
@@ -24,6 +24,7 @@ typedef struct FFPackagesResult
     uint32_t paludis;
     uint32_t pkg;
     uint32_t pkgtool;
+    uint32_t qi;
     uint32_t macports;
     uint32_t rpm;
     uint32_t scoop;
diff --git a/src/detection/packages/packages_linux.c b/src/detection/packages/packages_linux.c
index 5933c87c..4390f31d 100644
--- a/src/detection/packages/packages_linux.c
+++ b/src/detection/packages/packages_linux.c
@@ -413,6 +413,7 @@ static void getPackageCounts(FFstrbuf* baseDir, FFPackagesResult* packageCounts,
     if (!(options->disabled & FF_PACKAGES_FLAG_APK_BIT)) packageCounts->apk += getNumStrings(baseDir, "/lib/apk/db/installed", "C:Q");
     if (!(options->disabled & FF_PACKAGES_FLAG_DPKG_BIT)) packageCounts->dpkg += getNumStrings(baseDir, "/var/lib/dpkg/status", "Status: install ok installed");
     if (!(options->disabled & FF_PACKAGES_FLAG_LPKG_BIT)) packageCounts->lpkg += getNumStrings(baseDir, "/opt/Loc-OS-LPKG/installed-lpkg/Listinstalled-lpkg.list", "\n");
+    if (!(options->disabled & FF_PACKAGES_FLAG_QI_BIT)) packageCounts->qi += getNumStrings(baseDir, "/var/qi/installed_packages.list", "\n");
     if (!(options->disabled & FF_PACKAGES_FLAG_EMERGE_BIT)) packageCounts->emerge += countFilesRecursive(baseDir, "/var/db/pkg", "SIZE");
     if (!(options->disabled & FF_PACKAGES_FLAG_EOPKG_BIT)) packageCounts->eopkg += getNumElements(baseDir, "/var/lib/eopkg/package", DT_DIR);
     if (!(options->disabled & FF_PACKAGES_FLAG_FLATPAK_BIT)) packageCounts->flatpakSystem += getFlatpak(baseDir, "/var/lib/flatpak");
diff --git a/src/modules/packages/option.h b/src/modules/packages/option.h
index f294b916..8876547b 100644
--- a/src/modules/packages/option.h
+++ b/src/modules/packages/option.h
@@ -30,6 +30,7 @@ typedef enum FFPackagesFlags
     FF_PACKAGES_FLAG_SORCERY_BIT = 1 << 20,
     FF_PACKAGES_FLAG_LPKG_BIT = 1 << 21,
     FF_PACKAGES_FLAG_LPKGBUILD_BIT = 1 << 22,
+    FF_PACKAGES_FLAG_QI_BIT = 1 << 23,
 } FFPackagesFlags;
 
 typedef struct FFPackagesOptions
diff --git a/src/modules/packages/packages.c b/src/modules/packages/packages.c
index 229e1f43..a3e46738 100644
--- a/src/modules/packages/packages.c
+++ b/src/modules/packages/packages.c
@@ -62,6 +62,7 @@ void ffPrintPackages(FFPackagesOptions* options)
         FF_PRINT_PACKAGE(choco)
         FF_PRINT_PACKAGE(pkgtool)
         FF_PRINT_PACKAGE(paludis)
+        FF_PRINT_PACKAGE(qi)
         FF_PRINT_PACKAGE(winget)
         FF_PRINT_PACKAGE(opkg)
         FF_PRINT_PACKAGE(am)
@@ -100,6 +101,7 @@ void ffPrintPackages(FFPackagesOptions* options)
             {FF_FORMAT_ARG_TYPE_UINT, &counts.choco},
             {FF_FORMAT_ARG_TYPE_UINT, &counts.pkgtool},
             {FF_FORMAT_ARG_TYPE_UINT, &counts.paludis},
+            {FF_FORMAT_ARG_TYPE_UINT, &counts.qi},
             {FF_FORMAT_ARG_TYPE_UINT, &counts.winget},
             {FF_FORMAT_ARG_TYPE_UINT, &counts.opkg},
             {FF_FORMAT_ARG_TYPE_UINT, &counts.am},
@@ -176,6 +178,9 @@ bool ffParsePackagesCommandOptions(FFPackagesOptions* options, const char* key,
                     FF_TEST_PACKAGE_NAME(PKGTOOL)
                     FF_TEST_PACKAGE_NAME(PALUDIS)
                     break;
+                case 'Q': if (false);
+                    FF_TEST_PACKAGE_NAME(QI)
+                    break;
                 case 'R': if (false);
                     FF_TEST_PACKAGE_NAME(RPM)
                     break;
@@ -281,6 +286,9 @@ void ffParsePackagesJsonObject(FFPackagesOptions* options, yyjson_val* module)
                             FF_TEST_PACKAGE_NAME(PKGTOOL)
                             FF_TEST_PACKAGE_NAME(PALUDIS)
                             break;
+                        case 'Q': if (false);
+                            FF_TEST_PACKAGE_NAME(QI)
+                            break;
                         case 'R': if (false);
                             FF_TEST_PACKAGE_NAME(RPM)
                             break;
@@ -333,6 +341,7 @@ void ffGeneratePackagesJsonConfig(FFPackagesOptions* options, yyjson_mut_doc* do
         FF_TEST_PACKAGE_NAME(PALUDIS)
         FF_TEST_PACKAGE_NAME(PKG)
         FF_TEST_PACKAGE_NAME(PKGTOOL)
+        FF_TEST_PACKAGE_NAME(QI)
         FF_TEST_PACKAGE_NAME(MACPORTS)
         FF_TEST_PACKAGE_NAME(RPM)
         FF_TEST_PACKAGE_NAME(SCOOP)
@@ -379,6 +388,7 @@ void ffGeneratePackagesJsonResult(FF_MAYBE_UNUSED FFPackagesOptions* options, yy
     FF_APPEND_PACKAGE_COUNT(paludis)
     FF_APPEND_PACKAGE_COUNT(pkg)
     FF_APPEND_PACKAGE_COUNT(pkgtool)
+    FF_APPEND_PACKAGE_COUNT(qi)
     FF_APPEND_PACKAGE_COUNT(macports)
     FF_APPEND_PACKAGE_COUNT(rpm)
     FF_APPEND_PACKAGE_COUNT(scoop)
@@ -393,7 +403,7 @@ void ffGeneratePackagesJsonResult(FF_MAYBE_UNUSED FFPackagesOptions* options, yy
 
 void ffPrintPackagesHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_PACKAGES_MODULE_NAME, "{2} (pacman){?3}[{3}]{?}, {4} (dpkg), {5} (rpm), {6} (emerge), {7} (eopkg), {8} (xbps), {9} (nix-system), {10} (nix-user), {11} (nix-default), {12} (apk), {13} (pkg), {14} (flatpak-system), {15} (flatpack-user), {16} (snap), {17} (brew), {18} (brew-cask), {19} (MacPorts), {20} (scoop), {21} (choco), {22} (pkgtool), {23} (paludis), {24} (winget), {25} (opkg), {26} (am), {27} (sorcery), {28} (lpkg), {29} (lpkgbuild)", FF_PACKAGES_NUM_FORMAT_ARGS, ((const char* []) {
+    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_PACKAGES_MODULE_NAME, "{2} (pacman){?3}[{3}]{?}, {4} (dpkg), {5} (rpm), {6} (emerge), {7} (eopkg), {8} (xbps), {9} (nix-system), {10} (nix-user), {11} (nix-default), {12} (apk), {13} (pkg), {14} (flatpak-system), {15} (flatpack-user), {16} (snap), {17} (brew), {18} (brew-cask), {19} (MacPorts), {20} (scoop), {21} (choco), {22} (pkgtool), {23} (paludis), {24} (winget), {25} (opkg), {26} (am), {27} (sorcery), {28} (lpkg), {29} (lpkgbuild), {30} (qi)", FF_PACKAGES_NUM_FORMAT_ARGS, ((const char* []) {
         "Number of all packages",
         "Number of pacman packages",
         "Pacman branch on manjaro",
@@ -423,6 +433,7 @@ void ffPrintPackagesHelpFormat(void)
         "Number of sorcery packages",
         "Number of lpkg packages",
         "Number of lpkgbuild packages",
+        "Number of qi packages",
         "Total number of all nix packages",
         "Total number of all flatpak packages",
         "Total number of all brew packages",

Any clue where it's wrong ? Thanks.

[lidgnulinux]

These are the errors when I build :

ninja: job failed: /bin/cc -DFF_HAVE_DBUS=1 -DFF_HAVE_DCONF=1 -DFF_HAVE_DRM=1 -DFF_HAVE_EGL=1 -DFF_HAVE_GIO=1 -DFF_HAVE_OSMESA=1 -DFF_HAVE_PULSE=1 -DFF_HAVE_SQLITE3=1 -DFF_HAVE_STATX -DFF_HAVE_THREADS -DFF_HAVE_VULKAN=1 -DFF_HAVE_WAYLAND=1 -DFF_HAVE_WCWIDTH -DFF_HAVE_X11=1 -DFF_HAVE_XCB=1 -DFF_HAVE_XCB_RANDR=1 -DFF_HAVE_XRANDR=1 -DFF_HAVE_ZLIB=1 -DFF_MUSL_VERSION=\"1.2.5\" -DFF_USE_PROPRIETARY_GPU_DRIVER_API -DFF_USE_SYSTEM_YYJSON -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D_REENTRANT -D_XOPEN_SOURCE -D__STDC_WANT_LIB_EXT1__=1 -I/usr/include/libdrm -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/dconf -I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include -I/home/dragora/cmp/fastfetch/fastfetch-2.13.1/build -I/home/dragora/cmp/fastfetch/fastfetch-2.13.1/src -Wall -Wextra -Wconversion -Werror=uninitialized -Werror=return-type -Werror=incompatible-pointer-types -Werror=implicit-function-declaration -Werror=int-conversion -O3 -DNDEBUG -flto=auto -fno-fat-lto-objects -std=gnu11 -MD -MT CMakeFiles/libfastfetch.dir/src/modules/packages/packages.c.o -MF CMakeFiles/libfastfetch.dir/src/modules/packages/packages.c.o.d -o CMakeFiles/libfastfetch.dir/src/modules/packages/packages.c.o -c /home/dragora/cmp/fastfetch/fastfetch-2.13.1/src/modules/packages/packages.c
In file included from /home/dragora/cmp/fastfetch/fastfetch-2.13.1/src/util/FFlist.h:7,
                 from /home/dragora/cmp/fastfetch/fastfetch-2.13.1/src/fastfetch.h:22,
                 from /home/dragora/cmp/fastfetch/fastfetch-2.13.1/src/common/printing.h:3,
                 from /home/dragora/cmp/fastfetch/fastfetch-2.13.1/src/modules/packages/packages.c:1:
/home/dragora/cmp/fastfetch/fastfetch-2.13.1/src/modules/packages/packages.c: In function ‘ffPrintPackages’:
/home/dragora/cmp/fastfetch/fastfetch-2.13.1/src/common/printing.h:17:5: error: static assertion failed: "Invalid number of format arguments"
   17 |     static_assert(sizeof(arguments) / sizeof(*(arguments)) == (numArgs), "Invalid number of format arguments");\
      |     ^~~~~~~~~~~~~
/home/dragora/cmp/fastfetch/fastfetch-2.13.1/src/modules/packages/packages.c:80:9: note: in expansion of macro ‘FF_PRINT_FORMAT_CHECKED’
   80 |         FF_PRINT_FORMAT_CHECKED(FF_PACKAGES_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_PACKAGES_NUM_FORMAT_ARGS, ((FFformatarg[]){
      |         ^~~~~~~~~~~~~~~~~~~~~~~
/home/dragora/cmp/fastfetch/fastfetch-2.13.1/src/modules/packages/packages.c: In function ‘ffPrintPackagesHelpFormat’:
/home/dragora/cmp/fastfetch/fastfetch-2.13.1/src/common/printing.h:26:5: error: static assertion failed: "Invalid number of format arguments"
   26 |     static_assert(sizeof(args) / sizeof(*(args)) == (numArgs), "Invalid number of format arguments");\
      |     ^~~~~~~~~~~~~
/home/dragora/cmp/fastfetch/fastfetch-2.13.1/src/modules/packages/packages.c:406:5: note: in expansion of macro ‘FF_PRINT_MODULE_FORMAT_HELP_CHECKED’
  406 |     FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_PACKAGES_MODULE_NAME, "{2} (pacman){?3}[{3}]{?}, {4} (dpkg), {5} (rpm), {6} (emerge), {7} (eopkg), {8} (xbps), {9} (nix-system), {10} (nix-user), {11} (nix-default), {12} (apk), {13} (pkg), {14} (flatpak-system), {15} (flatpack-user), {16} (snap), {17} (brew), {18} (brew-cask), {19} (MacPorts), {20} (scoop), {21} (choco), {22} (pkgtool), {23} (paludis), {24} (winget), {25} (opkg), {26} (am), {27} (sorcery), {28} (lpkg), {29} (lpkgbuild), {30} (qi)", FF_PACKAGES_NUM_FORMAT_ARGS, ((const char* []) {
      |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
ninja: subcommand failed

[CarterLi]

diff --git a/src/modules/packages/packages.c b/src/modules/packages/packages.c
index e33b18d4..aa9f47ef 100644
--- a/src/modules/packages/packages.c
+++ b/src/modules/packages/packages.c
@@ -4,7 +4,7 @@
 #include "modules/packages/packages.h"
 #include "util/stringUtils.h"
 
-#define FF_PACKAGES_NUM_FORMAT_ARGS 38
+#define FF_PACKAGES_NUM_FORMAT_ARGS 39
 
 void ffPrintPackages(FFPackagesOptions* options)
 {

[lidgnulinux]

Thanks @CarterLi , I'll try it.

[lidgnulinux]

It works, thanks @CarterLi , I'll close it now.

[CarterLi]

You need to put qi at the bottom. Order matters.

[CarterLi]

Would you like to submit a PR?

[lidgnulinux]

I would try.

[lidgnulinux]

Hi @CarterLi , sorry for late reply. I don't know how to make pull request, but I made a patch for 2.29.0 version.
patch_qi_detection.diff.txt