fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-10-29 16:26:39 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Disk: change removable to external; print filesystem by default

Browse Source
This commit is contained in:
李通洲
2023-06-15 00:30:27 +08:00
parent 05a8bd7f74
commit 3c8688345f
6 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/disk/disk.c
+13 -4
View File
@@ -57,8 +57,17 @@ static void printDisk(FFinstance* instance, FFDiskOptions* options, const FFDisk
else
ffStrbufAppendS(&str, "Unknown ");
if((disk->type & FF_DISK_TYPE_EXTERNAL_BIT) && !(instance->config.percentType & FF_PERCENTAGE_TYPE_HIDE_OTHERS_BIT))
ffStrbufAppendS(&str, "[Removable]");
if(!(instance->config.percentType & FF_PERCENTAGE_TYPE_HIDE_OTHERS_BIT))
{
ffStrbufAppendF(&str, "- %s ", disk->filesystem.chars);
if(disk->type & FF_DISK_TYPE_EXTERNAL_BIT)
ffStrbufAppendS(&str, "[External]");
else if(disk->type & FF_DISK_TYPE_SUBVOLUME_BIT)
ffStrbufAppendS(&str, "[Subvolume]");
else if(disk->type & FF_DISK_TYPE_HIDDEN_BIT)
ffStrbufAppendS(&str, "[Hidden]");
}
ffStrbufTrimRight(&str, ' ');
ffStrbufPutTo(&str, stdout);
@@ -188,7 +197,7 @@ bool ffParseDiskCommandOptions(FFDiskOptions* options, const char* key, const ch
return true;
}
if (strcasecmp(subKey, "show-removable") == 0)
if (strcasecmp(subKey, "show-external") == 0)
{
if (ffOptionParseBoolean(value))
options->showTypes |= FF_DISK_TYPE_EXTERNAL_BIT;
@@ -256,7 +265,7 @@ void ffParseDiskJsonObject(FFinstance* instance, yyjson_val* module)
continue;
}
if (strcasecmp(key, "showRemovable") == 0)
if (strcasecmp(key, "showExternal") == 0)
{
if (yyjson_get_bool(val))
options.showTypes |= FF_DISK_TYPE_EXTERNAL_BIT;