From fcc55a78509bcfdf264322988b7aab7d79ff2b69 Mon Sep 17 00:00:00 2001 From: Spoodyz Date: Thu, 13 Aug 2026 13:45:59 +0300 Subject: [PATCH] Packages (macOS): adds support for dram package manager --- doc/json_schema.json | 3 ++- src/detection/packages/packages.h | 1 + src/detection/packages/packages_apple.c | 16 ++++++++++++++++ src/modules/packages/option.h | 1 + src/modules/packages/packages.c | 6 ++++++ 5 files changed, 26 insertions(+), 1 deletion(-) diff --git a/doc/json_schema.json b/doc/json_schema.json index 797e03b4d9..bf56b0b416 100644 --- a/doc/json_schema.json +++ b/doc/json_schema.json @@ -446,7 +446,7 @@ "type": "string" }, "packagesFormat": { - "description": "Output format for the `Packages` module. See Wiki for formatting syntax\n 1. {am-system}: Number of am-system packages\n 2. {am-user}: Number of am-user (aka appman) packages\n 3. {appimage}: Number of appimage packages\n 4. {apk}: Number of apk packages\n 5. {brew}: Number of brew packages\n 6. {brew-cask}: Number of brew-cask packages\n 7. {cards}: Number of cards packages\n 8. {choco}: Number of choco packages\n 9. {dpkg}: Number of dpkg packages\n 10. {emerge}: Number of emerge packages\n 11. {eopkg}: Number of eopkg packages\n 12. {flatpak-system}: Number of flatpak-system app packages\n 13. {flatpak-user}: Number of flatpak-user app packages\n 14. {guix-home}: Number of guix-home packages\n 15. {guix-system}: Number of guix-system packages\n 16. {guix-user}: Number of guix-user packages\n 17. {hpkg-system}: Number of hpkg-system packages\n 18. {hpkg-user}: Number of hpkg-user packages\n 19. {install-release}: Number of install-release packages\n 20. {kiss}: Number of kiss packages\n 21. {linglong}: Number of linglong packages\n 22. {lpkg}: Number of lpkg packages\n 23. {lpkgbuild}: Number of lpkgbuild packages\n 24. {macports}: Number of macports packages\n 25. {mport}: Number of mport packages\n 26. {moss}: Number of moss packages\n 27. {nix-default}: Number of nix-default packages\n 28. {nix-system}: Number of nix-system packages\n 29. {nix-user}: Number of nix-user packages\n 30. {opkg}: Number of opkg packages\n 31. {pacman}: Number of pacman packages\n 32. {pacman-branch}: Pacman branch on manjaro\n 33. {pacstall}: Number of pacstall packages\n 34. {paludis}: Number of paludis packages\n 35. {pisi}: Number of pisi packages\n 36. {pkg}: Number of pkg packages\n 37. {pkgsrc}: Number of pkgsrc packages\n 38. {pkgtool}: Number of pkgtool packages\n 39. {porg}: Number of porg packages\n 40. {rpm}: Number of rpm packages\n 41. {scoop-global}: Number of scoop-global packages\n 42. {scoop-user}: Number of scoop-user packages\n 43. {snap}: Number of snap packages\n 44. {soar}: Number of soar packages\n 45. {sorcery}: Number of sorcery packages\n 46. {winget}: Number of winget packages\n 47. {xbps}: Number of xbps packages\n 48. {brew-all}: Total number of all brew packages\n 49. {flatpak-all}: Total number of all flatpak app packages\n 50. {guix-all}: Total number of all guix packages\n 51. {hpkg-all}: Total number of all hpkg packages\n 52. {nix-all}: Total number of all nix packages\n 53. {all}: Number of all packages", + "description": "Output format for the `Packages` module. See Wiki for formatting syntax\n 1. {am-system}: Number of am-system packages\n 2. {am-user}: Number of am-user (aka appman) packages\n 3. {appimage}: Number of appimage packages\n 4. {apk}: Number of apk packages\n 5. {brew}: Number of brew packages\n 6. {brew-cask}: Number of brew-cask packages\n 7. {cards}: Number of cards packages\n 8. {choco}: Number of choco packages\n 9. {dpkg}: Number of dpkg packages\n 10. {dram}: Number of dram packages\n 11. {emerge}: Number of emerge packages\n 12. {eopkg}: Number of eopkg packages\n 13. {flatpak-system}: Number of flatpak-system app packages\n 14. {flatpak-user}: Number of flatpak-user app packages\n 15. {guix-home}: Number of guix-home packages\n 16. {guix-system}: Number of guix-system packages\n 17. {guix-user}: Number of guix-user packages\n 18. {hpkg-system}: Number of hpkg-system packages\n 19. {hpkg-user}: Number of hpkg-user packages\n 20. {install-release}: Number of install-release packages\n 21. {kiss}: Number of kiss packages\n 22. {linglong}: Number of linglong packages\n 23. {lpkg}: Number of lpkg packages\n 24. {lpkgbuild}: Number of lpkgbuild packages\n 25. {macports}: Number of macports packages\n 26. {mport}: Number of mport packages\n 27. {moss}: Number of moss packages\n 28. {nix-default}: Number of nix-default packages\n 29. {nix-system}: Number of nix-system packages\n 30. {nix-user}: Number of nix-user packages\n 31. {opkg}: Number of opkg packages\n 32. {pacman}: Number of pacman packages\n 33. {pacman-branch}: Pacman branch on manjaro\n 34. {pacstall}: Number of pacstall packages\n 35. {paludis}: Number of paludis packages\n 36. {pisi}: Number of pisi packages\n 37. {pkg}: Number of pkg packages\n 38. {pkgsrc}: Number of pkgsrc packages\n 39. {pkgtool}: Number of pkgtool packages\n 40. {porg}: Number of porg packages\n 41. {rpm}: Number of rpm packages\n 42. {scoop-global}: Number of scoop-global packages\n 43. {scoop-user}: Number of scoop-user packages\n 44. {snap}: Number of snap packages\n 45. {soar}: Number of soar packages\n 46. {sorcery}: Number of sorcery packages\n 47. {winget}: Number of winget packages\n 48. {xbps}: Number of xbps packages\n 49. {brew-all}: Total number of all brew packages\n 50. {flatpak-all}: Total number of all flatpak app packages\n 51. {guix-all}: Total number of all guix packages\n 52. {hpkg-all}: Total number of all hpkg packages\n 53. {nix-all}: Total number of all nix packages\n 54. {all}: Number of all packages", "type": "string" }, "physicaldiskFormat": { @@ -3649,6 +3649,7 @@ "brew", "choco", "dpkg", + "dram", "emerge", "eopkg", "flatpak", diff --git a/src/detection/packages/packages.h b/src/detection/packages/packages.h index 2119349323..f97f3532c7 100644 --- a/src/detection/packages/packages.h +++ b/src/detection/packages/packages.h @@ -13,6 +13,7 @@ typedef struct FFPackagesResult { uint32_t cards; uint32_t choco; uint32_t dpkg; + uint32_t dram; uint32_t emerge; uint32_t eopkg; uint32_t flatpakSystem; diff --git a/src/detection/packages/packages_apple.c b/src/detection/packages/packages_apple.c index 43de97df8f..2a3247ac01 100644 --- a/src/detection/packages/packages_apple.c +++ b/src/detection/packages/packages_apple.c @@ -21,6 +21,11 @@ static uint32_t getMacPortsPackages(FFstrbuf* baseDir) { return ffPackagesGetNumElements(baseDir->chars, true); } +static uint32_t getDramPackages(FFstrbuf* baseDir) { + ffStrbufAppendS(baseDir, "/Cellar"); + return ffPackagesGetNumElements(baseDir->chars, true); +} + void ffDetectPackagesImpl(FFPackagesResult* result, FFPackagesOptions* options) { FF_STRBUF_AUTO_DESTROY baseDir = ffStrbufCreate(); if (FF_PACKAGES_IS_ENABLED(options, BREW)) { @@ -46,6 +51,17 @@ void ffDetectPackagesImpl(FFPackagesResult* result, FFPackagesOptions* options) result->macports = getMacPortsPackages(&baseDir); } + if (FF_PACKAGES_IS_ENABLED(options, DRAM)) { + const char* prefix = getenv("DRAM_PREFIX"); + if (ffStrSet(prefix)) { + ffStrbufSetS(&baseDir, prefix); + } else { + ffStrbufSet(&baseDir, &instance.state.platform.homeDir); + ffStrbufAppendS(&baseDir, ".dram"); + } + + result->dram = getDramPackages(&baseDir); + } if (FF_PACKAGES_IS_ENABLED(options, NIX)) { ffStrbufSetS(&baseDir, FASTFETCH_TARGET_DIR_ROOT); result->nixDefault += ffPackagesGetNix(&baseDir, "/nix/var/nix/profiles/default"); diff --git a/src/modules/packages/option.h b/src/modules/packages/option.h index a9bb444a86..2d33050194 100644 --- a/src/modules/packages/option.h +++ b/src/modules/packages/option.h @@ -41,6 +41,7 @@ typedef enum FFPackagesFlags: uint64_t { FF_PACKAGES_FLAG_CARDS_BIT = UINT64_C(1) << 34U, FF_PACKAGES_FLAG_PORG_BIT = UINT64_C(1) << 35U, FF_PACKAGES_FLAG_INSTALLRELEASE_BIT = UINT64_C(1) << 36U, + FF_PACKAGES_FLAG_DRAM_BIT = UINT64_C(1) << 37U, } FFPackagesFlags; static_assert(sizeof(FFPackagesFlags) == sizeof(uint64_t), ""); diff --git a/src/modules/packages/packages.c b/src/modules/packages/packages.c index 1553893f1a..685e89058d 100644 --- a/src/modules/packages/packages.c +++ b/src/modules/packages/packages.c @@ -64,6 +64,7 @@ bool ffPrintPackages(FFPackagesOptions* options) { FF_PRINT_PACKAGE(cards) FF_PRINT_PACKAGE(choco) FF_PRINT_PACKAGE(dpkg) + FF_PRINT_PACKAGE(dram) FF_PRINT_PACKAGE(emerge) FF_PRINT_PACKAGE(eopkg) if (options->combined) { @@ -155,6 +156,7 @@ bool ffPrintPackages(FFPackagesOptions* options) { FF_ARG(counts.cards, "cards"), FF_ARG(counts.choco, "choco"), FF_ARG(counts.dpkg, "dpkg"), + FF_ARG(counts.dram, "dram"), FF_ARG(counts.emerge, "emerge"), FF_ARG(counts.eopkg, "eopkg"), FF_ARG(counts.flatpakSystem, "flatpak-system"), @@ -262,6 +264,7 @@ void ffParsePackagesJsonObject(FFPackagesOptions* options, yyjson_val* module) { if (false) ; FF_TEST_PACKAGE_NAME(DPKG) + FF_TEST_PACKAGE_NAME(DRAM) break; case 'E': if (false) @@ -391,6 +394,7 @@ void ffGeneratePackagesJsonConfig(FFPackagesOptions* options, yyjson_mut_doc* do FF_TEST_PACKAGE_NAME(CARDS) FF_TEST_PACKAGE_NAME(CHOCO) FF_TEST_PACKAGE_NAME(DPKG) + FF_TEST_PACKAGE_NAME(DRAM) FF_TEST_PACKAGE_NAME(EMERGE) FF_TEST_PACKAGE_NAME(EOPKG) FF_TEST_PACKAGE_NAME(FLATPAK) @@ -452,6 +456,7 @@ bool ffGeneratePackagesJsonResult(FFPackagesOptions* options, yyjson_mut_doc* do FF_APPEND_PACKAGE_COUNT(cards) FF_APPEND_PACKAGE_COUNT(choco) FF_APPEND_PACKAGE_COUNT(dpkg) + FF_APPEND_PACKAGE_COUNT(dram) FF_APPEND_PACKAGE_COUNT(emerge) FF_APPEND_PACKAGE_COUNT(eopkg) FF_APPEND_PACKAGE_COUNT(flatpakSystem) @@ -528,6 +533,7 @@ FFModuleBaseInfo ffPackagesModuleInfo = { { "Number of cards packages", "cards" }, { "Number of choco packages", "choco" }, { "Number of dpkg packages", "dpkg" }, + { "Number of dram packages", "dram" }, { "Number of emerge packages", "emerge" }, { "Number of eopkg packages", "eopkg" }, { "Number of flatpak-system app packages", "flatpak-system" },