exhq/neowofetch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed pkgman(), optimized overall performance.

Browse source
This commit is contained in:
Adriano Oliviero 2021-02-25 21:47:00 +01:00
parent f12c1be5fe
commit b10a854d9b
2 changed files with 85 additions and 182 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
Makefile
View file

@ -1,35 +1,11 @@
name = litefetch
files = main.c
install_dir = /usr/bin/
debug:
@echo Building debug...
gcc -Wall -Wextra -o $(name) $(files)
@echo Build completed! Running...
@echo
./$(name)
@echo
@exit
NAME = litefetch
FILES = main.c
FLAGS = -O3 -Wall -Wextra
INSTALL_DIR = /usr/bin/
all: build install
clean:
@echo Building debug...
gcc -Wall -Wextra -o $(name) $(files)
@echo Build completed! Running...
@echo
./$(name)
@echo
rm -f $(name)
@echo Removed output file.
@exit
build: main.c
gcc $(FLAGS) -o $(NAME) $(FILES)
install:
@echo Building release...
sudo gcc -o $(install_dir)$(name) $(files)
@echo Building and installation completed!
@exit
uninstall:
@echo Uninstalling $(name)...
sudo rm -f $(install_dir)$(name)
rm -rf ../$(name)
@echo Uninstall completed!
@exit
sudo cp $(NAME) $(INSTALL_DIR)$(NAME)

167
main.c
View file

@ -2,15 +2,8 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#ifdef __linux__
#include <sys/utsname.h>
#include <sys/sysinfo.h>
#elif __ANDROID__
#include <sys/utsname.h>
#include <sys/sysinfo.h>
#elif _WIN32
#endif
#include <sys/utsname.h>
#include <sys/sysinfo.h>
// COLORS
#define NORMAL "\x1b[0m"
#define BOLD "\x1b[1m"
@ -23,14 +16,12 @@
#define CYAN "\x1b[36m"
#define WHITE "\x1b[37m"
void pkgman();
char user[32], host[253], shell[64], version_name[64];
int pkgman();
int main() {
// init variables and other useful things
char user[32], host[253], shell[64], version_name[64];
// get user and host names
#ifdef __linux__
// get user name, host name and shell
struct utsname sys_var;
struct sysinfo sys;
@ -39,41 +30,31 @@ int main() {
snprintf(shell, 16, "%s", getenv("SHELL"));
memmove(&shell[0], &shell[5], 16);
// get os version
FILE *fos_rel = popen("lsb_release -a | grep Description", "r");
fscanf(fos_rel,"%[^\n]", version_name);
fclose(fos_rel);
memmove(&version_name[0], &version_name[12], 64);
#elif __ANDROID__
FILE *fwhoami = popen("whoami", "r");
fscanf(fwhoami,"%[^\n]", user);
fclose(fwhoami);
memmove(&version_name[0], &version_name[12], 32);
FILE *fos_rel = popen("getprop ro.system.build.version.release", "r");
fscanf(fos_rel,"%[^\n]", version_name);
fclose(fos_rel);
snprintf(shell, 16, "%s", getenv("SHELL"));
memmove(&shell[0], &shell[36], 64);
#endif
if (uname(&sys_var) == -1) printf("Ah sh*t, an error\n");
if (sysinfo(&sys) == -1) printf("Ah sh*t, an error\n");
if (uname(&sys_var) == -1) printf("Ah sh-t, an error\n");
if (sysinfo(&sys) == -1) printf("Ah sh-t, an error\n");
char cpu_model[128];
// get cpu info
char cpu_model[256];
FILE *fcpu = popen("lscpu | grep 'Model name:'", "r");
fscanf(fcpu, "%[^\n]", cpu_model);
fclose(fcpu);
memmove(&cpu_model[0], &cpu_model[33], 128);
// get ram info
int ram_max = sys.totalram * sys.mem_unit / 1048576;
int ram_used;
FILE *framu = popen("grep -i MemAvailable /proc/meminfo | awk '{print $2}' ", "r");
fscanf(framu, "%i", &ram_used);
fclose(framu);
ram_used = ram_used / 1024;
// Now we print the info and exit the program.
//NORMAL, BOLD, BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE
// print collected info
if (strcmp(version_name, "Arch Linux")) {
printf("%s %s@%s\n", BOLD, user, host);
printf("%s /\\ %s%sOS %s%s\n", BLUE, NORMAL, BOLD, NORMAL, version_name);
@ -81,100 +62,46 @@ int main() {
printf("%s /\\ \\ %s%sCPU %s%s\n", BLUE, NORMAL, BOLD, NORMAL, cpu_model);
printf("%s / \\ %s%sRAM %s%iM/%iM\n", BLUE, NORMAL, BOLD, NORMAL, ram_used, ram_max);
printf("%s / __ \\ %s%sSHELL %s%s\n", BLUE, NORMAL, BOLD, NORMAL, shell);
printf("%s / __| |__-\\ %s%sPKGS %s%s", BLUE, NORMAL, BOLD, NORMAL, NORMAL); pkgman();
printf("%s / __| |__-\\ %s%sPKGS %s%s%d\n", BLUE, NORMAL, BOLD, NORMAL, NORMAL, pkgman());
printf("%s /_-'' ''-_\\ %s%sUPTIME %s%lid, %lih, %lim\n", BLUE, NORMAL, BOLD, NORMAL, sys.uptime/60/60/24, sys.uptime/60/60%24, sys.uptime/60%60);
printf(" %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);
}
return 0;
}
void pkgman() {
int apt, dnf, emerge, flatpak, nix, pacman, rpm, snap, xbps, yay;
int pkgman() { // this is just a function that returns the total of installed packages
int apt, dnf, emerge, flatpak, nix, pacman, rpm, snap, xbps, total = 0;
FILE *fapt = popen("dpkg-query -f '${binary:Package}\n' -W 2>/dev/null | wc -l", "r");
FILE *fdnf = popen("dnf list installed 2>/dev/null | wc -l", "r");
FILE *femerge = popen("qlist -I 2>/dev/null | wc -l", "r");
FILE *fflatpak = popen("flatpak list 2>/dev/null | wc -l", "r");
FILE *fnix = popen("nix-store -q --requisites /run/current-sys_vartem/sw 2>/dev/null | wc -l", "r");
FILE *fpacman = popen("pacman -Q 2>/dev/null | wc -l", "r");
FILE *frpm = popen("rpm -qa --last 2>/dev/null | wc -l", "r");
FILE *fsnap = popen("snap list 2>/dev/null | wc -l", "r");
FILE *fxbps = popen("xbps-query -l 2>/dev/null | wc -l", "r");
FILE *fyay = popen("yay -Q 2>/dev/null | wc -l", "r");
fscanf(fapt, "%d", &apt);
fscanf(fdnf, "%d", &dnf);
fscanf(femerge, "%d", &emerge);
fscanf(fflatpak, "%d", &flatpak);
fscanf(fnix, "%d", &nix);
fscanf(fpacman, "%d", &pacman);
fscanf(frpm, "%d", &rpm);
fscanf(fsnap, "%d", &snap);
fscanf(fxbps, "%d", &xbps);
fscanf(fyay, "%d", &yay);
fclose(fapt);
fclose(fdnf);
fclose(femerge);
fclose(fflatpak);
fclose(fnix);
fclose(fpacman);
fclose(frpm);
fclose(fsnap);
fclose(fxbps);
fclose(fyay);
FILE *file[9];
file[0] = popen("dpkg-query -f '${binary:Package}\n' -W 2> /dev/null | wc -l", "r");
file[1] = popen("dnf list installed 2> /dev/null | wc -l", "r");
file[2] = popen("qlist -I 2> /dev/null | wc -l", "r");
file[3] = popen("flatpak list 2> /dev/null | wc -l", "r");
file[4] = popen("nix-store -q --requisites /run/current-sys_vartem/sw 2> /dev/null | wc -l", "r");
file[5] = popen("pacman -Qq 2> /dev/null | wc -l", "r");
file[6] = popen("rpm -qa --last 2> /dev/null | wc -l", "r");
file[7] = popen("snap list 2> /dev/null | wc -l", "r");
file[8] = popen("xbps-query -l 2> /dev/null | wc -l", "r");
int pipe = 0;
fscanf(file[0], "%d", &apt);
fscanf(file[1], "%d", &dnf);
fscanf(file[2], "%d", &emerge);
fscanf(file[3], "%d", &flatpak);
fscanf(file[4], "%d", &nix);
fscanf(file[5], "%d", &pacman);
fscanf(file[6], "%d", &rpm);
fscanf(file[7], "%d", &snap);
fscanf(file[8], "%d", &xbps);
for (int i = 0; i < 9; i++) fclose(file[i]);
if (apt > 0) {
if (pipe == 1) printf(" | ");
printf("apt %d", apt);
pipe = 1;
}
if (dnf > 0) {
if(pipe == 1) printf(" | ");
printf("dnf %d", dnf);
pipe = 1;
}
if (emerge > 0) {
if (pipe == 1) printf(" | ");
printf("emerge %d", emerge);
pipe = 1;
}
if (flatpak > 0) {
if (pipe == 1) printf(" | ");
printf("flatpak %d", flatpak);
pipe = 1;
}
if (nix > 0) {
if (pipe == 1) printf(" | ");
printf("nix %d", nix);
pipe = 1;
}
if (pacman > 0) {
if (pipe == 1) printf(" | ");
printf("pacman %d", pacman);
pipe = 1;
}
if (rpm > 0) {
if (pipe == 1) printf(" | ");
printf("rpm %d", rpm);
pipe = 1;
}
if (snap > 0) {
if (pipe == 1) printf(" | ");
printf("snap %d", snap);
pipe = 1;
}
if (xbps > 0) {
if (pipe == 1) printf(" | ");
printf("xbps %d", xbps);
pipe = 1;
}
if (yay > 0) {
if (pipe == 1) printf(" | ");
printf("yay %d", yay);
pipe = 1;
}
printf("\n");
if (apt > 0) total += apt;
if (dnf > 0) total += dnf;
if (emerge > 0) total += emerge;
if (flatpak > 0) total += flatpak;
if (nix > 0) total += nix;
if (pacman > 0) total += pacman;
if (rpm > 0) total += rpm;
if (snap > 0) total += snap;
if (xbps > 0) total += xbps;
return total;
}