From 2d8ac6280f95d982f3ea0d602dc287b37ad6a113 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sun, 20 Oct 2024 09:03:05 +0000 Subject: [PATCH] fixed --- config.h | 2 - include/structs.h | 3 +- kfetch | Bin 20200 -> 0 bytes src/fetch.c | 40 ++++++++++++------- src/main.c | 89 +++++++++++++++++++++++++++++------------- themes/8nl.h | 26 ++++++++++++ themes/default.h | 2 - themes/mini_wttr.in.h | 2 - themes/mnnwvn.h | 3 -- 9 files changed, 116 insertions(+), 51 deletions(-) delete mode 100755 kfetch create mode 100644 themes/8nl.h diff --git a/config.h b/config.h index 26d2d7f..d3990c4 100644 --- a/config.h +++ b/config.h @@ -9,8 +9,6 @@ #define FONT_COLOR "\033[1;37m" #ifdef _MAIN_C -#define ON_ERROR_STR "none" - PARAMETR CONFIG[] = { {PrintOs, {.str0=" os ", .str1=NULL}}, {GetKernel, {.str0=" kr ", .str1=NULL}}, diff --git a/include/structs.h b/include/structs.h index 992cc68..1b42524 100644 --- a/include/structs.h +++ b/include/structs.h @@ -9,7 +9,8 @@ typedef struct { struct utsname uts; char *pkg_cmd; - char *color; + char *logo_color; + char *font_color; size_t logo_size; char **logo; diff --git a/kfetch b/kfetch deleted file mode 100755 index 500d856e6fef73569cb5b819d03a51e377a50772..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20200 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 = pkg_cmd; - fetch->color = color; + fetch->logo_color = color; } void GetArt(FETCH *fetch, int flag) { @@ -98,12 +110,12 @@ void GetArt(FETCH *fetch, int flag) { } int GetKernel(struct par par, const FETCH fetch) { - printf("%s%s", FONT_COLOR, fetch.uts.release); + printf("%s%s", fetch.font_color, fetch.uts.release); return 0; } int PrintOs(struct par par, const FETCH fetch) { - printf("%s%s", FONT_COLOR, fetch.os_name); + printf("%s%s", fetch.font_color, fetch.os_name); return 0; } @@ -118,7 +130,7 @@ int GetUser(struct par par, const FETCH fetch) { if (pw == 0) return 1; - printf("%s%s", FONT_COLOR, pw->pw_name); + printf("%s%s", fetch.font_color, pw->pw_name); return 0; } @@ -133,10 +145,10 @@ int GetUptime(struct par par, const FETCH fetch) { int mins = (uptime.tv_sec / 60) - (uptime.tv_sec / 3600 * 60); if (days > 0) - printf("%s%d days", FONT_COLOR, days); + printf("%s%d days", fetch.font_color, days); else - printf("%s%dh %dm", FONT_COLOR, hours, mins); + printf("%s%dh %dm", fetch.font_color, hours, mins); return 0; #endif @@ -145,7 +157,7 @@ int GetUptime(struct par par, const FETCH fetch) { } int GetArch(struct par par, const FETCH fetch) { - printf("%s%s", FONT_COLOR, fetch.uts.machine); + printf("%s%s", fetch.font_color, fetch.uts.machine); return 0; } @@ -158,7 +170,7 @@ int GetShell(struct par par, const FETCH fetch) { if (splt == NULL) return 1; - printf("%s%s", FONT_COLOR, splt + 1); + printf("%s%s", fetch.font_color, splt + 1); return 0; } @@ -170,7 +182,7 @@ int GetPkg(struct par par, const FETCH fetch) { if (fp == NULL) return 1; - printf("%s", FONT_COLOR); + printf("%s", fetch.font_color); int ch; while ((ch = getc(fp))) { @@ -195,7 +207,7 @@ int GetMem(struct par par, const FETCH fetch) { fclose(fp); - printf("%s%lumb / %lumb", FONT_COLOR, (uintmax_t)(total - (cached + free + buffer)) / 1024, (uintmax_t)total / 1024); + printf("%s%lumb / %lumb", fetch.font_color, (uintmax_t)(total - (cached + free + buffer)) / 1024, (uintmax_t)total / 1024); return 0; } @@ -219,7 +231,7 @@ int GetModel(struct par par, const FETCH fetch) { if (ptr != NULL) *ptr = '\0'; - printf("%s%s", FONT_COLOR, model_buffer); + printf("%s%s", fetch.font_color, model_buffer); } fclose(fp); @@ -231,7 +243,7 @@ int GetHostname(struct par par, const FETCH fetch) { if (gethostname(hostname, sizeof(hostname)) < 0) return 1; - printf("%s%s", FONT_COLOR, hostname); + printf("%s%s", fetch.font_color, hostname); return 0; } @@ -242,7 +254,7 @@ int GetAVG(struct par par, const FETCH fetch) { if (getloadavg(avg, sizeof(avg) / sizeof(avg[0])) < 0) return 1; - printf("%s%.2f %.2f %.2f", FONT_COLOR, avg[0], avg[1], avg[2]); + printf("%s%.2f %.2f %.2f", fetch.font_color, avg[0], avg[1], avg[2]); return 0; @@ -260,7 +272,7 @@ int Execute(struct par par, const FETCH fetch) { if (fp == NULL) return 1; - printf("%s", FONT_COLOR); + printf("%s", fetch.font_color); int c; while ((c = getc(fp))) { diff --git a/src/main.c b/src/main.c index cade278..a4c23aa 100644 --- a/src/main.c +++ b/src/main.c @@ -2,36 +2,71 @@ #include #include #include +#include +#include #include "structs.h" #include "config.h" -int main(int argc, char **argv) { +#ifdef ERROR_STR + char *error_str = ERROR_STR; +#else + char *error_str = "none"; +#endif + + +#ifdef STRIP_RESET_ESCAPE + char *reset = ""; +#else + char *reset = "\033[0m"; +#endif + + +#ifdef DONT_PRINT_LOGO + char l_flag = 1; +#else char l_flag = 0; - char *d_flag = NULL; +#endif - int opt; - while ((opt = getopt(argc, argv, "hld:")) != -1) { - switch (opt) { - case 'l': - l_flag = 1; - break; +void print_unescape(char newline, char *str) { +#ifdef STRIP_LOGO_ESCAPES + size_t len = strlen(str); - case 'd': - d_flag = optarg; - break; + char *str2 = malloc(len); + if (str2 == NULL) { + fprintf(stderr, "kfetch: malloc: %s\n", strerror(errno)); + exit(1); + } - case 'h': - default: - printf("kfetch [-hld]\n\t-h Help\n\t-l Dont print logo\n\t-d STR Set STR as distro name\n"); - return 0; + size_t j = 0; + for (size_t i = 0; i < len; i++) { + if (str[i] == '\033') { + while (str[i] != 'm') { + if (i > len) { + fputs("kfetch: wrong logo string\n", stderr); + exit(1); + } + + i++; + } + + continue; } + + str2[j] = str[i]; + j++; } + str2[j] = '\0'; + printf("%s%c", str2, newline); + + free(str2); +#else + printf("%s%c", str, newline); +#endif +} + +int main(int argc, char **argv) { FETCH fetch = Init(); - if (d_flag != NULL) { - snprintf(fetch.os_name, sizeof(fetch.os_name), "%s", d_flag); - GetArt(&fetch, 0); - } size_t j = 0; for (size_t i = 0; i < sizeof(CONFIG) / sizeof(PARAMETR); i++) { @@ -40,29 +75,29 @@ int main(int argc, char **argv) { /* Print ascii logo */ if (j < fetch.logo_size && !l_flag) - printf("%s", fetch.logo[j]); + print_unescape('\0', fetch.logo[j]); else if (j >= fetch.logo_size && !l_flag) - printf("%s", fetch.logo[fetch.logo_size - 1]); + print_unescape('\0', fetch.logo[fetch.logo_size - 1]); /* Function exec */ - printf("%s%s", fetch.color, CONFIG[i].par.str0); + printf("%s%s", fetch.logo_color, CONFIG[i].par.str0); if (CONFIG[i].func(CONFIG[i].par, fetch)) - printf("%s%s", FONT_COLOR, ON_ERROR_STR); + printf("%s%s", fetch.font_color, error_str); else { if (CONFIG[i].par.str1 != NULL) - printf(CONFIG[i].par.str1, fetch.color); + printf(CONFIG[i].par.str1, fetch.font_color); } j++; - printf("\033[0m\n"); + printf("%s\n", reset); } for (; j < fetch.logo_size - 1; j++) if (!l_flag) - printf("%s\n", fetch.logo[j]); + print_unescape('\n', fetch.logo[j]); - printf("\033[0m"); + printf("%s", reset); return 0; } diff --git a/themes/8nl.h b/themes/8nl.h new file mode 100644 index 0000000..709e09f --- /dev/null +++ b/themes/8nl.h @@ -0,0 +1,26 @@ +#ifndef _CONFIG_H +#define _CONFIG_H + +#include "fetch.h" +#include "structs.h" + +#define STRIP_RESET_ESCAPE +#define STRIP_LOGO_ESCAPES +#define FONT_COLOR "" +#define LOGO_COLOR "" + +#ifdef _MAIN_C +PARAMETR CONFIG[] = { + {PrintOs, {.str0=" Os : ", .str1=NULL}}, + {GetMem, {.str0=" Mem : ", .str1=NULL}}, + {GetModel, {.str0=" Host : ", .str1=NULL}}, + {GetUptime, {.str0=" Uptime : ", .str1=NULL}}, + + {Blank, {.str0=" ", .str1=NULL}}, + {GetUser, {.str0=" ", .str1=",%s Hi!"}}, + {Execute, {.str0=" Outside: ", .str2="wget https://wttr.in/?format=\"%t+%C\" -qO-"}}, + {Execute, {.str0=" Playing: ", .str2="basename \"$(mocp -Q \"%file\")\""}} +}; +#endif + +#endif diff --git a/themes/default.h b/themes/default.h index 26d2d7f..d3990c4 100644 --- a/themes/default.h +++ b/themes/default.h @@ -9,8 +9,6 @@ #define FONT_COLOR "\033[1;37m" #ifdef _MAIN_C -#define ON_ERROR_STR "none" - PARAMETR CONFIG[] = { {PrintOs, {.str0=" os ", .str1=NULL}}, {GetKernel, {.str0=" kr ", .str1=NULL}}, diff --git a/themes/mini_wttr.in.h b/themes/mini_wttr.in.h index 69b2629..1962df4 100644 --- a/themes/mini_wttr.in.h +++ b/themes/mini_wttr.in.h @@ -8,8 +8,6 @@ #define FONT_COLOR "\033[1;37m" #ifdef _MAIN_C -#define ON_ERROR_STR "none" - PARAMETR CONFIG[] = { {PrintOs, {.str0=" Os : ", .str1=NULL}}, {GetMem, {.str0=" Mem : ", .str1=NULL}}, diff --git a/themes/mnnwvn.h b/themes/mnnwvn.h index 7a6db58..6423a6a 100644 --- a/themes/mnnwvn.h +++ b/themes/mnnwvn.h @@ -11,9 +11,6 @@ #define BORDER "-------------------" #define STR1 "\033[1;37m Somechars" #define STR2 "\033[1;37m Somechars x2" - -#define ON_ERROR_STR "none" - PARAMETR CONFIG[] = { {Blank, {.str0=STR1, .str1=NULL}}, {Blank, {.str0=BORDER, .str1=NULL}},