Don't show subvolumes by default

CHANGELOG.md

@@ -15,6 +15,7 @@ Features:
 * Add `Brightness` module support
 * Add `Battery` module support for FreeBSD
 * Add `--disk-show-unknown` option for Disk module
+* Add `--disk-show-subvolumes` option for Disk module
 * Add `--gpu-hide-integrated` option (#379)
 * Add `--gpu-hide-discrete` option (#379)
 * Detect terminal version when available

completions/bash

@@ -194,6 +194,7 @@ __fastfetch_completion()
         "--disk-folders"
         "--disk-show-removable"
         "--disk-show-hidden"
+        "--disk-show-subvolumes"
         "--gpu-hide-integrated"
         "--gpu-hide-discrete"
         "--disk-show-unknown"

src/common/init.c

@@ -156,6 +156,7 @@ static void defaultConfig(FFinstance* instance)
     instance->config.diskShowRemovable = true;
     instance->config.diskShowHidden = false;
     instance->config.diskShowUnknown = false;
+    instance->config.diskShowSubvolumes = false;
 
     ffStrbufInitA(&instance->config.batteryDir, 0);
 

src/data/config_user.txt

@@ -231,22 +231,13 @@
 # Default is true.
 #--terminal-version true
 
-# Disk option
-# Sets if removable volume should be printed
+# Disk show options
+# Sets if certain types of disk should be printed
 # Must be either true or false
-# Default is true.
+# Default is false except for --disk-show-removable.
 #--disk-show-removable true
-
-# Disk option
-# Sets if hidden volume should be printed
-# Must be either true or false
-# Default is false.
 #--disk-show-hidden false
-
-# Disk option
-# Sets if unknown (unable to detect sizes) volume should be printed
-# Must be either true or false
-# Default is false.
+#--disk-show-subvolumes false
 #--disk-show-unknown false
 
 # Disk option

src/data/help.txt

@@ -100,35 +100,36 @@ Library options: Set the path of a library to load
     --lib-cjson <path>
 
 Module specific options:
-    --title-fqdn <?value>:          Set if the title should use fully qualified domain name. Default is false
-    --separator-string <str>:       Set the string printed by the separator module
-    --os-file <path>:               Set the path to the file containing OS information
-    --shell-version <?value>:       Set if shell version should be detected and printed
-    --terminal-version <?value>:    Set if terminal version should be detected and printed
-    --disk-folders <folders>:       A colon (semicolon on Windows) separated list of folder paths for the disk output. Default is "/:/home" ("C:\\;D:\\ ..." on Windows)
-    --disk-show-removable <?value>: Set if removable volume should be printed. Default is true
-    --disk-show-hidden <?value>:    Set if hidden volumes should be printed. Default is false
-    --disk-show-unknown <?value>:   Set if unknown (unable to detect sizes) volumes should be printed. Default is false
-    --battery-dir <folder>:         The directory where the battery folders are. Standard: /sys/class/power_supply/
-    --cpu-temp  <?value>:           Detect and display CPU temperature if supported. Default is false
-    --gpu-temp  <?value>:           Detect and display GPU temperature if supported. Default is false
-    --gpu-hide-integrated <?value>: Hide integrated GPU if supported. Default is false
-    --gpu-hide-discrete <?value>:   Hide discrete GPU if supported. Default is false
-    --battery-temp  <?value>:       Detect and display Battery temperature if supported. Default is false
-    --localip-show-ipv4 <?value>:   Show IPv4 addresses in local ip module. Default is true
-    --localip-show-ipv6 <?value>:   Show IPv6 addresses in local ip module. Default is false
-    --localip-show-loop <?value>:   Show loop back addresses (127.0.0.1) in local ip module. Default is false
-    --localip-name-prefix <str>:    Show IPs with given name prefix only. Default is empty
-    --public-ip-timeout:            Time in milliseconds to wait for the public ip server to respond. Default is disabled (0)
-    --public-ip-url:                The URL of public IP detection server to be used.
-    --weather-timeout:              Time in milliseconds to wait for the weather server to respond. Default is disabled (0)
-    --weather-output-format:        The output weather format to be used. It must be URI encoded.
-    --player-name:                  The name of the player to use
-    --gl <value>:                   Set the OpenGL context creation library to use. Must be auto, egl, glx or osmesa. Default is auto
-    --percent-type <value>:         Set the percentage output type. 1 for percentage number, 2 for bar, 3 for both, 6 for bar only. Default is 1
-    --command-shell <str>:          Set the shell program to execute the command text. Default is cmd for Windows, csh for FreeBSD, bash for others
-    --command-key <str>:            Set the module key to display, can be specified mulitple times
-    --command-text <str>:           Set the command text to be executed, can be specified mulitple times
+    --title-fqdn <?value>:           Set if the title should use fully qualified domain name. Default is false
+    --separator-string <str>:        Set the string printed by the separator module
+    --os-file <path>:                Set the path to the file containing OS information
+    --shell-version <?value>:        Set if shell version should be detected and printed
+    --terminal-version <?value>:     Set if terminal version should be detected and printed
+    --disk-folders <folders>:        A colon (semicolon on Windows) separated list of folder paths for the disk output. Default is "/:/home" ("C:\\;D:\\ ..." on Windows)
+    --disk-show-removable <?value>:  Set if removable volume should be printed. Default is true
+    --disk-show-hidden <?value>:     Set if hidden volumes should be printed. Default is false
+    --disk-show-subvolumes <?value>: Set if subvolumes should be printed. Default is false
+    --disk-show-unknown <?value>:    Set if unknown (unable to detect sizes) volumes should be printed. Default is false
+    --battery-dir <folder>:          The directory where the battery folders are. Standard: /sys/class/power_supply/
+    --cpu-temp  <?value>:            Detect and display CPU temperature if supported. Default is false
+    --gpu-temp  <?value>:            Detect and display GPU temperature if supported. Default is false
+    --gpu-hide-integrated <?value>:  Hide integrated GPU if supported. Default is false
+    --gpu-hide-discrete <?value>:    Hide discrete GPU if supported. Default is false
+    --battery-temp  <?value>:        Detect and display Battery temperature if supported. Default is false
+    --localip-show-ipv4 <?value>:    Show IPv4 addresses in local ip module. Default is true
+    --localip-show-ipv6 <?value>:    Show IPv6 addresses in local ip module. Default is false
+    --localip-show-loop <?value>:    Show loop back addresses (127.0.0.1) in local ip module. Default is false
+    --localip-name-prefix <str>:     Show IPs with given name prefix only. Default is empty
+    --public-ip-timeout:             Time in milliseconds to wait for the public ip server to respond. Default is disabled (0)
+    --public-ip-url:                 The URL of public IP detection server to be used.
+    --weather-timeout:               Time in milliseconds to wait for the weather server to respond. Default is disabled (0)
+    --weather-output-format:         The output weather format to be used. It must be URI encoded.
+    --player-name:                   The name of the player to use
+    --gl <value>:                    Set the OpenGL context creation library to use. Must be auto, egl, glx or osmesa. Default is auto
+    --percent-type <value>:          Set the percentage output type. 1 for percentage number, 2 for bar, 3 for both, 6 for bar only. Default is 1
+    --command-shell <str>:           Set the shell program to execute the command text. Default is cmd for Windows, csh for FreeBSD, bash for others
+    --command-key <str>:             Set the module key to display, can be specified mulitple times
+    --command-text <str>:            Set the command text to be executed, can be specified mulitple times
 
 Parsing is not case sensitive. E.g. "--lib-PCI" is equal to "--Lib-Pci"
 If a value starts with a ?, it is optional. "true" will be used if not set.

src/detection/disk/disk.h

@@ -9,7 +9,8 @@ typedef enum FFDiskType
 {
     FF_DISK_TYPE_REGULAR,
     FF_DISK_TYPE_HIDDEN,
-    FF_DISK_TYPE_EXTERNAL
+    FF_DISK_TYPE_EXTERNAL,
+    FF_DISK_TYPE_SUBVOLUME
 } FFDiskType;
 
 typedef struct FFDisk

src/detection/disk/disk_linux.c

@@ -28,6 +28,21 @@ static void strbufAppendMountPoint(FFstrbuf* mountpoint, const char* source)
     }
 }
 
+#ifndef __ANDROID__
+static bool isSubvolume(const char* options)
+{
+    const char* prefix = "subvol=/@"; //Btrfs subvolume
+    const char* subvolume = strstr(options, prefix);
+    if(subvolume == NULL)
+        return false;
+
+    subvolume += strlen(prefix);
+
+    //If there is no space or comma after the @, it is a btrfs subvolume
+    return *subvolume != ' ' && *subvolume != ',';
+}
+#endif
+
 void ffDetectDisksImpl(FFDiskResult* disks)
 {
     FILE* mountsFile = fopen("/proc/mounts", "r");
@@ -82,19 +97,21 @@ void ffDetectDisksImpl(FFDiskResult* disks)
             ++currentPos;
 
         #ifdef __ANDROID__
-        if(ffStrbufEqualS(&disk->mountpoint, "/") || ffStrbufEqualS(&disk->mountpoint, "/storage/emulated"))
-            disk->type = FF_DISK_TYPE_REGULAR;
-        else if(ffStrbufStartsWithS(&disk->mountpoint, "/mnt/media_rw/"))
-            disk->type = FF_DISK_TYPE_EXTERNAL;
-        else
-            disk->type = FF_DISK_TYPE_HIDDEN;
+            if(ffStrbufEqualS(&disk->mountpoint, "/") || ffStrbufEqualS(&disk->mountpoint, "/storage/emulated"))
+                disk->type = FF_DISK_TYPE_REGULAR;
+            else if(ffStrbufStartsWithS(&disk->mountpoint, "/mnt/media_rw/"))
+                disk->type = FF_DISK_TYPE_EXTERNAL;
+            else
+                disk->type = FF_DISK_TYPE_HIDDEN;
         #else
-        if(strstr(currentPos, "nosuid") != NULL || strstr(currentPos, "nodev") != NULL)
-            disk->type = FF_DISK_TYPE_EXTERNAL;
-        else if(ffStrbufStartsWithS(&disk->mountpoint, "/boot") || ffStrbufStartsWithS(&disk->mountpoint, "/efi"))
-            disk->type = FF_DISK_TYPE_HIDDEN;
-        else
-            disk->type = FF_DISK_TYPE_REGULAR;
+            if(isSubvolume(currentPos))
+                disk->type = FF_DISK_TYPE_SUBVOLUME;
+            else if(strstr(currentPos, "nosuid") != NULL || strstr(currentPos, "nodev") != NULL)
+                disk->type = FF_DISK_TYPE_EXTERNAL;
+            else if(ffStrbufStartsWithS(&disk->mountpoint, "/boot") || ffStrbufStartsWithS(&disk->mountpoint, "/efi"))
+                disk->type = FF_DISK_TYPE_HIDDEN;
+            else
+                disk->type = FF_DISK_TYPE_REGULAR;
         #endif
 
         //Detects stats

src/fastfetch.c

@@ -1266,6 +1266,8 @@ static void parseOption(FFinstance* instance, FFdata* data, const char* key, con
         instance->config.diskShowRemovable = optionParseBoolean(value);
     else if(strcasecmp(key, "--disk-show-hidden") == 0)
         instance->config.diskShowHidden = optionParseBoolean(value);
+    else if(strcasecmp(key, "--disk-show-subvolumes") == 0)
+        instance->config.diskShowSubvolumes = optionParseBoolean(value);
     else if(strcasecmp(key, "--disk-show-unknown") == 0)
         instance->config.diskShowUnknown = optionParseBoolean(value);
     else if(strcasecmp(key, "--battery-dir") == 0)

src/fastfetch.h

@@ -180,6 +180,7 @@ typedef struct FFconfig
     bool diskShowRemovable;
     bool diskShowHidden;
     bool diskShowUnknown;
+    bool diskShowSubvolumes;
 
     FFstrbuf batteryDir;
 

src/modules/disk.c

@@ -137,6 +137,9 @@ static void printAutodetected(FFinstance* instance, const FFlist* disks)
         if(disk->type == FF_DISK_TYPE_EXTERNAL && !instance->config.diskShowRemovable)
             continue;
 
+        if(disk->type == FF_DISK_TYPE_SUBVOLUME && !instance->config.diskShowSubvolumes)
+            continue;
+
         if(disk->type == FF_DISK_TYPE_HIDDEN && !instance->config.diskShowHidden)
             continue;