towk/gdpm
1
0
Fork 0
mirror of https://github.com/davidallendj/gdpm.git synced 2025-12-20 03:27:02 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed issue where assets would not installed due to directory not being created

Browse source
This commit is contained in:
David Allen 2022-07-30 09:34:21 -05:00
parent 2fd55de71e
commit 060d19bda4
10 changed files with 193 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

6
README.md
View file

@ -150,10 +150,12 @@ gdpm update -f packages.txt
gdpm update # Updates all packages
```
To list installed packages, use the '--list' option. This also provides some other extra information like the Godot version and license.
To list installed packages, use the 'list' command. This also provides some other extra information like the Godot version and license. You can also list the remote sources using the 'remote-sources' option.
```bash
gdpm list
gdpm list packages
gdpm list remote-sources
```
Packages can be linked or copied into a project using the 'link' and 'clone' commands.
@ -212,8 +214,6 @@ gdpm list remote-sources
- [ ] Login and register for access to repositories.
- [ ] Handle dependencies between multiple assets.
- [ ] Support for paid assets.
## License

3
bin/gdpm-test.sh
View file

@ -20,6 +20,9 @@ ${command} list
${command} list packages
${command} list remote-sources
${command} add-remote https://godotengine.org/asset-library/api
${command} delete-remote https://godotengine.org/asset-library/api
# Create a symlink of packages to specified path
${command} link "ResolutionManagerPlugin" "godot-hmac" --path tests/tests-godot-project
${command} link -f packages.txt --path tests/test-godot-project

21
include/cache.hpp
View file

@ -1,4 +1,5 @@
#include "constants.hpp"
#include <sqlite3.h>
#include <vector>
#include <string>
@ -9,16 +10,16 @@ namespace gdpm::package_manager{
namespace gdpm::cache{
using namespace package_manager;
int create_package_database();
int insert_package_info(const std::vector<package_info>& package);
std::vector<package_info> get_package_info_by_id(const std::vector<size_t>& package_ids);
std::vector<package_info> get_package_info_by_title(const std::vector<std::string>& package_titles);
std::vector<package_info> get_installed_packages();
int update_package_info(const std::vector<package_info>& packages);
int update_sync_info(const std::vector<std::string>& download_urls);
int delete_packages(const std::vector<std::string>& package_titles);
int delete_packages(const std::vector<size_t>& package_ids);
int drop_package_database();
int create_package_database(const std::string& cache_path = GDPM_PACKAGE_CACHE_PATH, const std::string& table_name = GDPM_PACKAGE_CACHE_TABLENAME);
int insert_package_info(const std::vector<package_info>& package, const std::string& cache_path = GDPM_PACKAGE_CACHE_PATH, const std::string& table_name = GDPM_PACKAGE_CACHE_TABLENAME);
std::vector<package_info> get_package_info_by_id(const std::vector<size_t>& package_ids, const std::string& cache_path = GDPM_PACKAGE_CACHE_PATH, const std::string& table_name = GDPM_PACKAGE_CACHE_TABLENAME);
std::vector<package_info> get_package_info_by_title(const std::vector<std::string>& package_titles, const std::string& cache_path = GDPM_PACKAGE_CACHE_PATH, const std::string& table_name = GDPM_PACKAGE_CACHE_TABLENAME);
std::vector<package_info> get_installed_packages(const std::string& cache_path = GDPM_PACKAGE_CACHE_PATH, const std::string& table_name = GDPM_PACKAGE_CACHE_TABLENAME);
int update_package_info(const std::vector<package_info>& packages, const std::string& cache_path = GDPM_PACKAGE_CACHE_PATH, const std::string& table_name = GDPM_PACKAGE_CACHE_TABLENAME);
int update_sync_info(const std::vector<std::string>& download_urls, const std::string& cache_path = GDPM_PACKAGE_CACHE_PATH, const std::string& table_name = GDPM_PACKAGE_CACHE_TABLENAME);
int delete_packages(const std::vector<std::string>& package_titles, const std::string& cache_path = GDPM_PACKAGE_CACHE_PATH, const std::string& table_name = GDPM_PACKAGE_TABLENAME);
int delete_packages(const std::vector<size_t>& package_ids, const std::string& cache_path = GDPM_PACKAGE_CACHE_PATH, const std::string& table_name = GDPM_PACKAGE_CACHE_TABLENAME);
int drop_package_database(const std::string& cache_path = GDPM_PACKAGE_CACHE_PATH, const std::string& table_name = GDPM_PACKAGE_CACHE_TABLENAME);
std::string to_values(const package_info& package);
std::string to_values(const std::vector<package_info>& packages);

5
include/config.hpp
View file

@ -5,6 +5,7 @@
#include <string>
#include <filesystem>
#include <vector>
#include <set>
namespace gdpm::config{
@ -16,7 +17,7 @@ namespace gdpm::config{
std::string godot_version;
std::string packages_dir;
std::string tmp_dir;
std::vector<std::string> remote_sources;
std::set<std::string> remote_sources;
size_t threads;
size_t timeout;
bool enable_sync;
@ -26,7 +27,7 @@ namespace gdpm::config{
std::string to_json(const config_context& params);
config_context load(std::filesystem::path path, int verbose = 0);
int save(const config_context& config, int verbose = 0);
config_context make_config(const std::string& username = GDPM_CONFIG_USERNAME, const std::string& password = GDPM_CONFIG_PASSWORD, const std::string& path = GDPM_CONFIG_PATH, const std::string& token = GDPM_CONFIG_TOKEN, const std::string& godot_version = GDPM_CONFIG_GODOT_VERSION, const std::string& packages_dir = GDPM_CONFIG_LOCAL_PACKAGES_DIR, const std::string& tmp_dir = GDPM_CONFIG_LOCAL_TMP_DIR, const std::vector<std::string>& remote_sources = {GDPM_CONFIG_REMOTE_SOURCES}, size_t threads = GDPM_CONFIG_THREADS, size_t timeout = 0, bool enable_sync = GDPM_CONFIG_ENABLE_SYNC, bool enable_file_logging = GDPM_CONFIG_ENABLE_FILE_LOGGING, int verbose = GDPM_CONFIG_VERBOSE);
config_context make_config(const std::string& username = GDPM_CONFIG_USERNAME, const std::string& password = GDPM_CONFIG_PASSWORD, const std::string& path = GDPM_CONFIG_PATH, const std::string& token = GDPM_CONFIG_TOKEN, const std::string& godot_version = GDPM_CONFIG_GODOT_VERSION, const std::string& packages_dir = GDPM_CONFIG_LOCAL_PACKAGES_DIR, const std::string& tmp_dir = GDPM_CONFIG_LOCAL_TMP_DIR, const std::set<std::string>& remote_sources = {GDPM_CONFIG_REMOTE_SOURCES}, size_t threads = GDPM_CONFIG_THREADS, size_t timeout = 0, bool enable_sync = GDPM_CONFIG_ENABLE_SYNC, bool enable_file_logging = GDPM_CONFIG_ENABLE_FILE_LOGGING, int verbose = GDPM_CONFIG_VERBOSE);
extern config_context config;
}

6
include/constants.hpp
View file

@ -13,7 +13,7 @@ namespace gdpm::constants{
constexpr const char *TmpPath = "$HOME/.config/gdpm/tmp";
}
/* Defines to set when building with -DGPM_* */
/* Define default macros to set when building with -DGPM_* */
#define GDPM_CONFIG_USERNAME ""
#define GDPM_CONFIG_PASSWORD ""
#define GDPM_CONFIG_PATH "config.json"
@ -28,13 +28,13 @@ namespace gdpm::constants{
#define GDPM_CONFIG_ENABLE_FILE_LOGGING 0
#define GDPM_CONFIG_VERBOSE 0
/* Defines package cache for local storage */
/* Defines the default package cache for local storage */
#define GDPM_PACKAGE_CACHE_ENABLE 1
#define GDPM_PACKAGE_CACHE_PATH "tests/gdpm/packages.db"
#define GDPM_PACKAGE_CACHE_TABLENAME "cache"
#define GDPM_PACKAGE_CACHE_COLNAMES "asset_id, type, title, author, author_id, version, godot_version, cost, description, modify_date, support_level, category, remote_source, download_url, download_hash, is_installed, install_path"
/* Defines to set default assets API params */
/* Define macros to set default assets API params */
#define GDPM_DEFAULT_ASSET_TYPE any
#define GDPM_DEFAULT_ASSET_CATEGORY 0
#define GDPM_DEFAULT_ASSET_SUPPORT all

14
include/version.hpp Normal file
View file

@ -0,0 +1,14 @@
#pragma once
#include <string>
namespace gdpm::version{
struct version_context{
int major;
int minor;
int patch;
};
std::string to_string(const version_context& context);
version_context to_version(const std::string& version);
}

69
src/cache.cpp
View file

@ -4,24 +4,31 @@
#include "constants.hpp"
#include "package_manager.hpp"
#include "utils.hpp"
#include <filesystem>
#include <string>
namespace gdpm::cache{
int create_package_database(){
int create_package_database(const std::string& cache_path, const std::string& table_name){
sqlite3 *db;
sqlite3_stmt *res;
char *errmsg;
int rc = sqlite3_open(GDPM_PACKAGE_CACHE_PATH, &db);
/* Check and make sure directory is created before attempting to open */
if(!std::filesystem::exists(cache_path)){
log::info("Creating cache directories...{}", cache_path);
std::filesystem::create_directories(cache_path);
}
int rc = sqlite3_open(cache_path.c_str(), &db);
if(rc != SQLITE_OK){
log::error("create_package_database.sqlite3_open(): {}", sqlite3_errmsg(db));
sqlite3_close(db);
return rc;
}
constexpr const char *sql = "CREATE TABLE IF NOT EXISTS "
GDPM_PACKAGE_CACHE_TABLENAME "("
std::string sql = "CREATE TABLE IF NOT EXISTS " +
table_name + "("
"id INTEGER PRIMARY KEY AUTOINCREMENT,"
"asset_id INT NOT NULL,"
"type INT NOT NULL,"
@ -42,7 +49,7 @@ namespace gdpm::cache{
"install_path TEXT NOT NULL);";
// rc = sqlite3_prepare_v2(db, "SELECT", -1, &res, 0);
rc = sqlite3_exec(db, sql, nullptr, nullptr, &errmsg);
rc = sqlite3_exec(db, sql.c_str(), nullptr, nullptr, &errmsg);
if(rc != SQLITE_OK){
// log::error("Failed to fetch data: {}\n", sqlite3_errmsg(db));
log::error("create_package_database.sqlite3_exec(): {}", errmsg);
@ -55,7 +62,7 @@ namespace gdpm::cache{
}
int insert_package_info(const std::vector<package_info>& packages){
int insert_package_info(const std::vector<package_info>& packages, const std::string& cache_path, const std::string& table_name){
sqlite3 *db;
sqlite3_stmt *res;
char *errmsg = nullptr;
@ -63,12 +70,12 @@ namespace gdpm::cache{
/* Prepare values to use in sql statement */
std::string sql{"BEGIN TRANSACTION; "};
for(const auto& p : packages){
sql += "INSERT INTO " GDPM_PACKAGE_CACHE_TABLENAME " (" GDPM_PACKAGE_CACHE_COLNAMES ") ";
sql += "INSERT INTO " + table_name + " (" GDPM_PACKAGE_CACHE_COLNAMES ") ";
sql += "VALUES (" + to_values(p) + "); ";
}
sql += "COMMIT;";
// log::println("{}", sql);
int rc = sqlite3_open(GDPM_PACKAGE_CACHE_PATH, &db);
int rc = sqlite3_open(cache_path.c_str(), &db);
if(rc != SQLITE_OK){
log::error("insert_package_info.sqlite3_open(): {}", sqlite3_errmsg(db));
sqlite3_close(db);
@ -86,7 +93,7 @@ namespace gdpm::cache{
}
std::vector<package_info> get_package_info_by_id(const std::vector<size_t>& package_ids){
std::vector<package_info> get_package_info_by_id(const std::vector<size_t>& package_ids, const std::string& cache_path, const std::string& table_name){
sqlite3 *db;
sqlite3_stmt *res;
char *errmsg = nullptr;
@ -121,7 +128,7 @@ namespace gdpm::cache{
return 0;
};
int rc = sqlite3_open(GDPM_PACKAGE_CACHE_PATH, &db);
int rc = sqlite3_open(cache_path.c_str(), &db);
if(rc != SQLITE_OK){
log::error("get_package_info_by_id.sqlite3_open(): {}", sqlite3_errmsg(db));
sqlite3_close(db);
@ -129,7 +136,7 @@ namespace gdpm::cache{
}
for(const auto& p_id : package_ids){
sql += "SELECT * FROM " GDPM_PACKAGE_CACHE_TABLENAME " WHERE asset_id=" + fmt::to_string(p_id)+ ";\n";
sql += "SELECT * FROM " + table_name + " WHERE asset_id=" + fmt::to_string(p_id)+ ";\n";
}
sql += "COMMIT;\n";
rc = sqlite3_exec(db, sql.c_str(), callback, (void*)&p_vector, &errmsg);
@ -144,7 +151,7 @@ namespace gdpm::cache{
}
std::vector<package_info> get_package_info_by_title(const std::vector<std::string>& package_titles){
std::vector<package_info> get_package_info_by_title(const std::vector<std::string>& package_titles, const std::string& cache_path, const std::string& table_name){
sqlite3 *db;
sqlite3_stmt *res;
char *errmsg = nullptr;
@ -178,7 +185,11 @@ namespace gdpm::cache{
return 0;
};
int rc = sqlite3_open(GDPM_PACKAGE_CACHE_PATH, &db);
/* Check to make sure the directory is there before attempting to open */
if(!std::filesystem::exists(cache_path))
std::filesystem::create_directories(cache_path);
int rc = sqlite3_open(cache_path.c_str(), &db);
if(rc != SQLITE_OK){
log::error("get_package_info_by_title.sqlite3_open(): {}", sqlite3_errmsg(db));
sqlite3_close(db);
@ -187,7 +198,7 @@ namespace gdpm::cache{
std::string sql{"BEGIN TRANSACTION;"};
for(const auto& p_title : package_titles){
sql += "SELECT * FROM " GDPM_PACKAGE_CACHE_TABLENAME " WHERE title='" + p_title + "';";
sql += "SELECT * FROM " + table_name + " WHERE title='" + p_title + "';";
}
sql += "COMMIT;";
// log::println(sql);
@ -203,7 +214,7 @@ namespace gdpm::cache{
}
std::vector<package_info> get_installed_packages(){
std::vector<package_info> get_installed_packages(const std::string& cache_path, const std::string& table_name){
sqlite3 *db;
sqlite3_stmt *res;
char *errmsg = nullptr;
@ -235,14 +246,14 @@ namespace gdpm::cache{
return 0;
};
int rc = sqlite3_open(GDPM_PACKAGE_CACHE_PATH, &db);
int rc = sqlite3_open(cache_path.c_str(), &db);
if(rc != SQLITE_OK){
log::error("get_installed_packages.sqlite3_open(): {}", sqlite3_errmsg(db));
sqlite3_close(db);
return {};
}
sql += "SELECT * FROM " GDPM_PACKAGE_CACHE_TABLENAME " WHERE is_installed=1; COMMIT;";
sql += "SELECT * FROM " + table_name + " WHERE is_installed=1; COMMIT;";
rc = sqlite3_exec(db, sql.c_str(), callback, (void*)&p_vector, &errmsg);
if(rc != SQLITE_OK){
log::error("get_installed_packages.sqlite3_exec(): {}", errmsg);
@ -255,12 +266,12 @@ namespace gdpm::cache{
}
int update_package_info(const std::vector<package_info>& packages){
int update_package_info(const std::vector<package_info>& packages, const std::string& cache_path, const std::string& table_name){
sqlite3 *db;
sqlite3_stmt *res;
char *errmsg = nullptr;
int rc = sqlite3_open(GDPM_PACKAGE_CACHE_PATH, &db);
int rc = sqlite3_open(cache_path.c_str(), &db);
if(rc != SQLITE_OK){
log::error("update_package_info.sqlite3_open(): {}", sqlite3_errmsg(db));
sqlite3_close(db);
@ -269,7 +280,7 @@ namespace gdpm::cache{
std::string sql;
for(const auto& p : packages){
sql += "UPDATE " GDPM_PACKAGE_CACHE_TABLENAME " SET "
sql += "UPDATE " + table_name + " SET "
" asset_id=" + fmt::to_string(p.asset_id) + ", "
" type='" + p.type + "', "
" title='" + p.title + "', "
@ -303,13 +314,13 @@ namespace gdpm::cache{
}
int delete_packages(const std::vector<std::string>& package_titles){
int delete_packages(const std::vector<std::string>& package_titles, const std::string& cache_path, const std::string& table_name){
sqlite3 *db;
sqlite3_stmt *res;
char *errmsg = nullptr;
std::string sql;
int rc = sqlite3_open(GDPM_PACKAGE_CACHE_PATH, &db);
int rc = sqlite3_open(cache_path, &db);
if(rc != SQLITE_OK){
log::error("delete_packages.sqlite3_open(): {}", sqlite3_errmsg(db));
sqlite3_close(db);
@ -317,7 +328,7 @@ namespace gdpm::cache{
}
for(const auto& p_title : package_titles){
sql += "DELETE FROM " GDPM_PACKAGE_CACHE_PATH " WHERE title='"
sql += "DELETE FROM " + table_name + " WHERE title='"
+ p_title + "';\n";
}
rc = sqlite3_exec(db, sql.c_str(), nullptr, nullptr, &errmsg);
@ -332,13 +343,13 @@ namespace gdpm::cache{
}
int delete_packages(const std::vector<size_t>& package_ids){
int delete_packages(const std::vector<size_t>& package_ids, const std::string& cache_path, const std::string& table_name){
sqlite3 *db;
sqlite3_stmt *res;
char *errmsg = nullptr;
std::string sql;
int rc = sqlite3_open(GDPM_PACKAGE_CACHE_PATH, &db);
int rc = sqlite3_open(cache_path.c_str(), &db);
if(rc != SQLITE_OK){
log::error("delete_packages.sqlite3_open(): {}", errmsg);
sqlite3_close(db);
@ -346,7 +357,7 @@ namespace gdpm::cache{
}
for(const auto& p_id : package_ids){
sql += "DELETE FROM " GDPM_PACKAGE_CACHE_PATH " WHERE asset_id="
sql += "DELETE FROM " + table_name + " WHERE asset_id="
+ fmt::to_string(p_id) + ";\n";
}
rc = sqlite3_exec(db, sql.c_str(), nullptr, nullptr, &errmsg);
@ -361,13 +372,13 @@ namespace gdpm::cache{
}
int drop_package_database(){
int drop_package_database(const std::string& cache_path, const std::string& table_name){
sqlite3 *db;
sqlite3_stmt *res;
char *errmsg = nullptr;
std::string sql{"DROP TABLE IF EXISTS " GDPM_PACKAGE_CACHE_TABLENAME ";\n"};
std::string sql{"DROP TABLE IF EXISTS " + table_name + ";\n"};
int rc = sqlite3_open(GDPM_PACKAGE_CACHE_PATH, &db);
int rc = sqlite3_open(cache_path.c_str(), &db);
if(rc != SQLITE_OK){
log::error("drop_package_database.sqlite3_open(): {}", sqlite3_errmsg(db));
sqlite3_close(db);

7
src/config.cpp
View file

@ -28,7 +28,7 @@
namespace gdpm::config{
config_context config;
std::string to_json(const config_context& params){
auto _build_json_array = [](std::vector<std::string> a){
auto _build_json_array = [](std::set<std::string> a){
std::string o{"["};
for(const std::string& src : a)
o += "\"" + src + "\",";
@ -104,7 +104,8 @@ namespace gdpm::config{
if(doc["remote_sources"].IsArray()){
const Value& srcs = doc["remote_sources"];
for(auto& src : srcs.GetArray()){
config.remote_sources.emplace_back(src.GetString());
// config.remote_sources.push_back(src.GetString());
config.remote_sources.insert(src.GetString());
}
} else{
log::error("Malformed sources found.");
@ -157,7 +158,7 @@ namespace gdpm::config{
return 0;
}
config_context make_config(const std::string& username, const std::string& password, const std::string& path, const std::string& token, const std::string& godot_version, const std::string& packages_dir, const std::string& tmp_dir, const std::vector<std::string>& remote_sources, size_t threads, size_t timeout, bool enable_sync, bool enable_file_logging, int verbose){
config_context make_config(const std::string& username, const std::string& password, const std::string& path, const std::string& token, const std::string& godot_version, const std::string& packages_dir, const std::string& tmp_dir, const std::set<std::string>& remote_sources, size_t threads, size_t timeout, bool enable_sync, bool enable_file_logging, int verbose){
config_context config {
.username = username,
.password = password,

31
src/package_manager.cpp
View file

@ -86,6 +86,9 @@ namespace gdpm::package_manager{
using namespace rapidjson;
params.verbose = config.verbose;
/* TODO: Need a way to use remote sources from config until no left */
/* Check if the package data is already stored in cache. If it is, there
is no need to do a lookup to synchronize the local database since we
have all the information we need to fetch the asset data. */
@ -101,7 +104,6 @@ namespace gdpm::package_manager{
}
}
// FIXME: This does not return the package to be is_installed correctly
for(const auto& p_title : package_titles){
auto found = std::find_if(p_cache.begin(), p_cache.end(), [&p_title](const package_info& p){ return p.title == p_title; });
if(found != p_cache.end()){
@ -129,7 +131,11 @@ namespace gdpm::package_manager{
std::vector<ss_pair> dir_pairs;
for(auto& p : p_found){
log::info_n("Fetching asset data for \"{}\"...", p.title);
std::string url{constants::HostUrl}, package_dir, tmp_dir, tmp_zip;
/* TODO: Try fetching the data with all available remote sources until retrieved */
for(const auto& remote_url : config.remote_sources){
std::string url{remote_url}, package_dir, tmp_dir, tmp_zip;
url += rest_api::endpoints::GET_AssetId;
/* Retrieve necessary asset data if it was found already in cache */
@ -211,6 +217,7 @@ namespace gdpm::package_manager{
p.is_installed = true;
p.install_path = package_dir;
}
}
/* Extract all the downloaded packages to their appropriate directory location. */
for(const auto& p : dir_pairs)
@ -512,18 +519,19 @@ namespace gdpm::package_manager{
void add_remote_repository(const std::string& repository, ssize_t offset){
auto& s = config.remote_sources;
auto iter = (offset > 0) ? s.begin() + offset : s.end() - offset;
config.remote_sources.insert(iter, repository);
// auto iter = (offset > 0) ? s.begin() + offset : s.end() - offset;
// config.remote_sources.insert(iter, repository);
config.remote_sources.insert(repository);
}
void delete_remote_repository(const std::string& repository){
auto& s = config.remote_sources;
std::erase(s, repository);
(void)std::remove_if(s.begin(), s.end(), [&repository](const std::string& rs){
return repository == rs;
});
s.erase(repository);
// std::erase(s, repository);
// (void)std::remove_if(s.begin(), s.end(), [&repository](const std::string& rs){
// return repository == rs;
// });
}
@ -594,7 +602,7 @@ namespace gdpm::package_manager{
("set-temporary-directory", "Set the local temporary storage location.", cxxopts::value<std::string>())
("timeout", "Set the amount of time to wait for a response.", cxxopts::value<size_t>())
("no-sync", "Disable synchronizing with remote.", cxxopts::value<bool>()->implicit_value("true")->default_value("false"))
("y,yes", "Bypass yes/no prompt for installing or removing packages.")
("y,no-prompt", "Bypass yes/no prompt for installing or removing packages.")
("v,verbose", "Show verbose output.", cxxopts::value<int>()->implicit_value("1")->default_value("0"), "0-5")
;
@ -615,7 +623,8 @@ namespace gdpm::package_manager{
}
if(result.count("add-remote")){
std::string repo = result["remote-add"].as<std::string>();
config.remote_sources.emplace_back(repo);
// config.remote_sources.emplace_back(repo);
config.remote_sources.insert(repo);
}
if(result.count("delete-remote")){
std::string repo = result["remote-add"].as<std::string>();

16
src/version.cpp Normal file
View file

@ -0,0 +1,16 @@
#include "version.hpp"
namespace gdpm::version{
std::string to_string(const version_context& context){
return std::string();
}
version_context to_version(const std::string& version){
version_context v;
return v;
}
}