Packages: reorders package variables in custom format

This commit is contained in:
Carter Li
2026-06-12 10:00:39 +08:00
parent 2edc41dd9a
commit 7df2ed2251
+14 -12
View File
@@ -144,27 +144,22 @@ bool ffPrintPackages(FFPackagesOptions* options) {
&options->moduleArgs,
FF_PRINT_TYPE_DEFAULT,
((FFformatarg[]) {
FF_ARG(counts.all, "all"),
FF_ARG(counts.amSystem, "am-system"),
FF_ARG(counts.amUser, "am-user"),
FF_ARG(counts.appimage, "appimage"),
FF_ARG(counts.apk, "apk"),
FF_ARG(counts.brew, "brew"),
FF_ARG(brewAll, "brew-all"),
FF_ARG(counts.brewCask, "brew-cask"),
FF_ARG(counts.cards, "cards"),
FF_ARG(counts.choco, "choco"),
FF_ARG(counts.dpkg, "dpkg"),
FF_ARG(counts.emerge, "emerge"),
FF_ARG(counts.eopkg, "eopkg"),
FF_ARG(flatpakAll, "flatpak-all"),
FF_ARG(counts.flatpakSystem, "flatpak-system"),
FF_ARG(counts.flatpakUser, "flatpak-user"),
FF_ARG(guixAll, "guix-all"),
FF_ARG(counts.guixHome, "guix-home"),
FF_ARG(counts.guixSystem, "guix-system"),
FF_ARG(counts.guixUser, "guix-user"),
FF_ARG(hpkgAll, "hpkg-all"),
FF_ARG(counts.hpkgSystem, "hpkg-system"),
FF_ARG(counts.hpkgUser, "hpkg-user"),
FF_ARG(counts.kiss, "kiss"),
@@ -174,7 +169,6 @@ bool ffPrintPackages(FFPackagesOptions* options) {
FF_ARG(counts.macports, "macports"),
FF_ARG(counts.mport, "mport"),
FF_ARG(counts.moss, "moss"),
FF_ARG(nixAll, "nix-all"),
FF_ARG(counts.nixDefault, "nix-default"),
FF_ARG(counts.nixSystem, "nix-system"),
FF_ARG(counts.nixUser, "nix-user"),
@@ -195,6 +189,13 @@ bool ffPrintPackages(FFPackagesOptions* options) {
FF_ARG(counts.sorcery, "sorcery"),
FF_ARG(counts.winget, "winget"),
FF_ARG(counts.xbps, "xbps"),
FF_ARG(brewAll, "brew-all"),
FF_ARG(flatpakAll, "flatpak-all"),
FF_ARG(guixAll, "guix-all"),
FF_ARG(hpkgAll, "hpkg-all"),
FF_ARG(nixAll, "nix-all"),
FF_ARG(counts.all, "all"),
}));
}
@@ -505,27 +506,22 @@ FFModuleBaseInfo ffPackagesModuleInfo = {
.generateJsonResult = (void*) ffGeneratePackagesJsonResult,
.generateJsonConfig = (void*) ffGeneratePackagesJsonConfig,
.formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) {
{ "Number of all packages", "all" },
{ "Number of am-system packages", "am-system" },
{ "Number of am-user (aka appman) packages", "am-user" },
{ "Number of appimage packages", "appimage" },
{ "Number of apk packages", "apk" },
{ "Number of brew packages", "brew" },
{ "Total number of all brew packages", "brew-all" },
{ "Number of brew-cask packages", "brew-cask" },
{ "Number of cards packages", "cards" },
{ "Number of choco packages", "choco" },
{ "Number of dpkg packages", "dpkg" },
{ "Number of emerge packages", "emerge" },
{ "Number of eopkg packages", "eopkg" },
{ "Total number of all flatpak app packages", "flatpak-all" },
{ "Number of flatpak-system app packages", "flatpak-system" },
{ "Number of flatpak-user app packages", "flatpak-user" },
{ "Total number of all guix packages", "guix-all" },
{ "Number of guix-home packages", "guix-home" },
{ "Number of guix-system packages", "guix-system" },
{ "Number of guix-user packages", "guix-user" },
{ "Total number of all hpkg packages", "hpkg-all" },
{ "Number of hpkg-system packages", "hpkg-system" },
{ "Number of hpkg-user packages", "hpkg-user" },
{ "Number of kiss packages", "kiss" },
@@ -535,7 +531,6 @@ FFModuleBaseInfo ffPackagesModuleInfo = {
{ "Number of macports packages", "macports" },
{ "Number of mport packages", "mport" },
{ "Number of moss packages", "moss" },
{ "Total number of all nix packages", "nix-all" },
{ "Number of nix-default packages", "nix-default" },
{ "Number of nix-system packages", "nix-system" },
{ "Number of nix-user packages", "nix-user" },
@@ -556,5 +551,12 @@ FFModuleBaseInfo ffPackagesModuleInfo = {
{ "Number of sorcery packages", "sorcery" },
{ "Number of winget packages", "winget" },
{ "Number of xbps packages", "xbps" },
{ "Total number of all brew packages", "brew-all" },
{ "Total number of all flatpak app packages", "flatpak-all" },
{ "Total number of all guix packages", "guix-all" },
{ "Total number of all hpkg packages", "hpkg-all" },
{ "Total number of all nix packages", "nix-all" },
{ "Number of all packages", "all" },
}))
};