From 1058e876a71a52ddbe102d9e0c6e1fb9ece8b4d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Tue, 30 Apr 2024 14:46:26 +0800 Subject: [PATCH] Revert "Disk (Windows): add `--disk-ignore-remote`" This reverts commit c71b04ba93ae82098047b3497b3128aca660becb. --- CHANGELOG.md | 1 - doc/json_schema.json | 5 ----- src/data/help.json | 10 ---------- src/detection/disk/disk.c | 4 ++-- src/detection/disk/disk_bsd.c | 2 +- src/detection/disk/disk_linux.c | 2 +- src/detection/disk/disk_windows.c | 4 ++-- src/modules/disk/disk.c | 15 --------------- src/modules/disk/option.h | 1 - 9 files changed, 6 insertions(+), 38 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5408b652c..17f58128a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,7 +18,6 @@ Features: * Better max CPU frequency detection support with `CPUID / 16H` instruction (CPU, Windows) * This requires Core I Gen 6 or newer, and with `Virtual Machine Platform` Windows feature disabled. X86 only. * Improve performance of nix packages detection (Packages, Linux) -* Add option `--disk-ignore-remote` to ignore remote disks to improve performance (Disk, Windows) # 2.10.2 diff --git a/doc/json_schema.json b/doc/json_schema.json index a7d338dca..5804b2292 100644 --- a/doc/json_schema.json +++ b/doc/json_schema.json @@ -1265,11 +1265,6 @@ "description": "Set if unknown (unable to detect sizes) volumes should be printed", "default": false }, - "ignoreRemote": { - "type": "boolean", - "description": "Set if remote volumes should be ignored when detecting for performance reasons. Windows only", - "default": false - }, "useAvailable": { "type": "boolean", "description": "Use f_bavail (lpFreeBytesAvailableToCaller for Windows) instead of f_bfree to calculate used bytes", diff --git a/src/data/help.json b/src/data/help.json index 9f1cb52a5..f7cdfb2ec 100644 --- a/src/data/help.json +++ b/src/data/help.json @@ -1007,16 +1007,6 @@ "default": false } }, - { - "long": "disk-ignore-remote", - "desc": "Set if remote volumes should be ignored when detecting for performance reasons", - "remark": "Windows only", - "arg": { - "type": "bool", - "optional": true, - "default": false - } - }, { "long": "disk-use-available", "desc": "Use f_bavail (lpFreeBytesAvailableToCaller for Windows) instead of f_bfree to calculate used bytes", diff --git a/src/detection/disk/disk.c b/src/detection/disk/disk.c index 17dd553b1..e712a9c12 100644 --- a/src/detection/disk/disk.c +++ b/src/detection/disk/disk.c @@ -1,6 +1,6 @@ #include "disk.h" -const char* ffDetectDisksImpl(FFDiskOptions* options, FFlist* disks); +const char* ffDetectDisksImpl(FFlist* disks); static int compareDisks(const FFDisk* disk1, const FFDisk* disk2) { @@ -9,7 +9,7 @@ static int compareDisks(const FFDisk* disk1, const FFDisk* disk2) const char* ffDetectDisks(FFDiskOptions* options, FFlist* disks) { - const char* error = ffDetectDisksImpl(options, disks); + const char* error = ffDetectDisksImpl(disks); if (error) return error; if (disks->length == 0) return "No disks found"; diff --git a/src/detection/disk/disk_bsd.c b/src/detection/disk/disk_bsd.c index 227800db1..c6f9a1c82 100644 --- a/src/detection/disk/disk_bsd.c +++ b/src/detection/disk/disk_bsd.c @@ -90,7 +90,7 @@ void detectFsInfo(struct statfs* fs, FFDisk* disk) } #endif -const char* ffDetectDisksImpl(FF_MAYBE_UNUSED FFDiskOptions* options, FFlist* disks) +const char* ffDetectDisksImpl(FFlist* disks) { int size = getfsstat(NULL, 0, MNT_WAIT); diff --git a/src/detection/disk/disk_linux.c b/src/detection/disk/disk_linux.c index 41701ce7e..31715e6d5 100644 --- a/src/detection/disk/disk_linux.c +++ b/src/detection/disk/disk_linux.c @@ -250,7 +250,7 @@ static void detectStats(FFDisk* disk) #endif } -const char* ffDetectDisksImpl(FF_MAYBE_UNUSED FFDiskOptions* options, FFlist* disks) +const char* ffDetectDisksImpl(FFlist* disks) { FILE* mountsFile = setmntent("/proc/mounts", "r"); if(mountsFile == NULL) diff --git a/src/detection/disk/disk_windows.c b/src/detection/disk/disk_windows.c index 3aada23c7..ef5329e50 100644 --- a/src/detection/disk/disk_windows.c +++ b/src/detection/disk/disk_windows.c @@ -6,7 +6,7 @@ #include #include -const char* ffDetectDisksImpl(FFDiskOptions* options, FFlist* disks) +const char* ffDetectDisksImpl(FFlist* disks) { wchar_t buf[MAX_PATH + 1]; uint32_t length = GetLogicalDriveStringsW(sizeof(buf) / sizeof(*buf), buf); @@ -18,7 +18,7 @@ const char* ffDetectDisksImpl(FFDiskOptions* options, FFlist* disks) wchar_t* mountpoint = buf + i; UINT driveType = GetDriveTypeW(mountpoint); - if(driveType == DRIVE_NO_ROOT_DIR || (driveType == DRIVE_REMOTE && options->ignoreRemote)) + if(driveType == DRIVE_NO_ROOT_DIR) { i += (uint32_t)wcslen(mountpoint); continue; diff --git a/src/modules/disk/disk.c b/src/modules/disk/disk.c index 60b60b368..f3c231e83 100644 --- a/src/modules/disk/disk.c +++ b/src/modules/disk/disk.c @@ -281,12 +281,6 @@ bool ffParseDiskCommandOptions(FFDiskOptions* options, const char* key, const ch return true; } - if (ffStrEqualsIgnCase(subKey, "ignore-remote")) - { - options->ignoreRemote = ffOptionParseBoolean(value); - return true; - } - if (ffPercentParseCommandOptions(key, subKey, value, &options->percent)) return true; @@ -357,12 +351,6 @@ void ffParseDiskJsonObject(FFDiskOptions* options, yyjson_val* module) continue; } - if (ffStrEqualsIgnCase(key, "ignoreRemote")) - { - options->ignoreRemote = yyjson_get_bool(val); - continue; - } - if (ffStrEqualsIgnCase(key, "useAvailable")) { if (yyjson_get_bool(val)) @@ -410,9 +398,6 @@ void ffGenerateDiskJsonConfig(FFDiskOptions* options, yyjson_mut_doc* doc, yyjso if (defaultOptions.calcType != options->calcType) yyjson_mut_obj_add_bool(doc, module, "useAvailable", options->calcType == FF_DISK_CALC_TYPE_AVAILABLE); - if (defaultOptions.ignoreRemote != options->ignoreRemote) - yyjson_mut_obj_add_bool(doc, module, "ignoreRemote", options->ignoreRemote); - ffPercentGenerateJsonConfig(doc, module, defaultOptions.percent, options->percent); } diff --git a/src/modules/disk/option.h b/src/modules/disk/option.h index e1fef2e6b..7c2abdcaa 100644 --- a/src/modules/disk/option.h +++ b/src/modules/disk/option.h @@ -31,5 +31,4 @@ typedef struct FFDiskOptions FFDiskVolumeType showTypes; FFDiskCalcType calcType; FFColorRangeConfig percent; - bool ignoreRemote; } FFDiskOptions;