Skip to content

Commit b60996b

Browse files
CarterLiCarterLi
committed
Packages (Linux): remove qi support
Close #1858
1 parent 272c0aa commit b60996b

5 files changed

Lines changed: 5 additions & 19 deletions

File tree

‎doc/json_schema.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@
401401
"type": "string"
402402
},
403403
"packagesFormat": {
404-
"description": "Output format of the module `Packages`. See Wiki for formatting syntax\n 1. {all}: Number of all packages\n 2. {pacman}: Number of pacman packages\n 3. {pacman-branch}: Pacman branch on manjaro\n 4. {dpkg}: Number of dpkg packages\n 5. {rpm}: Number of rpm packages\n 6. {emerge}: Number of emerge packages\n 7. {eopkg}: Number of eopkg packages\n 8. {xbps}: Number of xbps packages\n 9. {nix-system}: Number of nix-system packages\n 10. {nix-user}: Number of nix-user packages\n 11. {nix-default}: Number of nix-default packages\n 12. {apk}: Number of apk packages\n 13. {pkg}: Number of pkg packages\n 14. {flatpak-system}: Number of flatpak-system app packages\n 15. {flatpak-user}: Number of flatpak-user app packages\n 16. {snap}: Number of snap packages\n 17. {brew}: Number of brew packages\n 18. {brew-cask}: Number of brew-cask packages\n 19. {macports}: Number of macports packages\n 20. {scoop}: Number of scoop packages\n 21. {choco}: Number of choco packages\n 22. {pkgtool}: Number of pkgtool packages\n 23. {paludis}: Number of paludis packages\n 24. {winget}: Number of winget packages\n 25. {opkg}: Number of opkg packages\n 26. {am-system}: Number of am-system packages\n 27. {sorcery}: Number of sorcery packages\n 28. {lpkg}: Number of lpkg packages\n 29. {lpkgbuild}: Number of lpkgbuild packages\n 30. {guix-system}: Number of guix-system packages\n 31. {guix-user}: Number of guix-user packages\n 32. {guix-home}: Number of guix-home packages\n 33. {linglong}: Number of linglong packages\n 34. {pacstall}: Number of pacstall packages\n 35. {mport}: Number of mport packages\n 36. {qi}: Number of qi packages\n 37. {am-user}: Number of am-user (aka appman) packages\n 38. {pkgsrc}: Number of pkgsrc packages\n 39. {hpkg-system}: Number of hpkg-system packages\n 40. {hpkg-user}: Number of hpkg-user packages\n 41. {pisi}: Number of pisi packages\n 42. {soar}: Number of soar packages\n 43. {nix-all}: Total number of all nix packages\n 44. {flatpak-all}: Total number of all flatpak app packages\n 45. {brew-all}: Total number of all brew packages\n 46. {guix-all}: Total number of all guix packages\n 47. {hpkg-all}: Total number of all hpkg packages",
404+
"description": "Output format of the module `Packages`. See Wiki for formatting syntax\n 1. {all}: Number of all packages\n 2. {pacman}: Number of pacman packages\n 3. {pacman-branch}: Pacman branch on manjaro\n 4. {dpkg}: Number of dpkg packages\n 5. {rpm}: Number of rpm packages\n 6. {emerge}: Number of emerge packages\n 7. {eopkg}: Number of eopkg packages\n 8. {xbps}: Number of xbps packages\n 9. {nix-system}: Number of nix-system packages\n 10. {nix-user}: Number of nix-user packages\n 11. {nix-default}: Number of nix-default packages\n 12. {apk}: Number of apk packages\n 13. {pkg}: Number of pkg packages\n 14. {flatpak-system}: Number of flatpak-system app packages\n 15. {flatpak-user}: Number of flatpak-user app packages\n 16. {snap}: Number of snap packages\n 17. {brew}: Number of brew packages\n 18. {brew-cask}: Number of brew-cask packages\n 19. {macports}: Number of macports packages\n 20. {scoop}: Number of scoop packages\n 21. {choco}: Number of choco packages\n 22. {pkgtool}: Number of pkgtool packages\n 23. {paludis}: Number of paludis packages\n 24. {winget}: Number of winget packages\n 25. {opkg}: Number of opkg packages\n 26. {am-system}: Number of am-system packages\n 27. {sorcery}: Number of sorcery packages\n 28. {lpkg}: Number of lpkg packages\n 29. {lpkgbuild}: Number of lpkgbuild packages\n 30. {guix-system}: Number of guix-system packages\n 31. {guix-user}: Number of guix-user packages\n 32. {guix-home}: Number of guix-home packages\n 33. {linglong}: Number of linglong packages\n 34. {pacstall}: Number of pacstall packages\n 35. {mport}: Number of mport packages\n 36. {am-user}: Number of am-user (aka appman) packages\n 37. {pkgsrc}: Number of pkgsrc packages\n 38. {hpkg-system}: Number of hpkg-system packages\n 39. {hpkg-user}: Number of hpkg-user packages\n 40. {pisi}: Number of pisi packages\n 41. {soar}: Number of soar packages\n 42. {nix-all}: Total number of all nix packages\n 43. {flatpak-all}: Total number of all flatpak app packages\n 44. {brew-all}: Total number of all brew packages\n 45. {guix-all}: Total number of all guix packages\n 46. {hpkg-all}: Total number of all hpkg packages",
405405
"type": "string"
406406
},
407407
"physicaldiskFormat": {

‎src/detection/packages/packages.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ typedef struct FFPackagesResult
3636
uint32_t pkg;
3737
uint32_t pkgsrc;
3838
uint32_t pkgtool;
39-
uint32_t qi;
4039
uint32_t rpm;
4140
uint32_t scoop;
4241
uint32_t snap;

‎src/detection/packages/packages_linux.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,6 @@ static void getPackageCounts(FFstrbuf* baseDir, FFPackagesResult* packageCounts,
600600
}
601601
if (!(options->disabled & FF_PACKAGES_FLAG_LINGLONG_BIT)) packageCounts->linglong += getNumElements(baseDir, "/var/lib/linglong/repo/refs/heads/main", true);
602602
if (!(options->disabled & FF_PACKAGES_FLAG_PACSTALL_BIT)) packageCounts->pacstall += getNumElements(baseDir, "/var/lib/pacstall/metadata", false);
603-
if (!(options->disabled & FF_PACKAGES_FLAG_QI_BIT)) packageCounts->qi += getNumStrings(baseDir, "/var/qi/installed_packages.list", "\n", "qi");
604603
if (!(options->disabled & FF_PACKAGES_FLAG_PISI_BIT)) packageCounts->pisi += getNumElements(baseDir, "/var/lib/pisi/package", true);
605604
if (!(options->disabled & FF_PACKAGES_FLAG_PKGSRC_BIT)) packageCounts->pkgsrc += getNumElements(baseDir, "/usr/pkg/pkgdb", DT_DIR);
606605
}

‎src/modules/packages/option.h‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,10 @@ typedef enum __attribute__((__packed__)) FFPackagesFlags
3434
FF_PACKAGES_FLAG_LINGLONG_BIT = 1ULL << 24,
3535
FF_PACKAGES_FLAG_PACSTALL_BIT = 1ULL << 25,
3636
FF_PACKAGES_FLAG_MPORT_BIT = 1ULL << 26,
37-
FF_PACKAGES_FLAG_QI_BIT = 1ULL << 27,
38-
FF_PACKAGES_FLAG_PKGSRC_BIT = 1ULL << 28,
39-
FF_PACKAGES_FLAG_HPKG_BIT = 1ULL << 29,
40-
FF_PACKAGES_FLAG_PISI_BIT = 1ULL << 30,
41-
FF_PACKAGES_FLAG_SOAR_BIT = 1ULL << 31,
37+
FF_PACKAGES_FLAG_PKGSRC_BIT = 1ULL << 27,
38+
FF_PACKAGES_FLAG_HPKG_BIT = 1ULL << 28,
39+
FF_PACKAGES_FLAG_PISI_BIT = 1ULL << 29,
40+
FF_PACKAGES_FLAG_SOAR_BIT = 1ULL << 30,
4241
FF_PACKAGES_FLAG_FORCE_UNSIGNED = UINT64_MAX,
4342
} FFPackagesFlags;
4443
static_assert(sizeof(FFPackagesFlags) == sizeof(uint64_t), "");

‎src/modules/packages/packages.c‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@ void ffPrintPackages(FFPackagesOptions* options)
135135
FF_PRINT_PACKAGE(linglong)
136136
FF_PRINT_PACKAGE(pacstall)
137137
FF_PRINT_PACKAGE(mport)
138-
FF_PRINT_PACKAGE(qi)
139138
FF_PRINT_PACKAGE(pisi)
140139
FF_PRINT_PACKAGE(soar)
141140

@@ -179,7 +178,6 @@ void ffPrintPackages(FFPackagesOptions* options)
179178
FF_FORMAT_ARG(counts.linglong, "linglong"),
180179
FF_FORMAT_ARG(counts.pacstall, "pacstall"),
181180
FF_FORMAT_ARG(counts.mport, "mport"),
182-
FF_FORMAT_ARG(counts.qi, "qi"),
183181
FF_FORMAT_ARG(counts.amUser, "am-user"),
184182
FF_FORMAT_ARG(counts.pkgsrc, "pkgsrc"),
185183
FF_FORMAT_ARG(counts.hpkgSystem, "hpkg-system"),
@@ -269,9 +267,6 @@ bool ffParsePackagesCommandOptions(FFPackagesOptions* options, const char* key,
269267
FF_TEST_PACKAGE_NAME(PKGTOOL)
270268
FF_TEST_PACKAGE_NAME(PKGSRC)
271269
break;
272-
case 'Q': if (false);
273-
FF_TEST_PACKAGE_NAME(QI)
274-
break;
275270
case 'R': if (false);
276271
FF_TEST_PACKAGE_NAME(RPM)
277272
break;
@@ -395,9 +390,6 @@ void ffParsePackagesJsonObject(FFPackagesOptions* options, yyjson_val* module)
395390
FF_TEST_PACKAGE_NAME(PKGTOOL)
396391
FF_TEST_PACKAGE_NAME(PKGSRC)
397392
break;
398-
case 'Q': if (false);
399-
FF_TEST_PACKAGE_NAME(QI)
400-
break;
401393
case 'R': if (false);
402394
FF_TEST_PACKAGE_NAME(RPM)
403395
break;
@@ -466,7 +458,6 @@ void ffGeneratePackagesJsonConfig(FFPackagesOptions* options, yyjson_mut_doc* do
466458
FF_TEST_PACKAGE_NAME(PKG)
467459
FF_TEST_PACKAGE_NAME(PKGTOOL)
468460
FF_TEST_PACKAGE_NAME(PKGSRC)
469-
FF_TEST_PACKAGE_NAME(QI)
470461
FF_TEST_PACKAGE_NAME(RPM)
471462
FF_TEST_PACKAGE_NAME(SCOOP)
472463
FF_TEST_PACKAGE_NAME(SNAP)
@@ -528,7 +519,6 @@ void ffGeneratePackagesJsonResult(FF_MAYBE_UNUSED FFPackagesOptions* options, yy
528519
FF_APPEND_PACKAGE_COUNT(pkg)
529520
FF_APPEND_PACKAGE_COUNT(pkgtool)
530521
FF_APPEND_PACKAGE_COUNT(pkgsrc)
531-
FF_APPEND_PACKAGE_COUNT(qi)
532522
FF_APPEND_PACKAGE_COUNT(macports)
533523
FF_APPEND_PACKAGE_COUNT(rpm)
534524
FF_APPEND_PACKAGE_COUNT(scoop)
@@ -584,7 +574,6 @@ static FFModuleBaseInfo ffModuleInfo = {
584574
{"Number of linglong packages", "linglong"},
585575
{"Number of pacstall packages", "pacstall"},
586576
{"Number of mport packages", "mport"},
587-
{"Number of qi packages", "qi"},
588577
{"Number of am-user (aka appman) packages", "am-user"},
589578
{"Number of pkgsrc packages", "pkgsrc"},
590579
{"Number of hpkg-system packages", "hpkg-system"},

0 commit comments

Comments
 (0)