oki/oki
1
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases Wiki Activity

Ajoute le namespace oki

Browse Source
This commit is contained in:
Colin FRIZOT
2022-10-10 11:06:29 +02:00
parent 73dbf64e7f
commit b9bfcc18bd
14 changed files with 176 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
cli/src/cli/options.cpp
View File

@@ -3,33 +3,36 @@
#include <iostream>
#include <cstring>
void invalidUsage(std::ostream &os) {
namespace oki{
void invalidUsage(std::ostream &os) {
std::cerr << "Invalid usage. Hint: ";
}
void help(std::ostream &os) {
os << "help: Show this help\n";
os << "list: List available packages\n";
os << "install: Install a new package\n";
}
CliAction parseArguments(int argc, char *argv[]) {
if (argc < 2) {
std::cerr << "See " << argv[0] << " help for all available actions.\n";
exit(0);
}
if (strcmp("help", argv[1]) == 0) {
help(std::cout);
} else if (strcmp("list", argv[1]) == 0) {
return ListAction{};
} else if (strcmp("install", argv[1]) == 0) {
if (argc < 3) {
invalidUsage(std::cerr);
std::cerr << "Add a package name after install.\n";
void help(std::ostream &os) {
os << "help: Show this help\n";
os << "list: List available packages\n";
os << "install: Install a new package\n";
}
CliAction parseArguments(int argc, char *argv[]) {
if (argc < 2) {
std::cerr << "See " << argv[0] << " help for all available actions.\n";
exit(0);
}
if (strcmp("help", argv[1]) == 0) {
help(std::cout);
} else if (strcmp("list", argv[1]) == 0) {
return ListAction{};
} else if (strcmp("install", argv[1]) == 0) {
if (argc < 3) {
invalidUsage(std::cerr);
std::cerr << "Add a package name after install.\n";
exit(1);
}
return InstallAction{argv[2]};
} else {
exit(1);
}
return InstallAction{argv[2]};
} else {
exit(1);
}
}

20
cli/src/cli/options.h
View File

@@ -3,12 +3,16 @@
#include <string_view>
#include <variant>
struct ListAction {
};
struct InstallAction {
std::string_view packageName;
explicit InstallAction(const char *packageName) : packageName{packageName} {}
};
using CliAction = std::variant<ListAction, InstallAction>;
namespace oki{
struct ListAction {
};
struct InstallAction {
std::string_view packageName;
explicit InstallAction(const char *packageName) : packageName{packageName} {}
};
using CliAction = std::variant<ListAction, InstallAction>;
CliAction parseArguments(int argc, char *argv[]);
}
CliAction parseArguments(int argc, char *argv[]);

14
cli/src/config/config.cpp
View File

@@ -4,11 +4,13 @@
namespace fs = std::filesystem;
fs::path getDefaultLocalRepository() {
// https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
const char *xdgData = std::getenv("XDG_DATA_HOME");
if (xdgData == nullptr) {
return std::getenv("HOME") / fs::path{".local/share/oki"};
namespace oki{
fs::path getDefaultLocalRepository() {
// https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
const char *xdgData = std::getenv("XDG_DATA_HOME");
if (xdgData == nullptr) {
return std::getenv("HOME") / fs::path{".local/share/oki"};
}
return xdgData / fs::path{"oki"};
}
return xdgData / fs::path{"oki"};
}

4
cli/src/config/config.h
View File

@@ -2,4 +2,6 @@
#include <filesystem>
std::filesystem::path getDefaultLocalRepository();
namespace oki{
std::filesystem::path getDefaultLocalRepository();
}

54
cli/src/io/HttpRequest.cpp
View File

@@ -2,36 +2,38 @@
#include <curl/curl.h>
static std::size_t writeCallback(char *in, std::size_t size, std::size_t nmemb, std::string *out) {
std::size_t totalSize = size * nmemb;
if (totalSize) {
out->append(in, totalSize);
return totalSize;
namespace oki{
static std::size_t writeCallback(char *in, std::size_t size, std::size_t nmemb, std::string *out) {
std::size_t totalSize = size * nmemb;
if (totalSize) {
out->append(in, totalSize);
return totalSize;
}
return 0;
}
return 0;
}
HttpRequest::HttpRequest(std::string_view url) : curl{curl_easy_init()}, url{url} {
curl_easy_setopt(curl, CURLOPT_URL, this->url.c_str());
}
std::string HttpRequest::get() {
std::string buffer;
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writeCallback);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buffer);
CURLcode res = curl_easy_perform(curl);
if (res != CURLE_OK) {
throw RequestException{static_cast<int>(res)};
HttpRequest::HttpRequest(std::string_view url) : curl{curl_easy_init()}, url{url} {
curl_easy_setopt(curl, CURLOPT_URL, this->url.c_str());
}
return buffer;
}
HttpRequest::~HttpRequest() {
curl_easy_cleanup(curl);
}
std::string HttpRequest::get() {
std::string buffer;
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writeCallback);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buffer);
CURLcode res = curl_easy_perform(curl);
if (res != CURLE_OK) {
throw RequestException{static_cast<int>(res)};
}
return buffer;
}
RequestException::RequestException(int code) : code{code} {}
HttpRequest::~HttpRequest() {
curl_easy_cleanup(curl);
}
const char *RequestException::what() const noexcept {
return curl_easy_strerror(static_cast<CURLcode>(code));
RequestException::RequestException(int code) : code{code} {}
const char *RequestException::what() const noexcept {
return curl_easy_strerror(static_cast<CURLcode>(code));
}
}

34
cli/src/io/HttpRequest.h
View File

@@ -2,20 +2,22 @@
#include <string>
class HttpRequest {
private:
void *curl;
std::string url;
public:
explicit HttpRequest(std::string_view url);
std::string get();
~HttpRequest();
};
namespace oki{
class HttpRequest {
private:
void *curl;
std::string url;
public:
explicit HttpRequest(std::string_view url);
std::string get();
~HttpRequest();
};
class RequestException : public std::exception {
private:
int code;
public:
explicit RequestException(int code);
const char *what() const noexcept override;
};
class RequestException : public std::exception {
private:
int code;
public:
explicit RequestException(int code);
const char *what() const noexcept override;
};
}

2
cli/src/main.cpp
View File

@@ -4,6 +4,8 @@
#include "cli/options.h"
#include "repository/RemoteRepository.h"
using namespace oki;
std::size_t writeCallback(char *in, size_t size, size_t nmemb, std::string *out){
std::size_t total_size = size * nmemb;
if (total_size){

14
cli/src/package/Package.cpp
View File

@@ -1,11 +1,13 @@
#include "Package.h"
Package::Package(std::string_view shortName, std::string_view longName) : shortName{shortName}, longName{longName} {}
namespace oki{
Package::Package(std::string_view shortName, std::string_view longName) : shortName{shortName}, longName{longName} {}
const std::string& Package::getShortName() const {
return shortName;
}
const std::string& Package::getShortName() const {
return shortName;
}
const std::string& Package::getLongName() const {
return longName;
const std::string& Package::getLongName() const {
return longName;
}
}

20
cli/src/package/Package.h
View File

@@ -2,12 +2,14 @@
#include <string>
class Package {
private:
std::string shortName;
std::string longName;
public:
Package(std::string_view shortName, std::string_view longName);
const std::string& getShortName() const;
const std::string& getLongName() const;
};
namespace oki{
class Package {
private:
std::string shortName;
std::string longName;
public:
Package(std::string_view shortName, std::string_view longName);
const std::string& getShortName() const;
const std::string& getLongName() const;
};
}

28
cli/src/repository/LocalRepository.cpp
View File

@@ -4,20 +4,22 @@
namespace fs = std::filesystem;
LocalRepository::LocalRepository(fs::path root) : root{std::move(root)} {}
namespace oki{
LocalRepository::LocalRepository(fs::path root) : root{std::move(root)} {}
void LocalRepository::createIfNotExists() {
fs::create_directories(root);
}
std::vector<Package> LocalRepository::listPackages() {
std::vector<Package> packages;
for (const auto& file : fs::directory_iterator(root)) {
packages.emplace_back(file.path().filename().string(), "");
void LocalRepository::createIfNotExists() {
fs::create_directories(root);
}
return packages;
}
void LocalRepository::download(std::string_view packageName, const fs::path& destination) {
std::cerr << "TODO : downloading " << packageName << "\n";
std::vector<Package> LocalRepository::listPackages() {
std::vector<Package> packages;
for (const auto& file : fs::directory_iterator(root)) {
packages.emplace_back(file.path().filename().string(), "");
}
return packages;
}
void LocalRepository::download(std::string_view packageName, const fs::path& destination) {
std::cerr << "TODO : downloading " << packageName << "\n";
}
}

20
cli/src/repository/LocalRepository.h
View File

@@ -2,12 +2,14 @@
#include "Repository.h"
class LocalRepository : public Repository {
private:
std::filesystem::path root;
public:
explicit LocalRepository(std::filesystem::path root);
void createIfNotExists();
std::vector<Package> listPackages() override;
void download(std::string_view packageName, const std::filesystem::path& destination) override;
};
namespace oki{
class LocalRepository : public Repository {
private:
std::filesystem::path root;
public:
explicit LocalRepository(std::filesystem::path root);
void createIfNotExists();
std::vector<Package> listPackages() override;
void download(std::string_view packageName, const std::filesystem::path& destination) override;
};
}

22
cli/src/repository/RemoteRepository.cpp
View File

@@ -5,18 +5,20 @@
using json = nlohmann::json;
RemoteRepository::RemoteRepository(std::string_view apiUrl) : apiUrl{apiUrl} {}
namespace oki{
RemoteRepository::RemoteRepository(std::string_view apiUrl) : apiUrl{apiUrl} {}
std::vector<Package> RemoteRepository::listPackages() {
HttpRequest request{apiUrl + "?api=list"};
json data = json::parse(request.get());
std::vector<Package> packages;
for (const auto &item : data) {
packages.emplace_back(item.at("short_name").get<std::string>(), item.at("long_name").get<std::string>());
std::vector<Package> RemoteRepository::listPackages() {
HttpRequest request{apiUrl + "?api=list"};
json data = json::parse(request.get());
std::vector<Package> packages;
for (const auto &item : data) {
packages.emplace_back(item.at("short_name").get<std::string>(), item.at("long_name").get<std::string>());
}
return packages;
}
return packages;
}
void RemoteRepository::download(std::string_view packageName, const std::filesystem::path &destination) {
void RemoteRepository::download(std::string_view packageName, const std::filesystem::path &destination) {
}
}

18
cli/src/repository/RemoteRepository.h
View File

@@ -2,11 +2,13 @@
#include "Repository.h"
class RemoteRepository : public Repository {
private:
std::string apiUrl;
public:
explicit RemoteRepository(std::string_view apiUrl);
std::vector<Package> listPackages() override;
void download(std::string_view packageName, const std::filesystem::path& destination) override;
};
namespace oki{
class RemoteRepository : public Repository {
private:
std::string apiUrl;
public:
explicit RemoteRepository(std::string_view apiUrl);
std::vector<Package> listPackages() override;
void download(std::string_view packageName, const std::filesystem::path& destination) override;
};
}

14
cli/src/repository/Repository.h
View File

@@ -6,9 +6,11 @@
#include "../package/Package.h"
class Repository {
public:
virtual std::vector<Package> listPackages() = 0;
virtual void download(std::string_view packageName, const std::filesystem::path& destination) = 0;
virtual ~Repository() = default;
};
namespace oki{
class Repository {
public:
virtual std::vector<Package> listPackages() = 0;
virtual void download(std::string_view packageName, const std::filesystem::path& destination) = 0;
virtual ~Repository() = default;
};
}