cli: Ajoute de la couleur aux infos du paquet

This commit is contained in:
2022-10-10 15:18:36 +02:00
parent 20f71a02bd
commit 749efeb1e5
3 changed files with 17 additions and 3 deletions

View File

@@ -1,6 +1,7 @@
#include "config.h" #include "config.h"
#include <cstdlib> #include <cstdlib>
#include <unistd.h>
namespace fs = std::filesystem; namespace fs = std::filesystem;
@@ -13,4 +14,8 @@ namespace oki{
} }
return xdgData / fs::path{"oki"}; return xdgData / fs::path{"oki"};
} }
bool acceptColor() {
return isatty(fileno(stdout));
}
} }

View File

@@ -4,4 +4,5 @@
namespace oki{ namespace oki{
std::filesystem::path getDefaultLocalRepository(); std::filesystem::path getDefaultLocalRepository();
bool acceptColor();
} }

View File

@@ -2,6 +2,7 @@
#include <string> #include <string>
#include "cli/options.h" #include "cli/options.h"
#include "config/config.h"
#include "repository/RemoteRepository.h" #include "repository/RemoteRepository.h"
using namespace oki; using namespace oki;
@@ -16,6 +17,7 @@ std::size_t writeCallback(char *in, size_t size, size_t nmemb, std::string *out)
} }
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
bool color = acceptColor();
CliAction action = parseArguments(argc, argv); CliAction action = parseArguments(argc, argv);
RemoteRepository repository{"http://localhost:8000"}; RemoteRepository repository{"http://localhost:8000"};
if (std::holds_alternative<ListAction>(action)) { if (std::holds_alternative<ListAction>(action)) {
@@ -24,13 +26,19 @@ int main(int argc, char *argv[]) {
} }
} else if (auto* install = std::get_if<InstallAction>(&action)) { } else if (auto* install = std::get_if<InstallAction>(&action)) {
std::cout << "Installing " << install->packageName << "...\n"; std::cout << "Installing " << install->packageName << "...\n";
} else if(auto* show = std::get_if<ShowAction>(&action)){ } else if (auto* show = std::get_if<ShowAction>(&action)){
std::optional<Package> p = repository.showPackage(show->packageName); std::optional<Package> p = repository.showPackage(show->packageName);
if(p == std::nullopt){ if(p == std::nullopt){
std::cout << "Le package n'existe pas\n"; std::cout << "Le package n'existe pas\n";
} else {
if (color) {
std::cout << "\e[32m" << p->getShortName() << "\e[0m/";
} else {
std::cout << p->getShortName() << "/";
}
const Version& latest = p->getVersions().front();
std::cout << latest.getIdentifier() << latest.getPublishedDate()<< "\n\t" << p->getLongName() << "\n";
} }
else std::cout << p->getShortName() << "/" << p->getVersions().front().getIdentifier() << "\t"
<< p->getVersions().front().getPublishedDate()<< "\n\t" << p->getLongName() << "\n";
} }
return 0; return 0;
} }