Skip to content

Commit

Permalink
misc: refactor makepkg_list to use c++ builtin features
Browse files Browse the repository at this point in the history
  • Loading branch information
@Toni500github
Toni500github committed Aug 10, 2024
1 parent 0291c78 commit f09ba6d
Show file tree
Hide file tree
Showing 2 changed files with 83 additions and 15 deletions.
14 changes: 10 additions & 4 deletions include/util.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ bool is_package_from_syncdb(const char* name, alpm_list_t* s
bool commitTransactionAndRelease(bool soft = false);
void printPkgInfo(TaurPkg_t& pkg, std::string_view db_name);
void printLocalFullPkgInfo(alpm_pkg_t* pkg);
std::string makepkg_list(std::string_view pkg_name, std::string path);
std::string makepkg_list(std::string_view pkg_name, std::string_view path);
void free_list_and_internals(alpm_list_t* list);
fmt::text_style getColorFromDBName(std::string_view db_name);
std::vector<alpm_pkg_t*> filterAURPkgs(std::vector<alpm_pkg_t*> pkgs, alpm_list_t* syncdbs, bool inverse);
Expand All @@ -116,9 +116,10 @@ std::string getHomeConfigDir();
std::string getConfigDir();
std::string getCacheDir();
bool makepkg_exec(std::vector<std::string> const& args, bool exitOnFailure = true);
bool pacman_exec(std::string_view op, std::vector<std::string> const& args, bool exitOnFailure = true,
bool root = true);
bool util_db_search(alpm_db_t* db, alpm_list_t* needles, alpm_list_t** ret);
bool pacman_exec(std::string_view op, std::vector<std::string> const& args, bool exitOnFailure = true,
bool root = true);
bool util_db_search(alpm_db_t* db, alpm_list_t* needles, alpm_list_t** ret);

std::optional<std::vector<TaurPkg_t>> askUserForPkg(std::vector<TaurPkg_t> pkgs, TaurBackend& backend, bool useGit);
std::string_view binarySearch(const std::vector<std::string>& arr, std::string_view target);
std::vector<std::string> load_aur_list();
Expand All @@ -141,6 +142,11 @@ struct is_fmt_convertible
template <typename T>
constexpr bool is_fmt_convertible_v = is_fmt_convertible<T>::value;

constexpr std::size_t operator""_len(const char*,std::size_t ln) noexcept
{
return ln;
}

// clang-format off
template <typename... Args>
void _log_println(log_level log, const fmt::text_style ts, fmt::runtime_format_string<> fmt, Args&&... args)
Expand Down
84 changes: 73 additions & 11 deletions src/util.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
*/

#include <alpm.h>
#include <algorithm>
#include <cstdint>
#pragma GCC diagnostic ignored "-Wignored-attributes"

#include "config.hpp"
Expand Down Expand Up @@ -134,6 +136,7 @@ bool hasStart(std::string_view fullString, std::string_view start)
return (0 == fullString.compare(0, start.length(), start));
}

// clang-format off
bool isInvalid(char c)
{ return !isprint(c); }

Expand All @@ -146,6 +149,7 @@ void sanitizeStr(std::string& str)
void interruptHandler(int)
{ die(_("Caught CTRL-C, Exiting!")); }

// clang-format on
/** Function to check if a package is from a synchronization database
* Basically if it's in pacman repos like core, extra, multilib, etc.
* @param name The package name to check
Expand Down Expand Up @@ -653,37 +657,95 @@ void printLocalFullPkgInfo(alpm_pkg_t* pkg)
}

// faster than makepkg --packagelist
std::string makepkg_list(std::string_view pkg_name, std::string path)
std::string makepkg_list(std::string_view pkg_name, std::string_view path)
{
std::string ret;
std::ifstream pkgbuild_f(fmt::format("{}/PKGBUILD", path), std::ios::in);

std::string versionInfo = shell_exec("grep 'pkgver=' " + path +
/*std::string versionInfo = shell_exec("grep 'pkgver=' " + path +
"/PKGBUILD | cut -d= -f2 | cut -d' ' -f1 | sed -e \"s/'//g\" -e 's/\"//g'");
std::string pkgrel = shell_exec("grep 'pkgrel=' " + path +
"/PKGBUILD | cut -d= -f2 | cut -d' ' -f1 | sed -e \"s/'//g\" -e 's/\"//g'");
std::string epoch = shell_exec("grep 'epoch=' " + path +
"/PKGBUILD | cut -d= -f2 | cut -d' ' -f1 | sed -e \"s/'//g\" -e 's/\"//g'");
std::string arch_field
= shell_exec("awk -F '[()]' '/^arch=/ {gsub(/\"/,\"\",$2); print $2}' " + path +
"/PKGBUILD | sed -e \"s/'//g\" -e 's/\"//g'");*/

std::string versionInfo, pkgrel, epoch, arch_field;
std::uint8_t iterIndex = 0;

std::string line;
while (std::getline(pkgbuild_f, line) && iterIndex < 4)
{
if (hasStart(line, "pkgver="))
{
versionInfo = line.substr("pkgver="_len);
versionInfo.erase(std::remove(versionInfo.begin(), versionInfo.end(), '\"'), versionInfo.end());
versionInfo.erase(std::remove(versionInfo.begin(), versionInfo.end(), '\''), versionInfo.end());
iterIndex++;
}
else if (hasStart(line, "pkgrel="))
{
pkgrel = line.substr("pkgrel="_len);
pkgrel.erase(std::remove(pkgrel.begin(), pkgrel.end(), '\"'), pkgrel.end());
pkgrel.erase(std::remove(pkgrel.begin(), pkgrel.end(), '\''), pkgrel.end());
iterIndex++;
}
else if (hasStart(line, "epoch="))
{
epoch = line.substr("epoch="_len);
epoch.erase(std::remove(epoch.begin(), epoch.end(), '\"'), epoch.end());
epoch.erase(std::remove(epoch.begin(), epoch.end(), '\''), epoch.end());
iterIndex++;
}
else if (hasStart(line, "arch=("))
{
arch_field = line.substr("arch=("_len);
arch_field.pop_back();
arch_field.erase(std::remove(arch_field.begin(), arch_field.end(), '\"'), arch_field.end());
arch_field.erase(std::remove(arch_field.begin(), arch_field.end(), '\''), arch_field.end());
iterIndex++;
}
}

if (!pkgrel.empty() && pkgrel[0] != '\0')
versionInfo += '-' + pkgrel;

if (!epoch.empty() && epoch[0] != '\0')
versionInfo = epoch + ':' + versionInfo;

std::string arch =
/*std::string arch =
shell_exec("grep 'CARCH=' " + config->makepkgConf + " | cut -d= -f2 | sed -e \"s/'//g\" -e 's/\"//g'");
std::string arch_field = shell_exec("awk -F '[()]' '/^arch=/ {gsub(/\"/,\"\",$2); print $2}' " + path +
"/PKGBUILD | sed -e \"s/'//g\" -e 's/\"//g'");
std::string pkgext =
shell_exec("grep 'PKGEXT=' " + config->makepkgConf + " | cut -d= -f2 | sed -e \"s/'//g\" -e 's/\"//g'");*/

std::ifstream makepkgConf(config->makepkgConf, std::ios::in);
std::string arch, pkgext;
iterIndex = 0;

while (std::getline(makepkgConf, line) && iterIndex < 2)
{
if (hasStart(line, "CARCH="))
{
arch = line.substr("CARCH="_len);
arch.erase(std::remove(arch.begin(), arch.end(), '\"'), arch.end());
arch.erase(std::remove(arch.begin(), arch.end(), '\''), arch.end());
iterIndex++;
}
else if (hasStart(line, "PKGEXT="))
{
pkgext = line.substr("PKGEXT="_len);
pkgext.erase(std::remove(pkgext.begin(), pkgext.end(), '\"'), pkgext.end());
pkgext.erase(std::remove(pkgext.begin(), pkgext.end(), '\''), pkgext.end());
iterIndex++;
}
}

if (arch_field == "any")
arch = "any";

std::string pkgext =
shell_exec("grep 'PKGEXT=' " + config->makepkgConf + " | cut -d= -f2 | sed -e \"s/'//g\" -e 's/\"//g'");

ret = fmt::format("{}/{}-{}-{}{}", path, pkg_name, versionInfo, arch, pkgext);
return ret;
return fmt::format("{}/{}-{}-{}{}", path, pkg_name, versionInfo, arch, pkgext);
}

/** Search a DB using libalpm
Expand Down

0 comments on commit f09ba6d

Please sign in to comment.