Disk: add support for Windows

Also major refactoring of util/windows/wmi

src/detection/disk/disk.c

@@ -0,0 +1,55 @@
+#include "fastfetch.h"
+#include "disk.h"
+
+#include <sys/statvfs.h>
+
+void ffDetectDiskWithStatvfs(const char* folderPath, struct statvfs* fs, FFDiskResult* result)
+{
+    ffStrbufInitS(&result->path, folderPath);
+    result->used = result->total = 0;
+    ffStrbufInit(&result->error);
+
+    struct statvfs newFs;
+
+    if(fs == NULL)
+    {
+        fs = &newFs;
+        int ret = statvfs(folderPath, fs);
+        if(ret != 0)
+        {
+            ffStrbufAppendF(&result->error, "statvfs(\"%s\", &fs) != 0 (%i)", folderPath, ret);
+            return;
+        }
+    }
+
+    result->total = fs->f_blocks * fs->f_frsize;
+
+    if(result->total == 0)
+    {
+        ffStrbufAppendF(&result->error, "statvfs for %s returned size 0", folderPath);
+        return;
+    }
+
+    result->used = result->total - (fs->f_bavail * fs->f_frsize);
+    result->files = (uint32_t) (fs->f_files - fs->f_ffree);
+}
+
+bool ffDiskDetectDiskFolders(FFinstance* instance, FFlist* folders)
+{
+    ffStrbufTrim(&instance->config.diskFolders, ':');
+    if(instance->config.diskFolders.length == 0)
+        return false;
+
+    uint32_t startIndex = 0;
+    while(startIndex < instance->config.diskFolders.length)
+    {
+        uint32_t colonIndex = ffStrbufNextIndexC(&instance->config.diskFolders, startIndex, ':');
+        instance->config.diskFolders.chars[colonIndex] = '\0';
+
+        ffDetectDiskWithStatvfs(instance->config.diskFolders.chars + startIndex, NULL, (FFDiskResult*)ffListAdd(folders));
+
+        startIndex = colonIndex + 1;
+    }
+
+    return true;
+}

src/detection/disk/disk.h

@@ -5,6 +5,16 @@
 
 #include "fastfetch.h"
 
+typedef struct FFDiskResult
+{
+    FFstrbuf path;
+    uint64_t used;
+    uint64_t total;
+    uint32_t files;
+    FFstrbuf error;
+} FFDiskResult;
+
 const char* ffDiskAutodetectFolders(FFinstance* instance, FFlist* folders);
+bool ffDiskDetectDiskFolders(FFinstance* instance, FFlist* folders);
 
 #endif

src/detection/disk/disk_apple.m

@@ -2,6 +2,8 @@
 
 #import <Foundation/Foundation.h>
 
+void ffDetectDiskWithStatvfs(const char* folderPath, struct statvfs* fs, FFDiskResult* result);
+
 const char* ffDiskAutodetectFolders(FFinstance* instance, FFlist* folders)
 {
     NSArray *keys = [NSArray arrayWithObjects:NSURLVolumeNameKey, nil];
@@ -18,7 +20,7 @@ const char* ffDiskAutodetectFolders(FFinstance* instance, FFlist* folders)
         if(removable.boolValue && !instance->config.diskRemovable)
             continue;
 
-        ffStrbufInitS((FFstrbuf *)ffListAdd(folders), [url.relativePath cStringUsingEncoding:NSUTF8StringEncoding]);
+        ffDetectDiskWithStatvfs([url.relativePath cStringUsingEncoding:NSUTF8StringEncoding], NULL, (FFDiskResult*)ffListAdd(folders));
     }
 
     return NULL;

src/detection/disk/disk_linux.c

@@ -2,6 +2,8 @@
 
 #include <sys/statvfs.h>
 
+void ffDetectDiskWithStatvfs(const char* folderPath, struct statvfs* fs, FFDiskResult* result);
+
 const char* ffDiskAutodetectFolders(FFinstance* instance, FFlist* folders)
 {
     FF_UNUSED(instance);
@@ -11,12 +13,12 @@ const char* ffDiskAutodetectFolders(FFinstance* instance, FFlist* folders)
     if(rootRet != 0)
         return "statvfs(\"/\") failed";
 
-    ffStrbufInitS((FFstrbuf *)ffListAdd(folders), FASTFETCH_TARGET_DIR_ROOT"/");
+    ffDetectDiskWithStatvfs(FASTFETCH_TARGET_DIR_ROOT"/", &fsRoot, (FFDiskResult*)ffListAdd(folders));
 
     struct statvfs fsHome;
     int homeRet = statvfs(FASTFETCH_TARGET_DIR_HOME, &fsHome);
     if(homeRet == 0 && (fsRoot.f_fsid != fsHome.f_fsid))
-        ffStrbufInitS((FFstrbuf *)ffListAdd(folders), FASTFETCH_TARGET_DIR_HOME);
+        ffDetectDiskWithStatvfs(FASTFETCH_TARGET_DIR_HOME, &fsHome, (FFDiskResult*)ffListAdd(folders));
 
     return NULL;
 }

src/detection/disk/disk_windows.cpp

@@ -0,0 +1,48 @@
+extern "C" {
+#include "disk.h"
+}
+#include "util/windows/wmi.hpp"
+
+const char* ffDiskAutodetectFolders(FFinstance* instance, FFlist* folders)
+{
+    FF_UNUSED(instance);
+
+    IEnumWbemClassObject* pEnumerator = ffQueryWmi(L"SELECT Name, DriveType, FreeSpace, Size FROM Win32_LogicalDisk", nullptr);
+
+    if(!pEnumerator)
+        return "Query WMI service failed";
+
+    IWbemClassObject *pclsObj = NULL;
+    ULONG uReturn = 0;
+
+    while(SUCCEEDED(pEnumerator->Next(WBEM_INFINITE, 1, &pclsObj, &uReturn)) && uReturn != 0)
+    {
+        uint64_t driveType;
+        ffGetWmiObjUnsigned(pclsObj, L"DriveType", &driveType);
+        if(driveType == 2 && !instance->config.diskRemovable)
+            continue;
+
+        FFDiskResult* folder = (FFDiskResult*)ffListAdd(folders);
+
+        ffStrbufInit(&folder->path);
+        ffGetWmiObjString(pclsObj, L"Name", &folder->path);
+
+        uint64_t free;
+        ffGetWmiObjUnsigned(pclsObj, L"Size", &folder->total);
+        ffGetWmiObjUnsigned(pclsObj, L"FreeSpace", &free);
+        folder->used = folder->total - free;
+
+        folder->files = 0; //Unsupported
+
+        ffStrbufInit(&folder->error);
+    }
+
+    pclsObj->Release();
+    pEnumerator->Release();
+    return nullptr;
+}
+
+bool ffDiskDetectDiskFolders(FFinstance*, FFlist*)
+{
+    return false; // Unsupported
+}