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

Disk: better folder detection, support removable devices ( macOS )

Browse Source
This commit is contained in:
李通洲
2022-09-23 19:45:23 +08:00
parent 007ded2883
commit 371b3a2d75
9 changed files with 81 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/disk.c
+16 -46
View File
@@ -1,6 +1,7 @@
#include "fastfetch.h"
#include "common/printing.h"
#include "common/parsing.h"
#include "detection/disk/disk.h"
#include <sys/statvfs.h>
@@ -64,49 +65,7 @@ static void printStatvfs(FFinstance* instance, const FFstrbuf* key, const char*
ffStrbufDestroy(&usedPretty);
}
static void printFolderAutodetection(FFinstance* instance, const char* folderPath, struct statvfs* fs)
{
FFstrbuf key;
ffStrbufInit(&key);
createKey(instance, folderPath, &key);
printStatvfs(instance, &key, folderPath, fs);
ffStrbufDestroy(&key);
}
static void printFoldersAutodetection(FFinstance* instance)
{
struct statvfs fsRoot;
int rootRet = statvfs(FASTFETCH_TARGET_DIR_ROOT"/", &fsRoot);
if(rootRet != 0)
{
FFstrbuf key;
ffStrbufInit(&key);
createKey(instance, NULL, &key);
ffPrintErrorString(instance, key.chars, 0, NULL, &instance->config.disk.errorFormat, "statvfs for / returned not zero: %i", rootRet);
ffStrbufDestroy(&key);
return;
}
//On MacOS statvfs seems to return different f_fsid for the same filesystem.
//Since it isn't really possible to install /Users on a separate disk anyway, just never print it by default.
#ifndef __APPLE__
struct statvfs fsHome;
int homeRet = statvfs(FASTFETCH_TARGET_DIR_HOME, &fsHome);
bool printHome = homeRet == 0 && (fsRoot.f_fsid != fsHome.f_fsid);
#else
bool printHome = false;
#endif // !__APPLE__
printFolderAutodetection(instance, printHome ? FASTFETCH_TARGET_DIR_ROOT"/" : NULL, &fsRoot);
#ifndef __APPLE__
if(printHome)
printFolderAutodetection(instance, FASTFETCH_TARGET_DIR_HOME, &fsHome);
#endif // !__APPLE__
}
static void printFolderCustom(FFinstance* instance, const char* folderPath)
static void printFolder(FFinstance* instance, const char* folderPath)
{
FFstrbuf key;
ffStrbufInit(&key);
@@ -131,17 +90,28 @@ void ffPrintDisk(FFinstance* instance)
if(instance->config.diskFolders.length == 0)
{
printFoldersAutodetection(instance);
FFlist folders;
ffListInit(&folders, sizeof(FFstrbuf));
const char* error = ffDiskAutodetectFolders(instance, &folders);
if(error)
ffPrintError(instance, FF_DISK_MODULE_NAME, 0, &instance->config.disk, "%s", error);
for(uint32_t i = 0; i < folders.length; ++i)
{
FFstrbuf* folder = (FFstrbuf*)ffListGet(&folders, i);
printFolder(instance, folder->chars);
ffStrbufDestroy(folder);
}
ffListDestroy(&folders);
return;
}
uint32_t startIndex = 0;
while (startIndex < instance->config.diskFolders.length)
while(startIndex < instance->config.diskFolders.length)
{
uint32_t colonIndex = ffStrbufNextIndexC(&instance->config.diskFolders, startIndex, ':');
instance->config.diskFolders.chars[colonIndex] = '\0';
printFolderCustom(instance, instance->config.diskFolders.chars + startIndex);
printFolder(instance, instance->config.diskFolders.chars + startIndex);
startIndex = colonIndex + 1;
}