Merge all the changes from libalpm-test to main

Makefile

@@ -1,33 +1,36 @@
 CXX	?= g++
 SRC 	 = $(sort $(wildcard src/*.cpp))
 OBJ 	 = $(SRC:.cpp=.o)
-LIBS 	?= -lgit2 -lcpr -lalpm
+LIBS 	?= -lcpr -lalpm
 LDFLAGS  = ${LIBS}
 TARGET   = taur
-CPPFLAGS = -isystem include -Wall -std=c++17
+CPPFLAGS = -ggdb -pedantic -funroll-all-loops -march=native -isystem include -Wall -std=c++17
 
-cpr_installed := $(shell test -s /usr/lib/libcpr.so.1 || test -s /usr/local/lib/libcpr.so.1 && echo -n yes)
+is_cpr_installed := $(shell ldconfig -p | grep libcpr > /dev/null && echo -n yes)
 
-# let's not build cpr everytime if it's already installed (support by pacman installed)
-ifneq ($(cpr_installed), yes)
+# let's not build cpr everytime if it's already installed
+ifneq ($(is_cpr_installed), yes)
 all: cpr $(TARGET)
 else
 all: $(TARGET)
 endif
 
 cpr:
+	#git submodule init
+	#git submodule update --init --recursive
+	#git -C $@ checkout 3b15fa8
 	cmake -S $@ -B $@/build -DCMAKE_BUILD_TYPE=Release -DCPR_BUILD_TESTS=OFF -DCPR_USE_SYSTEM_CURL=ON
 	cmake --build $@/build --parallel
 	sudo cmake --install $@/build --prefix /usr
 
-ifneq ($(cpr_installed), yes)
+ifneq ($(is_cpr_installed), yes)
 $(TARGET): cpr ${OBJ}
 else
 $(TARGET): ${OBJ}
 endif
 	${CXX} $(OBJ) $(CPPFLAGS) -o $@ $(LDFLAGS)
 
 clean:
-	rm -rf taur src/*.o cpr/build
+	rm -rf taur $(OBJ) cpr/build
 
 .PHONY: cpr taur clean all

PKGBUILD

@@ -1,11 +1,11 @@
 pkgname="TabAUR-git"
-pkgver=0.0.1
+pkgver=0.5.8
 pkgrel=1
 pkgdesc="A lightweight AUR helper, designed to be simple but powerful."
 arch=('x86_64' 'aarch64')
 url="https://example.com/"
 license=('GPL3')
-depends=('pacman' 'tar' 'libgit2')
+depends=('pacman' 'tar')
 optdepends=(
   'sudo: privilege elevation'
   'doas: privilege elevation'

README.md

@@ -3,28 +3,18 @@
 TabAUR is an AUR Helper that actually makes releases and it's written in C++, It supports downloading AUR Repositories with tarballs or git
 
 ### Compilation
-Just run `make`. 
+Just run `make`.
 
 If the compilation time is too slow, use `make -j$(nproc)` and it will use 100% of your CPU, making the compilation way faster.
 
 ### Cleaning
 To clean, run `make clean`.
 
 ## Dependencies
-you need to install libgit2 and [cpr](https://github.com/libcpr/cpr).
-
-For `libgit2` can be installed by this command
-```
-sudo pacman -S libgit2
-```
-For cpr,
+you need to install [cpr](https://github.com/libcpr/cpr)
 TabAUR offers the choice to either use the [AUR version](https://aur.archlinux.org/packages/cpr) (recommended)
 
-Or by compiling and installing from source with the following commands:
+Or by compiling and installing from here with the following command:
 ```bash
-git submodule init
-git submodule update --init --recursive
-make cpr
-make
+make cpr && make
 ```
-**NOTE:** using the compiled from source version can lead to bugs or errors.

ReleaseMakeFile

@@ -0,0 +1,36 @@
+CXX	?= g++
+SRC 	 = $(sort $(wildcard src/*.cpp))
+OBJ 	 = $(SRC:.cpp=.o)
+LIBS 	?= -lcpr -lalpm
+LDFLAGS  = ${LIBS}
+TARGET   = taur
+CPPFLAGS = -O3 -pedantic -funroll-all-loops -march=native -isystem include -Wall -std=c++17
+
+is_cpr_installed := $(shell ldconfig -p | grep libcpr > /dev/null && echo -n yes)
+
+# let's not build cpr everytime if it's already installed
+ifneq ($(is_cpr_installed), yes)
+all: cpr $(TARGET)
+else
+all: $(TARGET)
+endif
+
+cpr:
+	#git submodule init
+	#git submodule update --init --recursive
+	#git -C $@ checkout 3b15fa8
+	cmake -S $@ -B $@/build -DCMAKE_BUILD_TYPE=Release -DCPR_BUILD_TESTS=OFF -DCPR_USE_SYSTEM_CURL=ON
+	cmake --build $@/build --parallel
+	sudo cmake --install $@/build --prefix /usr
+
+ifneq ($(is_cpr_installed), yes)
+$(TARGET): cpr ${OBJ}
+else
+$(TARGET): ${OBJ}
+endif
+	${CXX} $(OBJ) $(CPPFLAGS) -o $@ $(LDFLAGS)
+
+clean:
+	rm -rf taur $(OBJ) cpr/build
+
+.PHONY: cpr taur clean all

compile_flags.txt

@@ -1 +1,4 @@
 -I./include
+-pedantic
+-Wall
+-std=c++17

include/args.hpp

@@ -1,30 +1,58 @@
 #ifndef ARGS_HPP
 #define ARGS_HPP
 
-#include <string>
+#include "util.hpp"
+#include <alpm.h>
 #include <sys/types.h>
 #include <vector>
 #include <getopt.h>
 
-enum OperationType {
-    OP_SYNC = 1, // when you run taur -S[args]
-    OP_REM = 2, // when you run taur -R[args]
-    OP_QUERY = 3,
-	OP_SYSUPGRADE,
-    OP_PACMAN // when it's different from -S, we gonna use pacman
+enum {
+    OP_MAIN  = 1,
+    OP_SYNC, // when you run taur -S[args]
+    OP_REM,       // when you run taur -R[args]
+    OP_QUERY,
+    OP_PACMAN, // when it's different from -S,R,Q we gonna use pacman
+};
+
+enum {
+    OP_ASK = 1000,
+    OP_CACHEDIR,
+    OP_AURONLY,
+    OP_SUDO,
+    OP_USEGIT,
+    OP_REFRESH,
+    OP_SYSUPGRADE,
+    OP_COLORS,
+    OP_DEBUG,
+    OP_CONFIG,
+    OP_THEME,
+    OP_SEARCH,
+    OP_QUIET,
+    OP_TEST_COLORS,
 };
 
 struct Operation_t {
     u_short op;
-    u_short op_sync;
-    u_short op_upgrade;
+    u_short op_s_sync;
+    u_short op_s_upgrade;
+    u_short op_s_search;
+    u_short op_s_pacman;
+
+    bool    requires_root = false;
+    u_short help;
+    u_short version;
+    u_short test_colors;
 
     std::vector<std::string> args;
 };
 
-extern struct Operation_t operation;
-
-int parseargs(int argc, char* argv[]);
-int parsearg_op(int opt);
+extern struct Operation_t op;
+extern alpm_list_smart_deleter taur_targets;
 
+int parsearg_op(int opt, int dryrun);
+void invalid_opt();
+int parsearg_global(int opt);
+int parsearg_query(int opt);
+int parsearg_sync(int opt);
 #endif

include/config.hpp

@@ -1,68 +1,146 @@
 #ifndef CONFIG_HPP
 #define CONFIG_HPP
 
-#include <string>
-#include <util.hpp>
-#define TOML_HEADER_ONLY 1
-#include <toml.hpp>
+#include <alpm.h>
+#include <map>
+#include <type_traits>
+#define TOML_HEADER_ONLY 0
+#include "toml.hpp"
+#include "fmt/color.h"
 
 using std::string;
-using std::optional;
+
+// so we don't need to include util.hpp for getConfigValue()
+string  expandVar(string& str);
+
+enum types {
+    STR,
+    BOOL
+};
+
+struct strOrBool {
+    types valueType;
+    string stringValue = "";
+    bool boolValue = false;
+};
 
 class Config {
 public:
-    bool useGit;
-    bool aurOnly;
+    alpm_handle_t *handle = nullptr;
+    alpm_list_t *repos = nullptr;
     string makepkgBin;
     string cacheDir;
     string sudo;
+    string git;
+    string makepkgConf;
+    bool aurOnly;
+    bool useGit;
     bool colors;
+    bool secretRecipe;
+    bool debug;
+    bool quiet;
+
+    std::map<string, strOrBool> overrides;
 
     Config();
-    string getHomeCacheDir();
-    string getCacheDir();
-    string getHomeConfigDir();
-    string getConfigDir();
+    ~Config();
+
+    void   init(string configFile, string themeFile);
+    void   initializeVars();
+
+    bool   isInitialized();
+
     void   loadConfigFile(string filename); 
+    void   loadPacmanConfigFile(string filename);
+    void   loadThemeFile(string filename);
 
     // stupid c++ that wants template functions in header
-    template<typename T>
+    template <typename T>
     T getConfigValue(string value, T fallback) {
-        optional<T> ret = this->tbl.at_path(value).value<T>();
-        if constexpr (is_string<T>::value) // if we get a value that's a string
-            return ret ? expandHome(ret.value()) : expandHome(fallback);
+        auto overridePos = overrides.find(value);
+
+        // user wants a bool (overridable), we found an override matching the name, and the override is a bool.
+        if constexpr(std::is_same<T, bool>())
+            if (overridePos != overrides.end() && overrides[value].valueType == BOOL)
+                return overrides[value].boolValue;
+
+        // user wants a str (overridable), we found an override matching the name, and the override is a str.
+        if constexpr(std::is_same<T, string>())
+            if (overridePos != overrides.end() && overrides[value].valueType == STR)
+                return overrides[value].stringValue;
+
+        toml::optional<T> ret = this->tbl.at_path(value).value<T>();
+        if constexpr (toml::is_string<T>) // if we want to get a value that's a string
+            return ret ?  expandVar(ret.value()) : expandVar(fallback);
         else
-            return ret ? ret.value() : fallback;
+            return ret.value_or(fallback);
     }
 
+    fmt::rgb getThemeValue(string value, string fallback);
+    string getThemeHexValue(string value, string fallback);
+
 private:
-    toml::table tbl;
+    toml::table tbl, theme_tbl;
+    bool initialized = false;
 };
 
-extern Config config;
+extern std::unique_ptr<Config> config;
 
 // we comment the default config values, just like /etc/pacman.conf
-inline const std::string defConfig = R"#([general]
-# if true(default), then it'll uses git for downloading/updating the aur repo
-# else if false, then it'll use tarballs (.tar.gz) of the aur repo
+inline const string defConfig = R"#([general]
+# All options are commented out with their default values listed.
+# If you wish to use different options values, uncomment and update those.
+# It's safe to remove any options you want, just remember their default value
+
+# If true(default), then it'll uses git for downloading/updating the aur repo.
+# Else if false, then it'll use tarballs (.tar.gz) of the aur repo.
 #useGit = true
 
-# If you use sudo or doas
+# If you use sudo or doas.
 #sudo = "sudo"
 
-# Optional pretty prints, because some terminals don't suport them
+# Optional pretty prints, because some terminals don't suport them.
 #colors = true
 
 # If false (default), it'll allow you to operate on system packages as well as AUR.
-# this option can be overrided by the --aur-only long option or running "-Ra" instead of "-R".
+# This option can be overrided by the --aur-only long option or running "-Ra" instead of "-R".
 #aurOnly = false
 
+# Useful for knowing more about TabAUR operations.
+# Please activate this before reporting bugs on our Github repo, thank you :)
+#debug = true
+
+# Where we are gonna download the AUR packages (default $XDG_CACHE_HOME/TabAUR, else ~/.cache/TabAUR)
+#cacheDir = "$XDG_CACHE_HOME/TabAUR"
+
 [bins]
-#makepkgBin = "makepkg"
+#makepkg = "makepkg"
+#git = "git"
+
+[pacman]
+#RootDir = "/"
+#DBPath = "/var/lib/pacman"
+#ConfigFile = "/etc/pacman.conf"
+#MakepkgConf = "/etc/makepkg.conf"
+)#";
 
-[storage]
-# Where we are gonna download the AUR packages (default $XDG_CACHE_HOME, else ~/.cache/TabAUR)
-#cacheDir = "~/.cache/TabAUR"
+inline const string defTheme = R"#([theme]
+red = "#ff2000"
+green = "#00ff00"
+blue = "#00aaff"
+cyan = "#00ffff"
+yellow = "#ffff00"
+magenta = "#ff11cc"
 )#";
 
+inline string red = "#ff2000";
+inline string green = "#00ff00";
+inline string blue = "#00aaff";
+inline string cyan = "#00ffff";
+inline string yellow = "#ffff00";
+inline string magenta = "#ff11cc";
+
+inline string configfile;
+inline string themefile;
+
 #endif