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

update: better colored logging

Browse Source
This commit is contained in:
ngn 2024-07-19 22:57:46 +03:00
parent afb4122f97
commit 44e68414b9
7 changed files with 38 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
locale/tr/LC_MESSAGES/pooler.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-07-19 22:32+0300\n" "POT-Creation-Date: 2024-07-19 22:56+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -242,14 +242,9 @@ msgstr "Havuzları sekronize etmek başarısız oldu: %s"
msgid "Nothing to do (no packages to install)" msgid "Nothing to do (no packages to install)"
msgstr "" msgstr ""
#: src/cmd/install.c:80 src/cmd/remove.c:67 src/cmd/update.c:50 #: src/cmd/install.c:80 src/cmd/install.c:82 src/cmd/remove.c:67
#, c-format #: src/cmd/remove.c:69 src/cmd/update.c:50 src/cmd/update.c:52
msgid "Following %d package will be " msgid "Following "
msgstr ""
#: src/cmd/install.c:82 src/cmd/remove.c:69 src/cmd/update.c:52
#, c-format
msgid "Following %d packages will be "
msgstr "" msgstr ""
#: src/cmd/install.c:88 src/cmd/remove.c:76 #: src/cmd/install.c:88 src/cmd/remove.c:76
@ -264,9 +259,9 @@ msgstr ""
msgid "Operation cancelled" msgid "Operation cancelled"
msgstr "" msgstr ""
#: src/cmd/install.c:96 src/cmd/update.c:69 #: src/cmd/install.c:96 src/cmd/install.c:111 src/cmd/remove.c:85
#, c-format #: src/cmd/update.c:69 src/cmd/update.c:78 src/cmd/update.c:87
msgid "(%d/%d) Downloading " msgid "("
msgstr "" msgstr ""
#: src/cmd/install.c:102 src/cmd/update.c:74 #: src/cmd/install.c:102 src/cmd/update.c:74
@ -274,24 +269,17 @@ msgstr ""
msgid "Failed to download " msgid "Failed to download "
msgstr "Havuzları sekronize etmek başarısız oldu: %s" msgstr "Havuzları sekronize etmek başarısız oldu: %s"
#: src/cmd/install.c:111 src/cmd/update.c:87
#, c-format
msgid "(%d/%d) Installing "
msgstr ""
#: src/cmd/install.c:117 src/cmd/update.c:92 #: src/cmd/install.c:117 src/cmd/update.c:92
#, fuzzy #, fuzzy
msgid "Failed to install " msgid "Failed to install "
msgstr "Havuzları sekronize etmek başarısız oldu: %s" msgstr "Havuzları sekronize etmek başarısız oldu: %s"
#: src/cmd/install.c:123 #: src/cmd/install.c:123
#, c-format msgid "Installed "
msgid "Installed %d package"
msgstr "" msgstr ""
#: src/cmd/install.c:123 #: src/cmd/install.c:123
#, c-format msgid "Installed all of the "
msgid "Installed all of the %d packages"
msgstr "" msgstr ""
#: src/cmd/list.c:27 #: src/cmd/list.c:27
@ -315,24 +303,17 @@ msgstr "Havuzları sekronize etmek başarısız oldu: %s"
msgid "Nothing to do (no packages to remove)" msgid "Nothing to do (no packages to remove)"
msgstr "" msgstr ""
#: src/cmd/remove.c:85 src/cmd/update.c:78
#, c-format
msgid "(%d/%d) Removing "
msgstr ""
#: src/cmd/remove.c:91 src/cmd/update.c:83 #: src/cmd/remove.c:91 src/cmd/update.c:83
#, fuzzy #, fuzzy
msgid "Failed to remove " msgid "Failed to remove "
msgstr "Havuzları sekronize etmek başarısız oldu: %s" msgstr "Havuzları sekronize etmek başarısız oldu: %s"
#: src/cmd/remove.c:97 #: src/cmd/remove.c:97
#, c-format msgid "Removed "
msgid "Removed %d package"
msgstr "" msgstr ""
#: src/cmd/remove.c:97 #: src/cmd/remove.c:97
#, c-format msgid "Removed all of the "
msgid "Removed all of the %d packages"
msgstr "" msgstr ""
#: src/cmd/sync.c:19 #: src/cmd/sync.c:19

16
src/cmd/install.c
View File

@ -56,7 +56,7 @@ bool cmd_install(lm_ctx_t *ctx, config_t *config, args_t *args){
} }
if(lm_ctx_database_is_installed(ctx, pkg, true)){ if(lm_ctx_database_is_installed(ctx, pkg, true)){
error(_("Package "FG_BOLD"%s"FG_RESET" ("FG_BLUE"%s"FG_RESET") is already installed"), name, pkg->version); error(_("Package "FG_BOLD"%s"FG_RESET"_"FG_GREEN"%s"FG_RESET" is already installed"), name, pkg->version);
goto end; goto end;
} }
@ -77,9 +77,9 @@ bool cmd_install(lm_ctx_t *ctx, config_t *config, args_t *args){
size_to_human(ssize, size); size_to_human(ssize, size);
if(list->count == 1) if(list->count == 1)
info(_("Following %d package will be "FG_BOLD"INSTALLED:"FG_RESET), list->count); info(_("Following "FG_BOLD"%d"FG_RESET" package will be "FG_BOLD"INSTALLED:"FG_RESET), list->count);
else else
info(_("Following %d packages will be "FG_BOLD"INSTALLED:"FG_RESET), list->count); info(_("Following "FG_BOLD"%d"FG_RESET" packages will be "FG_BOLD"INSTALLED:"FG_RESET), list->count);
while((pkg = lm_ctx_resolve_next(list)) != NULL) while((pkg = lm_ctx_resolve_next(list)) != NULL)
package_list(pkg, &save, 0); package_list(pkg, &save, 0);
@ -93,13 +93,13 @@ bool cmd_install(lm_ctx_t *ctx, config_t *config, args_t *args){
// download resolved packages // download resolved packages
while((pkg = lm_ctx_resolve_next(list)) != NULL){ while((pkg = lm_ctx_resolve_next(list)) != NULL){
info(_("(%d/%d) Downloading "FG_BOLD"%s"FG_RESET" ("FG_BOLD FG_BLUE"%s"FG_RESET")"), ++current, list->count, pkg->name, pkg->version); info(_("("FG_BOLD"%d"FG_RESET"/"FG_BOLD"%d"FG_RESET") Downloading "FG_BOLD"%s"FG_RESET"_"FG_BOLD FG_GREEN"%s"), ++current, list->count, pkg->name, pkg->version);
r = lm_ctx_download(ctx, pkg, cmd_download_callback, NULL); r = lm_ctx_download(ctx, pkg, cmd_download_callback, NULL);
bar_free(); bar_free();
if(!r){ if(!r){
error(_("Failed to download "FG_BOLD"%s"FG_RESET": %s"), pkg->name, lm_strerror()); error(_("Failed to download "FG_BOLD"%s"FG_RESET"_"FG_BOLD FG_GREEN"%s"FG_RESET": %s"), pkg->name, pkg->version, lm_strerror());
goto end; goto end;
} }
} }
@ -108,19 +108,19 @@ bool cmd_install(lm_ctx_t *ctx, config_t *config, args_t *args){
// install resolved packages // install resolved packages
while((pkg = lm_ctx_resolve_next(list)) != NULL){ while((pkg = lm_ctx_resolve_next(list)) != NULL){
info(_("(%d/%d) Installing "FG_BOLD"%s"FG_RESET" ("FG_BOLD FG_BLUE"%s"FG_RESET")"), ++current, list->count, pkg->name, pkg->version); info(_("("FG_BOLD"%d"FG_RESET"/"FG_BOLD"%d"FG_RESET") Installing "FG_BOLD"%s"FG_RESET"_"FG_BOLD FG_GREEN"%s"), ++current, list->count, pkg->name, pkg->version);
r = lm_ctx_install(ctx, pkg, cmd_install_callback, NULL); r = lm_ctx_install(ctx, pkg, cmd_install_callback, NULL);
bar_free(); bar_free();
if(!r){ if(!r){
error(_("Failed to install "FG_BOLD"%s"FG_RESET": %s"), pkg->name, lm_strerror()); error(_("Failed to install "FG_BOLD"%s"FG_RESET"_"FG_BOLD FG_GREEN"%s"FG_RESET": %s"), pkg->name, pkg->version, lm_strerror());
goto end; goto end;
} }
} }
if(current == list->count){ if(current == list->count){
success(list->count == 1 ? _("Installed %d package") : _("Installed all of the %d packages"), list->count); success(list->count == 1 ? _("Installed "FG_BOLD"%d"FG_RESET" package") : _("Installed all of the "FG_BOLD"%d"FG_RESET" packages"), list->count);
ret = true; ret = true;
} }

4
src/cmd/list.c
View File

@ -41,9 +41,9 @@ bool cmd_list(lm_ctx_t *ctx, config_t *config, args_t *args){
} }
if(args_get_bool(args, "desc")) if(args_get_bool(args, "desc"))
printf(FG_BOLD"%s"FG_RESET" ("FG_BOLD FG_BLUE"%s"FG_RESET"): %s\n", pkg.name, pkg.version, pkg.desc); printf(FG_BOLD"%s"FG_RESET"_"FG_BOLD FG_GREEN"%s"FG_RESET": %s\n", pkg.name, pkg.version, pkg.desc);
else else
printf(FG_BOLD"%s"FG_RESET" ("FG_BOLD FG_BLUE"%s"FG_RESET")\n", pkg.name, pkg.version); printf(FG_BOLD"%s"FG_RESET"_"FG_BOLD FG_GREEN"%s"FG_RESET"\n", pkg.name, pkg.version);
} }
lm_ctx_database_next_free(ctx, &pkg); lm_ctx_database_next_free(ctx, &pkg);

12
src/cmd/remove.c
View File

@ -49,7 +49,7 @@ bool cmd_remove(lm_ctx_t *ctx, config_t *config, args_t *args){
} }
if(!lm_ctx_removeable(ctx, &pkgs[count-1])){ if(!lm_ctx_removeable(ctx, &pkgs[count-1])){
error(_("Cannot remove "FG_BOLD"%s"FG_RESET" ("FG_BOLD FG_BLUE"%s"FG_RESET"): %s"), pkgs[count-1].name, pkgs[count-1].version, lm_strerror()); error(_("Cannot remove "FG_BOLD"%s"FG_RESET"_"FG_BOLD FG_GREEN"%s"FG_RESET": %s"), pkgs[count-1].name, pkgs[count-1].version, lm_strerror());
goto end; goto end;
} }
@ -64,9 +64,9 @@ bool cmd_remove(lm_ctx_t *ctx, config_t *config, args_t *args){
size_to_human(ssize, size); size_to_human(ssize, size);
if(count == 1) if(count == 1)
info(_("Following %d package will be "FG_BOLD"REMOVED:"FG_RESET), count); info(_("Following "FG_BOLD"%d"FG_RESET" package will be "FG_BOLD"REMOVED:"FG_RESET), count);
else else
info(_("Following %d packages will be "FG_BOLD"REMOVED:"FG_RESET), count); info(_("Following "FG_BOLD"%d"FG_RESET" packages will be "FG_BOLD"REMOVED:"FG_RESET), count);
// list all the packages // list all the packages
for(int i = 0; i < count; i++) for(int i = 0; i < count; i++)
@ -82,19 +82,19 @@ bool cmd_remove(lm_ctx_t *ctx, config_t *config, args_t *args){
for(int i = 0; i < count; i++){ for(int i = 0; i < count; i++){
lm_pkg_t *cur = &pkgs[i]; lm_pkg_t *cur = &pkgs[i];
info(_("(%d/%d) Removing "FG_BOLD"%s"FG_RESET" ("FG_BOLD FG_BLUE"%s"FG_RESET")"), ++current, count, cur->name, cur->version); info(_("("FG_BOLD"%d"FG_RESET"/"FG_BOLD"%d"FG_RESET") Removing "FG_BOLD"%s"FG_RESET"_"FG_BOLD FG_GREEN"%s"FG_RESET), ++current, count, cur->name, cur->version);
r = lm_ctx_remove(ctx, cur, cmd_remove_callback, NULL); r = lm_ctx_remove(ctx, cur, cmd_remove_callback, NULL);
bar_free(); bar_free();
if(!r){ if(!r){
error(_("Failed to remove "FG_BOLD"%s"FG_RESET": %s"), cur->name, lm_strerror()); error(_("Failed to remove "FG_BOLD"%s"FG_RESET"_"FG_BOLD FG_GREEN"%s"FG_RESET": %s"), cur->name, cur->version, lm_strerror());
goto end; goto end;
} }
} }
if(current == count){ if(current == count){
success(count == 1 ? _("Removed %d package") : _("Removed all of the %d packages"), count); success(count == 1 ? _("Removed "FG_BOLD"%d"FG_RESET" package") : _("Removed all of the "FG_BOLD"%d"FG_RESET" packages"), count);
ret = true; ret = true;
} }

2
src/cmd/sync.c
View File

@ -55,7 +55,7 @@ bool cmd_sync(lm_ctx_t *ctx, config_t *config, args_t *args){
goto end; goto end;
} }
info(_("Synced "FG_BOLD"%d/%d"FG_RESET" pools"), sycned, config->pool_count); info(_("Synced "FG_BOLD"%d"FG_RESET"/"FG_BOLD"%d"FG_RESET" pools"), sycned, config->pool_count);
ret = true; ret = true;
end: end:

18
src/cmd/update.c
View File

@ -47,9 +47,9 @@ bool cmd_update(lm_ctx_t *ctx, config_t *config, args_t *args){
} }
if(list->count == 1) if(list->count == 1)
info(_("Following %d package will be "FG_BOLD"UPDATED:"FG_RESET), list->count); info(_("Following "FG_BOLD"%d"FG_RESET" package will be "FG_BOLD"UPDATED:"FG_RESET), list->count);
else else
info(_("Following %d packages will be "FG_BOLD"UPDATED:"FG_RESET), list->count); info(_("Following "FG_BOLD"%d"FG_RESET" packages will be "FG_BOLD"UPDATED:"FG_RESET), list->count);
while((old = lm_ctx_update_list_next(list)) != NULL) while((old = lm_ctx_update_list_next(list)) != NULL)
package_list(old, &save, 0); package_list(old, &save, 0);
@ -62,34 +62,34 @@ bool cmd_update(lm_ctx_t *ctx, config_t *config, args_t *args){
while((old = lm_ctx_update_list_next(list)) != NULL){ while((old = lm_ctx_update_list_next(list)) != NULL){
if((new = lm_ctx_update(ctx, old)) == NULL){ if((new = lm_ctx_update(ctx, old)) == NULL){
error(_("Failed to update "FG_BOLD"%s"FG_RESET": %s"), old->name, lm_strerror()); error(_("Failed to update "FG_BOLD"%s"FG_RESET"_"FG_BOLD FG_GREEN"%s"FG_RESET": %s"), old->name, old->version, lm_strerror());
goto end; goto end;
} }
info(_("(%d/%d) Downloading "FG_BOLD"%s"FG_RESET" ("FG_BOLD FG_BLUE"%s"FG_RESET")"), ++current, list->count, new->name, new->version); info(_("("FG_BOLD"%d"FG_RESET"/"FG_BOLD"%d"FG_RESET") Downloading "FG_BOLD"%s"FG_RESET"_"FG_BOLD FG_GREEN"%s"), ++current, list->count, new->name, new->version);
r = lm_ctx_download(ctx, new, cmd_update_download_callback, NULL); r = lm_ctx_download(ctx, new, cmd_update_download_callback, NULL);
bar_free(); bar_free();
if(!r){ if(!r){
error(_("Failed to download "FG_BOLD"%s"FG_RESET" ("FG_BOLD FG_BLUE"%s"FG_RESET"): %s"), new->name, new->version, lm_strerror()); error(_("Failed to download "FG_BOLD"%s"FG_RESET"_"FG_BOLD FG_GREEN"%s"FG_RESET": %s"), new->name, new->version, lm_strerror());
goto end; goto end;
} }
info(_("(%d/%d) Removing "FG_BOLD"%s"FG_RESET" ("FG_BOLD FG_BLUE"%s"FG_RESET")"), current, list->count, old->name, old->version); info(_("("FG_BOLD"%d"FG_RESET"/"FG_BOLD"%d"FG_RESET") Removing "FG_BOLD"%s"FG_RESET"_"FG_BOLD FG_GREEN"%s"), current, list->count, old->name, old->version);
r = lm_ctx_remove(ctx, old, cmd_update_callback, NULL); r = lm_ctx_remove(ctx, old, cmd_update_callback, NULL);
bar_free(); bar_free();
if(!r){ if(!r){
error(_("Failed to remove "FG_BOLD"%s"FG_RESET" ("FG_BOLD FG_BLUE"%s"FG_RESET"): %s"), old->name, old->version, lm_strerror()); error(_("Failed to remove "FG_BOLD"%s"FG_RESET"_"FG_BOLD FG_GREEN"%s"FG_RESET": %s"), old->name, old->version, lm_strerror());
goto end; goto end;
} }
info(_("(%d/%d) Installing "FG_BOLD"%s"FG_RESET" ("FG_BOLD FG_BLUE"%s"FG_RESET")"), current, list->count, new->name, new->version); info(_("("FG_BOLD"%d"FG_RESET"/"FG_BOLD"%d"FG_RESET") Installing "FG_BOLD"%s"FG_RESET"_"FG_BOLD FG_GREEN"%s"), current, list->count, new->name, new->version);
r = lm_ctx_install(ctx, new, cmd_update_callback, NULL); r = lm_ctx_install(ctx, new, cmd_update_callback, NULL);
bar_free(); bar_free();
if(!r){ if(!r){
error(_("Failed to install "FG_BOLD"%s"FG_RESET" ("FG_BOLD FG_BLUE"%s"FG_RESET"): %s"), new->name, new->version, lm_strerror()); error(_("Failed to install "FG_BOLD"%s"FG_RESET"_"FG_BOLD FG_GREEN"%s"FG_RESET": %s"), new->name, new->version, lm_strerror());
goto end; goto end;
} }
} }

2
src/log.c
View File

@ -39,7 +39,7 @@ void package_list(lm_pkg_t *pkg, ssize_t *save, ssize_t max) {
} }
end: end:
printf(FG_BOLD "%s " FG_BLUE "%s" FG_RESET, pkg->name, pkg->version); printf(FG_BOLD "%s" FG_RESET "_" FG_BOLD FG_GREEN "%s", pkg->name, pkg->version);
printf(" "); printf(" ");
} }