Use librpm as rpm fallback

src/common/init.c

@@ -200,6 +200,7 @@ static void defaultConfig(FFinstance* instance)
     ffStrbufInitA(&instance->config.libDBus, 0);
     ffStrbufInitA(&instance->config.libXFConf, 0);
     ffStrbufInitA(&instance->config.libSQLite3, 0);
+    ffStrbufInitA(&instance->config.librpm, 0);
     ffStrbufInitA(&instance->config.libImageMagick, 0);
     ffStrbufInitA(&instance->config.libZ, 0);
     ffStrbufInitA(&instance->config.libChafa, 0);
@@ -331,6 +332,9 @@ void ffListFeatures()
         #ifdef FF_HAVE_SQLITE3
             "sqlite3\n"
         #endif
+        #ifdef FF_HAVE_RPM
+            "rpm\n"
+        #endif
         ""
     , stdout);
 }

src/common/settings.c

@@ -297,7 +297,7 @@ static const SQLiteData* getSQLiteData(const FFinstance* instance)
     FF_LIBRARY_DATA_LOAD_RETURN
 }
 
-int ffSettingsGetSQLite3Int(FFinstance* instance, const char* dbPath, const char* query)
+int ffSettingsGetSQLite3Int(const FFinstance* instance, const char* dbPath, const char* query)
 {
     const SQLiteData* data = getSQLiteData(instance);
     if(data == NULL)
@@ -329,7 +329,7 @@ int ffSettingsGetSQLite3Int(FFinstance* instance, const char* dbPath, const char
     return result;
 }
 #else //FF_HAVE_SQLITE3
-int ffSettingsGetSQLite3Int(FFinstance* instance, const char* dbPath, const char* query)
+int ffSettingsGetSQLite3Int(const FFinstance* instance, const char* dbPath, const char* query)
 {
     FF_UNUSED(instance, dbPath, query)
     return 0;

src/data/config.txt

@@ -234,6 +234,7 @@
 #--lib-DBus /usr/lib/libdbus-1.so
 #--lib-XFConf /usr/lib/libxfconf-0.so
 #--lib-sqlite3 /usr/lib/libsqlite3.so
+#--lib-rpm /usr/lib/librpm.so
 #--lib-imagemagick /usr/lib/libMagickCore-7.Q16HDRI.so
 #--lib-z /usr/lib/libz.so
 #--lib-chafa /usr/lib/libchafa.so

src/data/help.txt

@@ -123,6 +123,7 @@ Library options: Set the path of a library to load
     --lib-DBus <path>
     --lib-XFConf <path>
     --lib-sqlite3 <path>
+    --lib-rpm <path>
     --lib-imagemagick <path>
     --lib-z <path>
     --lib-chafa <path>

src/fastfetch.c

@@ -993,6 +993,8 @@ static void parseOption(FFinstance* instance, FFdata* data, const char* key, con
         optionParseString(key, value, &instance->config.libXFConf);
     else if(strcasecmp(key, "--lib-sqlite") == 0 || strcasecmp(key, "--lib-sqlite3") == 0)
         optionParseString(key, value, &instance->config.libSQLite3);
+    else if(strcasecmp(key, "--lib-rpm") == 0)
+        optionParseString(key, value, &instance->config.librpm);
     else if(strcasecmp(key, "--lib-imagemagick") == 0)
         optionParseString(key, value, &instance->config.libImageMagick);
     else if(strcasecmp(key, "--lib-z") == 0)

src/fastfetch.h

@@ -138,6 +138,7 @@ typedef struct FFconfig
     FFstrbuf libDBus;
     FFstrbuf libXFConf;
     FFstrbuf libSQLite3;
+    FFstrbuf librpm;
     FFstrbuf libImageMagick;
     FFstrbuf libZ;
     FFstrbuf libChafa;
@@ -466,7 +467,7 @@ FFvariant ffSettingsGetGSettings(FFinstance* instance, const char* schemaName, c
 FFvariant ffSettingsGet(FFinstance* instance, const char* dconfKey, const char* gsettingsSchemaName, const char* gsettingsPath, const char* gsettingsKey, FFvarianttype type);
 FFvariant ffSettingsGetXFConf(FFinstance* instance, const char* channelName, const char* propertyName, FFvarianttype type);
 
-int ffSettingsGetSQLite3Int(FFinstance* instance, const char* dbPath, const char* query);
+int ffSettingsGetSQLite3Int(const FFinstance* instance, const char* dbPath, const char* query);
 
 #ifdef __ANDROID__
 bool ffSettingsGetAndroidProperty(const char* propName, FFstrbuf* result);

src/modules/packages.c

@@ -6,6 +6,58 @@
 #define FF_PACKAGES_MODULE_NAME "Packages"
 #define FF_PACKAGES_NUM_FORMAT_ARGS 9
 
+#ifdef FF_HAVE_RPM
+#include <rpm/rpmlib.h>
+#include <rpm/rpmts.h>
+#include <rpm/rpmdb.h>
+#include <rpm/rpmlog.h>
+
+static uint32_t getRpmFromLibrpm(const FFinstance* instance)
+{
+    FF_LIBRARY_LOAD(rpm, instance->config.librpm, 0, "librpm.so", 12)
+    FF_LIBRARY_LOAD_SYMBOL(rpm, rpmReadConfigFiles, 0)
+    FF_LIBRARY_LOAD_SYMBOL(rpm, rpmtsCreate, 0)
+    FF_LIBRARY_LOAD_SYMBOL(rpm, rpmtsInitIterator, 0)
+    FF_LIBRARY_LOAD_SYMBOL(rpm, rpmdbGetIteratorCount, 0)
+    FF_LIBRARY_LOAD_SYMBOL(rpm, rpmdbFreeIterator, 0)
+    FF_LIBRARY_LOAD_SYMBOL(rpm, rpmtsFree, 0)
+    FF_LIBRARY_LOAD_SYMBOL(rpm, rpmlogSetMask, 0)
+
+    // Don't print any error messages
+    ffrpmlogSetMask(RPMLOG_MASK(RPMLOG_EMERG));
+
+    if(ffrpmReadConfigFiles(NULL, NULL) != 0)
+    {
+        dlclose(rpm);
+        return 0;
+    }
+
+    rpmts ts = ffrpmtsCreate();
+    if(ts == NULL)
+    {
+        dlclose(rpm);
+        return 0;
+    }
+
+    rpmdbMatchIterator mi = ffrpmtsInitIterator(ts, RPMDBI_LABEL, NULL, 0);
+    if(mi == NULL)
+    {
+        ffrpmtsFree(ts);
+        dlclose(rpm);
+        return 0;
+    }
+
+    int count = ffrpmdbGetIteratorCount(mi);
+
+    ffrpmdbFreeIterator(mi);
+    ffrpmtsFree(ts);
+    dlclose(rpm);
+
+    return count > 0 ? (uint32_t) count : 0;
+}
+
+#endif
+
 static uint32_t getNumElements(const char* dirname, unsigned char type)
 {
     DIR* dirp = opendir(dirname);
@@ -140,19 +192,33 @@ static uint32_t getNixPackagesUser(const FFinstance* instance)
     return result;
 }
 
+static uint32_t getRpmPackageCount(const FFinstance* instance)
+{
+    // We do our own sql querys instead of using (lib)rpm, because:
+    // - simply faster
+    // - we don't need to regulary increase librpm version, which increases rapidly without providing a major version symlink
+    uint32_t rpm = (uint32_t) ffSettingsGetSQLite3Int(instance, FASTFETCH_TARGET_DIR_ROOT"/var/lib/rpm/rpmdb.sqlite", "SELECT count(blob) FROM Packages");
+    if(rpm != 0)
+        return rpm;
+
+    rpm = (uint32_t) ffSettingsGetSQLite3Int(instance, FASTFETCH_TARGET_DIR_ROOT"/var/cache/dnf/packages.db", "SELECT count(pkg) FROM installed");
+    if(rpm != 0)
+        return rpm;
+
+    // If SQL failed, we can still try with rpm.
+    // This is needed on openSUSE, which seems to use a proprietary database file
+    #ifdef FF_HAVE_RPM
+        return getRpmFromLibrpm(instance);
+    #endif
+
+    return 0;
+}
+
 void ffPrintPackages(FFinstance* instance)
 {
     uint32_t pacman = getNumElements(FASTFETCH_TARGET_DIR_ROOT"/var/lib/pacman/local", DT_DIR);
     uint32_t dpkg = getNumStrings(FASTFETCH_TARGET_DIR_ROOT"/var/lib/dpkg/status", "Status: ");
-
-    // We do our own sql querys instead of using (lib)rpm, because:
-    // - simply faster
-    // - we get package count on SUSE platforms
-    // - we don't need to regulary increase librpm version, which increases rapidly without providing a major version symlink
-    uint32_t rpm = (uint32_t) ffSettingsGetSQLite3Int(instance, "/var/lib/rpm/rpmdb.sqlite", "SELECT count(blob) FROM Packages");
-    if(rpm == 0)
-        rpm = (uint32_t) ffSettingsGetSQLite3Int(instance, "/var/cache/dnf/packages.db", "SELECT count(pkg) FROM installed");
-
+    uint32_t rpm = getRpmPackageCount(instance);
     uint32_t emerge = countFilesIn(FASTFETCH_TARGET_DIR_ROOT"/var/db/pkg", "SIZE");
     uint32_t xbps = getNumElements(FASTFETCH_TARGET_DIR_ROOT"/var/db/xbps", DT_REG);