From c802f4041f8e5c8cf896cd37e0006850ef328f93 Mon Sep 17 00:00:00 2001 From: TheDarkBug Date: Sun, 18 Apr 2021 23:51:32 +0200 Subject: [PATCH] Added .prettierignore to avoid removing tabs in man page. --- .prettierignore | 1 + Makefile | 8 ++-- README.md | 2 + uwufetch.c | 101 +++++++++++++++++++++++++++--------------------- uwufetch_man.md | 98 +++++++++++++++++++++++++--------------------- 5 files changed, 117 insertions(+), 93 deletions(-) create mode 100644 .prettierignore diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000..eef9a99 --- /dev/null +++ b/.prettierignore @@ -0,0 +1 @@ +uwufetch_man.md \ No newline at end of file diff --git a/Makefile b/Makefile index 7fd13db..c90a1f1 100644 --- a/Makefile +++ b/Makefile @@ -2,18 +2,19 @@ NAME = uwufetch FILES = uwufetch.c CFLAGS = -O3 CFLAGS_DEBUG = -Wall -Wextra +LIBS = -ljson-c PREFIX = /usr/bin CC = cc MAN_COMPILER = pandoc build: $(FILES) - $(CC) $(CFLAGS) -o $(NAME) $(FILES) + $(CC) $(CFLAGS) $(LIBS) -o $(NAME) $(FILES) $(MAN_COMPILER) $(NAME)_man.md -st man -o $(NAME).1 @gzip $(NAME).1 debug: @clear - $(CC) $(CFLAGS_DEBUG) -o $(NAME) $(FILES) + $(CC) $(CFLAGS_DEBUG) $(LIBS) -o $(NAME) $(FILES) ./uwufetch install: @@ -36,6 +37,7 @@ termux_uninstall: rm -rf $(DESTDIR)/data/data/com.termux/files$(PREFIX)/$(NAME) rm -rf $(DESTDIR)/data/data/com.termux/files/usr/lib/uwufetch/ -man_debug: build +man_debug: + $(MAN_COMPILER) $(NAME)_man.md -st man -o $(NAME).1 @clear @man -P cat ./uwufetch.1 diff --git a/README.md b/README.md index f3d95ca..cb25a7b 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,8 @@ endeavOwO, KDE NeOwOn, nixOwOs, Swackwawe, sOwOlus; Plus FweeBSD, OwOpenBSD and [lshw](https://github.com/lyonel/lshw) to get gpu info. +[json-c](https://github.com/json-c/json-c) to parse the json config. + ##### Via package manager Right now, the package is only available on the AUR: diff --git a/uwufetch.c b/uwufetch.c index 0d17b63..b14a40e 100644 --- a/uwufetch.c +++ b/uwufetch.c @@ -19,6 +19,7 @@ #include #include #include +#include #ifdef __APPLE__ #include #include @@ -68,14 +69,11 @@ struct utsname sys_var; struct sysinfo sys; #endif struct winsize win; -int ram_total, ram_used = 0; // initialise the variables to store data, gpu array can hold up to 8 gpus -int pkgs, target_width = 0; +int target_width = 0, screen_width = 0, screen_height = 0, ram_total, ram_used = 0, pkgs = 0; long uptime = 0; // all flags available int ascii_image_flag = 0, - screen_width = 0, - screen_height = 0, show_user_info = 1, show_os = 1, show_kernel = 1, @@ -93,6 +91,7 @@ char user[32], host[256], shell[64], kernel[256], version_name[64], cpu_model[25 // functions definitions, to use them in main() int pkgman(); +void parse_json(); void parse_config(); void get_info(); void list(); @@ -147,7 +146,7 @@ int main(int argc, char *argv[]) break; } } - parse_config(); + parse_json(); if ((argc == 1 && ascii_image_flag == 0) || (argc > 1 && ascii_image_flag == 0)) print_ascii(); else if (ascii_image_flag) @@ -156,49 +155,59 @@ int main(int argc, char *argv[]) print_info(); } -void parse_config() -{ - char line[256]; +void parse_json() +{ // using json-c library to parse the config + // allocating all necessary variables + char buffer[1024]; char *homedir = getenv("HOME"); - char *temp_buffer = ""; - FILE *config; + config_directory = "./test.json"; + struct json_object *parsed_json, *distributon, *image, *ascii, *user, *os, *kernel, *cpu, *gpu, *ram, *resolution, *shell, *pkgs, *uptime, *colors; + // opening and reading the config file + FILE *config; if (config_directory == NULL) config = fopen(strcat(homedir, "/.config/uwufetch/config"), "r"); else config = fopen(config_directory, "r"); if (config == NULL) return; - while (fgets(line, sizeof(line), config)) - { - if (line[0] == '#') - continue; - if (strlen(image_name) < 1 && ascii_image_flag == 0) - ascii_image_flag = sscanf(line, "image=%s", image_name); - sscanf(line, "distro=%s", version_name); - if (sscanf(line, "nouser%s", temp_buffer)) - show_user_info = 0; - if (sscanf(line, "noos%s", temp_buffer)) - show_os = 0; - if (sscanf(line, "nokernel%s", temp_buffer)) - show_kernel = 0; - if (sscanf(line, "nocpu%s", temp_buffer)) - show_cpu = 0; - if (sscanf(line, "nogpu%s", temp_buffer)) - show_gpu = 0; - if (sscanf(line, "noram%s", temp_buffer)) - show_ram = 0; - if (sscanf(line, "noresolution%s", temp_buffer)) - show_resolution = 0; - if (sscanf(line, "noshell%s", temp_buffer)) - show_shell = 0; - if (sscanf(line, "nopkgs%s", temp_buffer)) - show_pkgs = 0; - if (sscanf(line, "nouptime%s", temp_buffer)) - show_uptime = 0; - if (sscanf(line, "nocolors%s", temp_buffer)) - show_colors = 0; - } + fread(buffer, 1024, 1, config); + fclose(config); + + // parsing json data + parsed_json = json_tokener_parse(buffer); + json_object_object_get_ex(parsed_json, "distribution", &distributon); + json_object_object_get_ex(parsed_json, "image", &image); + json_object_object_get_ex(parsed_json, "ascii", &ascii); + json_object_object_get_ex(parsed_json, "user", &user); + json_object_object_get_ex(parsed_json, "os", &os); + json_object_object_get_ex(parsed_json, "kernel", &kernel); + json_object_object_get_ex(parsed_json, "cpu", &cpu); + json_object_object_get_ex(parsed_json, "gpu", &gpu); + json_object_object_get_ex(parsed_json, "ram", &ram); + json_object_object_get_ex(parsed_json, "resolution", &resolution); + json_object_object_get_ex(parsed_json, "shell", &shell); + json_object_object_get_ex(parsed_json, "pkgs", &pkgs); + json_object_object_get_ex(parsed_json, "uptime", &uptime); + json_object_object_get_ex(parsed_json, "colors", &colors); + + sprintf(version_name, "%s", json_object_get_string(distributon)); + if (sprintf(image_name, "%s", json_object_get_string(image)) == 0) + ascii_image_flag = 1; + else // reset image_name var to avoid errors + sprintf(image_name, ""); + ascii_image_flag = !json_object_get_boolean(ascii); + show_user_info = json_object_get_boolean(user); + show_os = json_object_get_boolean(os); + show_kernel = json_object_get_boolean(kernel); + show_cpu = json_object_get_boolean(cpu); + show_gpu = json_object_get_boolean(gpu); + show_ram = json_object_get_boolean(ram); + show_resolution = json_object_get_boolean(resolution); + show_shell = json_object_get_boolean(shell); + show_pkgs = json_object_get_boolean(pkgs); + show_uptime = json_object_get_boolean(uptime); + show_colors = json_object_get_boolean(colors); } int pkgman() @@ -294,17 +303,19 @@ void print_info() printf("\033[18C%s%sPKGS %s%s%d %s\n", NORMAL, BOLD, NORMAL, NORMAL, pkgs, pkgman_name); if (show_uptime) - #ifdef __APPLE__ - uptime = uptime_mac(); - #else - uptime = sys.uptime; - #endif + { +#ifdef __APPLE__ + uptime = uptime_mac(); +#else + uptime = sys.uptime; +#endif if (uptime / 3600 < 24) printf("\033[18C%s%sUWUPTIME %s%lih, %lim\n", NORMAL, BOLD, NORMAL, uptime / 3600, uptime / 60 % 60); else printf("\033[18C%s%sUWUPTIME %s%lid, %lih, %lim\n", NORMAL, BOLD, NORMAL, uptime / 86400, uptime / 3600 % 24, uptime / 60 % 60); + } if (show_colors) printf("\033[18C%s%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\u2587\u2587%s\n", BOLD, BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE, NORMAL); diff --git a/uwufetch_man.md b/uwufetch_man.md index 7d689f7..81420d5 100644 --- a/uwufetch_man.md +++ b/uwufetch_man.md @@ -41,51 +41,57 @@ prints a list of all supported distributions The config file is located in $HOME/.config/uwufetch/config (you need to create it), but you can change the path by using the `--config` option. -## OPTIONS +## EXAMPLE +```json +{ + "distribution": "debian", + "image": "/home/user/Pictures/debian.png", + "ascii": false, + "user": true, + "os": true, + "kernel": true, + "cpu": true, + "gpu": true, + "ram": true, + "resolution": true, + "shell": true, + "pkgs": true, + "uptime": true, + "colors": true +} +``` -distribution=name\ \ \ \ \ # use it to change displayed distribution\ -image=/path/to/image\ \ \ # enable images (leave blank), or use custom image path\ -nouser\ \ \ \ \ \ \ \ \ \ \ # disable username and hostname\ -noos\ \ \ \ \ \ \ \ \ \ \ # disable os\ -nokernel\ \ \ \ \ \ \ \ \ # disable kernel\ -nocpu\ \ \ \ \ \ \ \ \ \ \ # disable cpu\ -nogpu\ \ \ \ \ \ \ \ \ \ \ # disable gpu\ -noram\ \ \ \ \ \ \ \ \ \ \ # disable ram\ -noshell\ \ \ \ \ \ \ \ \ \ # disable shell\ -nopkgs\ \ \ \ \ \ \ \ \ \ \ # disable pkgs\ -nouptime\ \ \ \ \ \ \ \ \ # disable uptime\ -nocolors\ \ \ \ \ \ \ \ \ # disable colors # SUPPORTED DISTRIBUTIONS -Distribution name\ \ \ \ \ -d option +Distribution name\ \ \ \ \ -d option -Nyalpine\ \ \ \ \ \ \ \ \ alpine\ -Nyarch Linuwu\ \ \ \ \ \ \ arch\ -Nyartix Linuwu\ \ \ \ \ \ \ artix\ -Debinyan\ \ \ \ \ \ \ \ \ debian\ -Fedowa\ \ \ \ \ \ \ \ \ \ \ fedora\ -GentOwO\ \ \ \ \ \ \ \ \ \ gentoo\ -GnUwU gUwUix\ \ \ \ \ \ \ guix\ -Miwint\ \ \ \ \ \ \ \ \ \ \ linuxmint\ -Myanjawo\ \ \ \ \ \ \ \ \ manjaro\ -Myanjawo AWM\ \ \ \ \ \ \ \\"manjaro-arm\\"\ -OwOpenSUSE\ \ \ \ \ \ \ \ \ \\"opensuse-leap\\"\ -Pop OwOs\ \ \ \ \ \ \ \ \ pop\ -RaspNyan\ \ \ \ \ \ \ \ \ raspbian\ -UwUntu\ \ \ \ \ \ \ \ \ \ \ ubuntu\ -OwOid\ \ \ \ \ \ \ \ \ \ \ \\"void\\"\ -Nyandroid\ \ \ \ \ \ \ \ \ android\ -Unknown (tux logo)\ \ \ \ \ unknown +Nyalpine\ \ \ \ \ \ \ \ \ alpine\ +Nyarch Linuwu\ \ \ \ \ \ \ arch\ +Nyartix Linuwu\ \ \ \ \ \ \ artix\ +Debinyan\ \ \ \ \ \ \ \ \ debian\ +Fedowa\ \ \ \ \ \ \ \ \ \ \ fedora\ +GentOwO\ \ \ \ \ \ \ \ \ \ gentoo\ +GnUwU gUwUix\ \ \ \ \ \ \ guix\ +Miwint\ \ \ \ \ \ \ \ \ \ \ linuxmint\ +Myanjawo\ \ \ \ \ \ \ \ \ manjaro\ +Myanjawo AWM\ \ \ \ \ \ \ \\"manjaro-arm\\"\ +OwOpenSUSE\ \ \ \ \ \ \ \ \ \\"opensuse-leap\\"\ +Pop OwOs\ \ \ \ \ \ \ \ \ pop\ +RaspNyan\ \ \ \ \ \ \ \ \ raspbian\ +UwUntu\ \ \ \ \ \ \ \ \ \ \ ubuntu\ +OwOid\ \ \ \ \ \ \ \ \ \ \ \\"void\\"\ +Nyandroid\ \ \ \ \ \ \ \ \ android\ +Unknown (tux logo)\ \ \ \ \ unknown --image/ascii only distributions--\ -endeavOwO\ \ \ \ \ \ \ \ \ endeavour\ -KDE NeOwOn\ \ \ \ \ \ \ \ \ neon\ -nixOwOs\ \ \ \ \ \ \ \ \ \ nixos\ -Swackwawe\ \ \ \ \ \ \ \ \ slackware\ -sOwOlus\ \ \ \ \ \ \ \ \ \ solus\ -FweeBSD\ \ \ \ \ \ \ \ \ \ freebsd\ -OwOpenBSD\ \ \ \ \ \ \ \ \ openbsd +endeavOwO\ \ \ \ \ \ \ \ \ endeavour\ +KDE NeOwOn\ \ \ \ \ \ \ \ \ neon\ +nixOwOs\ \ \ \ \ \ \ \ \ \ nixos\ +Swackwawe\ \ \ \ \ \ \ \ \ slackware\ +sOwOlus\ \ \ \ \ \ \ \ \ \ solus\ +FweeBSD\ \ \ \ \ \ \ \ \ \ freebsd\ +OwOpenBSD\ \ \ \ \ \ \ \ \ openbsd # DESCRIPTION @@ -94,18 +100,20 @@ and prints them in the terminal in an UwU way, with and UwU ascii logo or image. # EXAMPLES -uwufetch -d arch\ \ \ \ \ \ \ \ \ \ # prints arch logo\ -uwufetch -\-custom some_image.png\ \ # prints custom image (does not need full path)\ -ueufetch -i -d artix\ \ \ \ \ \ \ \ # prints artix image +uwufetch -d arch\ \ \ \ \ \ \ \ \ \ # prints arch logo\ +uwufetch -\-custom some_image.png\ \ # prints custom image (does not need full path)\ +ueufetch -i -d artix\ \ \ \ \ \ \ \ # prints artix image # DEPENDANCES -lshw\ \ better gpu info\ -viu\ \ \ print images instead of ascii logo\ -kitty\ \ better image viewing +json-c\ \ \ to parse the config file\ +lshw\ \ \ better gpu info\ +viu\ \ \ \ print images instead of ascii logo\ +kitty\ \ \ better image viewing All of this are optional, there is no necessary dependancy. # LICENSE AND COPYRIGTH -uwufetch is provided under the GPL3 license, for copyright info read https://github.com/TheDarkBug/uwufetch/tree/main/res/COPYRIGHT.md. +uwufetch is provided under the GPL3 license, for copyright info read\ +https://github.com/TheDarkBug/uwufetch/tree/main/res/COPYRIGHT.md.