blackbeard420/notcurses
1
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses synced 2025-03-09 17:19:03 -04:00
Code Issues Projects Releases Wiki Activity

ncneofetch: check LOGO field in /etc/os-release #1246

Browse Source
This commit is contained in:
nick black 2020-12-28 03:54:38 -05:00
parent 638dde7657
commit 0e8faed3f5
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/fetch/main.c
View File

@ -22,7 +22,8 @@ typedef struct fetched_info {
char* username; // we borrow a reference
char hostname[_POSIX_HOST_NAME_MAX];
const distro_info* distro;
char* distro_pretty;
char* logo; // strdup() from /etc/os-release
char* distro_pretty; // strdup() from /etc/os-release
char* kernel; // strdup(uname(2)->name)
char* kernver; // strdup(uname(2)->version);
char* desktop; // getenv("XDG_CURRENT_DESKTOP")
@ -145,11 +146,12 @@ linux_ncneofetch(fetched_info* fi){
while(fgets(buf, sizeof(buf), osinfo)){
#define PRETTY "PRETTY_NAME=\""
#define ID "ID=" // no quotes on this one
#define LOGO "LOGO=" // nor here
if(strncmp(buf, ID, strlen(ID)) == 0){
char* nl = strchr(buf + strlen(ID), '\n');
if(nl){
*nl = '\0';
distro = buf + strlen(ID);
distro = strdup(buf + strlen(ID));
break;
}
}else if(!fi->distro_pretty && strncmp(buf, PRETTY, strlen(PRETTY)) == 0){
@ -158,6 +160,13 @@ linux_ncneofetch(fetched_info* fi){
*nl = '\0';
fi->distro_pretty = strdup(buf + strlen(PRETTY));
}
}else if(!fi->logo && strncmp(buf, LOGO, strlen(LOGO)) == 0){
char* nl = strchr(buf + strlen(LOGO), '"');
if(nl){
*nl = '\0';
// FIXME need directory (https://specifications.freedesktop.org/icon-theme-spec/latest/ar01s03.html)
fi->logo = strdup(buf + strlen(LOGO));
}
}
}
#undef ID
@ -175,6 +184,7 @@ linux_ncneofetch(fetched_info* fi){
if(dinfo->name == NULL){
dinfo = NULL;
}
free(distro);
return dinfo;
}
@ -419,6 +429,7 @@ display_thread(void* vmarshal){
struct marshal* m = vmarshal;
drawpalette(m->nc);
if(m->dinfo){
// FIXME check for logo in fetched_info
if(m->dinfo->logofile){
if(ncdirect_render_image(m->nc, m->dinfo->logofile, NCALIGN_CENTER,
NCBLIT_2x2, NCSCALE_SCALE)){