pupbrained/draconisplusplus
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

meo

Browse source
This commit is contained in:
Mars 2025-05-09 17:53:56 -04:00
parent d5f3c2351f
commit 5872ee26a6
Signed by: pupbrained
GPG key ID: 874E22DF2F9DFCB5
2 changed files with 5 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
meson.build
View file

@ -201,4 +201,4 @@ executable(
link_args: link_args, link_args: link_args,
dependencies: deps, dependencies: deps,
install: true, install: true,
) )

26
src/os/macos.cpp
View file

@ -328,16 +328,15 @@ namespace package {
"/usr/local/Cellar", "/usr/local/Cellar",
}; };
for (const auto& cellarPath : cellarPaths) { for (const fs::path& cellarPath : cellarPaths) {
if (std::error_code errc; !fs::exists(cellarPath, errc) || errc) { if (std::error_code errc; !fs::exists(cellarPath, errc) || errc) {
if (errc && errc != std::errc::no_such_file_or_directory) if (errc && errc != std::errc::no_such_file_or_directory)
return Err(DracError(errc)); return Err(DracError(errc));
return Err(DracError(DracErrorCode::NotFound, "Homebrew Cellar directory not found at: " + cellarPath.string()) return Err(DracError(DracErrorCode::NotFound, "Homebrew Cellar directory not found at: " + cellarPath.string()));
);
} }
Result<u64> dirCount = GetCountFromDirectory("homebrew", cellarPath, true); Result dirCount = GetCountFromDirectory("homebrew", cellarPath, true);
if (!dirCount) { if (!dirCount) {
if (dirCount.error().code != DracErrorCode::NotFound) if (dirCount.error().code != DracErrorCode::NotFound)
@ -353,24 +352,7 @@ namespace package {
} }
fn GetMacPortsCount() -> Result<u64> { fn GetMacPortsCount() -> Result<u64> {
const PackageManagerInfo macPortsInfo = { return GetCountFromDb("macports", "/opt/local/var/macports/registry/registry.db", "SELECT COUNT(*) FROM ports WHERE state='installed';");
.id = "macports",
.dbPath = "/opt/local/var/macports/registry/registry.db",
.countQuery = "SELECT COUNT(*) FROM ports WHERE state='installed';",
};
// Check if the database file exists before trying to query
std::error_code errc;
if (!fs::exists(macPortsInfo.dbPath, errc) || errc) {
if (errc && errc != std::errc::no_such_file_or_directory)
return Err(DracError(errc));
return Err(
DracError(DracErrorCode::NotFound, "MacPorts registry database not found at: " + macPortsInfo.dbPath.string())
);
}
return GetCountFromDb(macPortsInfo);
} }
} // namespace package } // namespace package