matter/libmp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

update: add version support to database find, better depend checking for resolve

Browse Source
This commit is contained in:
ngn 2024-07-08 12:49:22 +03:00
parent cb193d0f18
commit 216ca5c9dd
12 changed files with 264 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -13,6 +13,7 @@ To this you will need the following tools and libraries:
- libarchive
- libinih
- gettext
- sqlite3
- gpgme
After installing these dependencies, you should download the latest release.
@ -39,5 +40,5 @@ make examples
```
To run the examples, specify the library path:
```bash
LD_LIBRARY_PATH=./dist ./dist/example_version
LD_LIBRARY_PATH=./dist ./dist/server
```

5
examples/client/remove.c
View File

@ -10,6 +10,8 @@ int main(int argc, char *argv[]) {
lm_pkg_t pkg;
lm_ctx_t ctx;
lm_package_init(&pkg);
if (argc != 2) {
printf("usage: %s <package name>\n", argv[0]);
return ret;
@ -37,7 +39,7 @@ int main(int argc, char *argv[]) {
goto end;
}
if (!lm_ctx_database_find(&ctx, &pkg, argv[1])) {
if (!lm_ctx_database_find(&ctx, &pkg, argv[1], NULL)) {
printf("failed to find package: %s (%d)\n", lm_strerror(), lm_error());
goto end;
}
@ -50,6 +52,7 @@ int main(int argc, char *argv[]) {
ret = EXIT_SUCCESS;
end:
lm_package_free(&pkg);
lm_ctx_free(&ctx);
return ret;
}

2
include/ctx.h
View File

@ -98,6 +98,6 @@ lm_pool_t *lm_ctx_pool_by_url(lm_ctx_t *ctx, char *host, char *path); // find p
######################## */
bool lm_ctx_database_init(lm_ctx_t *ctx); // init ctx database (if not already present)
bool lm_ctx_database_is_installed(lm_ctx_t *ctx, lm_pkg_t *pkg, bool check_version); // check if a package is installed
bool lm_ctx_database_find(lm_ctx_t *ctx, lm_pkg_t *pkg, char *name); // find a package by name
bool lm_ctx_database_find(lm_ctx_t *ctx, lm_pkg_t *pkg, char *name, char *version); // find a package by name
bool lm_ctx_database_foreach(
lm_ctx_t *ctx, lm_ctx_database_callback_t callback, void *data); // loop for each package in the database

27
include/database.h
View File

@ -7,16 +7,17 @@
enum lm_query_index {
QUERY_CREATE_PACKAGE_TABLE = 0,
QUERY_INSERT_PACKAGE_SINGLE = 1,
QUERY_SELECT_PACKAGE_SINGLE = 2,
QUERY_DELETE_PACKAGE_SINGLE = 3,
QUERY_SELECT_PACKAGE_ALL = 4,
QUERY_CREATE_FILE_TABLE = 5,
QUERY_INSERT_FILE_SINGLE = 6,
QUERY_DELETE_FILE_ALL = 7,
QUERY_SELECT_FILE_SINGLE = 8,
QUERY_SELECT_FILE_ALL = 9,
QUERY_UPDATE_FILE_1 = 10,
QUERY_UPDATE_FILE_2 = 11,
QUERY_SELECT_PACKAGE_SINGLE_1 = 2,
QUERY_SELECT_PACKAGE_SINGLE_2 = 3,
QUERY_DELETE_PACKAGE_SINGLE = 4,
QUERY_SELECT_PACKAGE_ALL = 5,
QUERY_CREATE_FILE_TABLE = 6,
QUERY_INSERT_FILE_SINGLE = 7,
QUERY_DELETE_FILE_ALL = 8,
QUERY_SELECT_FILE_SINGLE = 9,
QUERY_SELECT_FILE_ALL = 10,
QUERY_UPDATE_FILE_1 = 11,
QUERY_UPDATE_FILE_2 = 12,
};
enum lm_columns {
@ -26,8 +27,8 @@ enum lm_columns {
FILES_COLUMN_PACKAGE = 4,
PACKAGES_COLUMN_NAME = 1,
PACKAGES_COLUMN_DESC = 2,
PACKAGES_COLUMN_VERSION = 3,
PACKAGES_COLUMN_VERSION = 2,
PACKAGES_COLUMN_DESC = 3,
PACKAGES_COLUMN_SIZE = 4,
PACKAGES_COLUMN_DEPENDS = 5,
};
@ -50,7 +51,7 @@ void lm_database_free(lm_database_t *db);
bool lm_database_step_all(sqlite3_stmt *st);
bool lm_database_package_find(
lm_database_t *db, lm_pkg_t *pkg, char *name); // finds a package by its name, package stored in *pkg
lm_database_t *db, lm_pkg_t *pkg, char *name, char *version); // finds a package by its name, package stored in *pkg
bool lm_database_package_next(lm_database_t *db, lm_pkg_t *pkg); // gets the next package in the database
bool lm_database_package_add(lm_database_t *db, lm_pkg_t *pkg); // adds a package to the database
bool lm_database_package_del(lm_database_t *db, lm_pkg_t *pkg); // delete a package from the database

6
include/error.h
View File

@ -126,6 +126,12 @@ typedef enum lm_error {
LM_ERR_PkgDatabaseDelFail = 119,
LM_ERR_PkgFilesDelFail = 119,
LM_ERR_PkgChangesDelFail = 120,
LM_ERR_InstallCwdFail = 121,
LM_ERR_InstallRootChdirFail = 122,
LM_ERR_InstallSpawnFail = 123,
LM_ERR_InstallBackChdirFail = 124,
LM_ERR_InstallStatusFail = 125,
LM_ERR_InstallScriptFail = 126,
} lm_error_t;
typedef struct lm_error_desc {

27
locale/tr/LC_MESSAGES/libmp.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-07-08 07:22+0300\n"
"POT-Creation-Date: 2024-07-08 12:47+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -529,3 +529,28 @@ msgstr ""
#, c-format
msgid "failed to remove changes file for package: %s"
msgstr ""
#: src/error.c:145
msgid "failed to get current directory for running install"
msgstr ""
#: src/error.c:146
msgid "failed change directory to root for running install"
msgstr ""
#: src/error.c:147
msgid "failed run install spawn command"
msgstr ""
#: src/error.c:149
msgid "failed to change directory to old directory after running install"
msgstr ""
#: src/error.c:150
msgid "install script returned a bad status code"
msgstr ""
#: src/error.c:151
#, c-format
msgid "failed to run the package install script: %s"
msgstr ""

15
src/ctx/database.c
View File

@ -19,22 +19,15 @@ bool lm_ctx_database_init(lm_ctx_t *ctx){
bool lm_ctx_database_is_installed(lm_ctx_t *ctx, lm_pkg_t *pkg, bool check_version){
if(!lm_ctx_database_init(ctx))
return false; // error set by function
lm_pkg_t found;
if(NULL == ctx->db)
return false;
if(!lm_database_package_find(ctx->db, &found, pkg->name))
return false; // error set by function
if(check_version && !eq(found.version, pkg->version))
return false;
return true;
return lm_database_package_find(ctx->db, NULL, pkg->name, check_version ? pkg->version : NULL);
}
bool lm_ctx_database_find(lm_ctx_t *ctx, lm_pkg_t *pkg, char *name){
if(NULL == ctx || NULL == pkg || NULL == name){
bool lm_ctx_database_find(lm_ctx_t *ctx, lm_pkg_t *pkg, char *name, char *version){
if(NULL == ctx || NULL == name){
lm_error_set(LM_ERR_ArgNULL);
return false;
}
@ -43,7 +36,7 @@ bool lm_ctx_database_find(lm_ctx_t *ctx, lm_pkg_t *pkg, char *name){
return false; // error set by function
lm_error_clear();
return lm_database_package_find(ctx->db, pkg, name);
return lm_database_package_find(ctx->db, pkg, name, version);
}
bool lm_ctx_database_foreach(lm_ctx_t *ctx, lm_ctx_database_callback_t callback, void *data){

49
src/ctx/install.c
View File

@ -4,6 +4,8 @@
#include "../../include/util.h"
#include "../../include/ctx.h"
#include <spawn.h>
#include <wait.h>
#include <archive.h>
#include <archive_entry.h>
#include <errno.h>
@ -12,6 +14,45 @@
#include <sys/stat.h>
#include <unistd.h>
bool __lm_ctx_run_install(char *root, char *install_path) {
char *args[] = {"/bin/bash", install_path, NULL}, *oldpwd = NULL;
bool ret = false;
int status = 0;
pid_t pid = 0;
if((oldpwd = getcwd(NULL, 0)) == NULL){
lm_error_set(LM_ERR_InstallCwdFail);
goto end;
}
if(chdir(root) < 0){
lm_error_set(LM_ERR_InstallRootChdirFail);
goto end;
}
if (posix_spawn(&pid, "/bin/bash", NULL, NULL, args, NULL) != 0) {
lm_error_set(LM_ERR_InstallSpawnFail);
goto end;
}
waitpid(pid, &status, 0);
if(chdir(root) < 0){
lm_error_set(LM_ERR_InstallBackChdirFail);
goto end;
}
if(status != 0){
lm_error_set(LM_ERR_InstallStatusFail);
goto end;
}
ret = true;
end:
free(oldpwd);
return ret;
}
bool __lm_ctx_extract_files(lm_ctx_t *ctx, lm_pkg_t *pkg, char *files, lm_ctx_install_callback_t callback, void *data){
struct archive *reader = NULL, *writer = NULL;
struct archive_entry *entry = NULL;
@ -243,7 +284,13 @@ bool lm_ctx_install(lm_ctx_t *ctx, lm_pkg_t *pkg, lm_ctx_install_callback_t call
goto end;
}
// TODO: run install script
if(!__lm_ctx_run_install(ctx->root, install_file)){
char *suberr = lm_strerror_dup();
pdebug(__func__, "failed to run install script: %s", lm_strerror());
lm_error_set(LM_ERR_InstallScriptFail, suberr);
free(suberr);
goto end;
}
ret = true;
end:

11
src/ctx/resolve.c
View File

@ -15,19 +15,20 @@ bool __lm_ctx_resolve(lm_ctx_t *ctx, lm_ctx_resolve_list_t *list, lm_pkg_t *pkg)
goto end;
list->resolving = pkglist_add(list->resolving, pkg);
lm_pkg_t *depend = NULL;
for(int i = 0; pkg->depends[i] != NULL; i++){
// TODO: check if exists in the db before checking pools
lm_pkg_t *depend = lm_ctx_pool_find(ctx, pkg->depends[i], NULL);
// if found then its already installed
if(lm_ctx_database_find(ctx, NULL, pkg->depends[i], NULL))
continue;
depend = lm_ctx_pool_find(ctx, pkg->depends[i], NULL);
if(NULL == depend){
lm_error_set(LM_ERR_DependNotFound, pkg->depends[i], pkg->name);
return false;
}
if(lm_ctx_database_is_installed(ctx, depend, true))
continue;
if(pkglist_contains(list->resolving, depend)){
lm_error_set(LM_ERR_DependNotFound, pkg->depends[i], pkg->name);
return false;

7
src/database/database.c
View File

@ -12,17 +12,20 @@ char *queries[] = {
// QUERY_CREATE_PACKAGE_TABLE
"CREATE TABLE IF NOT EXISTS packages (" \
" name TEXT PRIMARY KEY NOT NULL," \
" desc TEXT NOT NULL," \
" version TEXT NOT NULL," \
" desc TEXT NOT NULL," \
" size INT NOT NULL," \
" depends TEXT NOT NULL);",
// QUERY_INSERT_PACKAGE_SINGLE
"INSERT INTO packages VALUES (?, ?, ?, ?, ?)",
// QUERY_SELECT_PACKAGE_SINGLE
// QUERY_SELECT_PACKAGE_SINGLE_1
"SELECT * FROM packages WHERE name = ?",
// QUERY_SELECT_PACKAGE_SINGLE_2
"SELECT * FROM packages WHERE name = ? AND version = ?",
// QUERY_DELETE_PACKAGE_SINGLE
"DELETE FROM packages WHERE name = ?",

12
src/database/package.c
View File

@ -50,21 +50,29 @@ end:
return ret;
}
bool lm_database_package_find(lm_database_t *db, lm_pkg_t *pkg, char *name){
bool lm_database_package_find(lm_database_t *db, lm_pkg_t *pkg, char *name, char *version){
if(NULL == db || NULL == name){
lm_error_set(LM_ERR_ArgNULL);
return false;
}
bool ret = false;
char *query = NULL;
if(sqlite3_prepare(db->packages_db, queries[QUERY_SELECT_PACKAGE_SINGLE], strlen(queries[QUERY_SELECT_PACKAGE_SINGLE]), &db->packages_st, NULL) != SQLITE_OK){
if(NULL == version)
query = queries[QUERY_SELECT_PACKAGE_SINGLE_1];
else
query = queries[QUERY_SELECT_PACKAGE_SINGLE_2];
if(sqlite3_prepare(db->packages_db, query, strlen(query), &db->packages_st, NULL) != SQLITE_OK){
pdebug(__func__, "failed to prepare statement for finding %s: %s", name, sqlite3_errmsg(db->packages_db));
lm_error_set(LM_ERR_DbSqlPrepareFail);
goto end;
}
sqlite3_bind_text(db->packages_st, PACKAGES_COLUMN_NAME, name, strlen(name), SQLITE_STATIC);
if(NULL != version)
sqlite3_bind_text(db->packages_st, PACKAGES_COLUMN_VERSION, version, strlen(version), SQLITE_STATIC);
if(sqlite3_step(db->packages_st) != SQLITE_ROW){
pdebug(__func__, "got no rows for %s", name);

7
src/error.c
View File

@ -142,6 +142,13 @@ void lm_error_set(lm_error_t code, ...) {
{.code = LM_ERR_PkgDatabaseDelFail, .desc = _("failed to remove package from the database: %s") },
{.code = LM_ERR_PkgFilesDelFail, .desc = _("failed to remove package files from the database: %s") },
{.code = LM_ERR_PkgChangesDelFail, .desc = _("failed to remove changes file for package: %s") },
{.code = LM_ERR_InstallCwdFail, .desc = _("failed to get current directory for running install") },
{.code = LM_ERR_InstallRootChdirFail, .desc = _("failed change directory to root for running install") },
{.code = LM_ERR_InstallSpawnFail, .desc = _("failed run install spawn command") },
{.code = LM_ERR_InstallBackChdirFail,
.desc = _("failed to change directory to old directory after running install") },
{.code = LM_ERR_InstallStatusFail, .desc = _("install script returned a bad status code") },
{.code = LM_ERR_InstallScriptFail, .desc = _("failed to run the package install script: %s") },
};
char *fmt = NULL;