Merge branch 'main' of https://github.com/Lennart1978/drinfo

Added -n option to disable color output
Added -s option to sort drives by size, usage, mount point, or name
Refactored code

.github/workflows/c-cpp.yml

@@ -1,21 +0,0 @@
-name: C/C++ CI
-
-on:
-  push:
-    branches: [ "main" ]
-  pull_request:
-    branches: [ "main" ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v4   
-    - name: make
-      run: make   
-
-permissions:
-  contents: read
-  pull-requests: write

README.md

@@ -11,6 +11,23 @@ A lightweight command-line tool to monitor disk usage on Linux systems with beau
 - **Human-Readable Sizes**: Displays sizes in B, KB, MB, GB, TB format
 - **Terminal Responsive**: Adapts to terminal width for optimal display
 - **Detailed Information**: Shows mount point, filesystem type, device path, UUID, label, mount options, used, available and inodes + SMART status (only as root)
+- **JSON Output**: Export drive information in JSON format for easy parsing
+- **Sorting**: Sort drives by size, usage, mount point, or name
+- **No Color Mode**: Disable ANSI colors for scripts or logs
+
+## Usage
+
+```bash
+drinfo [OPTIONS]
+```
+
+### Options
+
+- `-h, --help`: Show help message
+- `-v, --version`: Show program version
+- `-j, --json`: Output in JSON format
+- `-n, --no-color`: Disable color output
+- `-s, --sort TYPE`: Sort drives by TYPE (`size`, `usage`, `mount`, `name`)
 
 ## Build executable: drinfo
 

drinfo.1

@@ -1,4 +1,4 @@
-.TH DRINFO 1 "June 2024" "Version 1.0.4" "User Commands"
+.TH DRINFO 1 "November 2025" "Version 1.2.0" "User Commands"
 .SH NAME
 drinfo \- display information about drives and their storage usage
 .SH SYNOPSIS
@@ -6,9 +6,10 @@ drinfo \- display information about drives and their storage usage
 .RI [ OPTION ]
 .SH DESCRIPTION
 .B drinfo
-lists all detected local and network drives and Shows mount point, filesystem type, device path,
+lists all detected local and network drives and shows mount point, filesystem type, device path,
 UUID, label, mount options, used, available and inodes + SMART status (only as root).
-
+.P
+It provides a visual representation of disk usage with gradient colored progress bars (green -> yellow -> red).
 .SH OPTIONS
 .TP
 .BR -h , --help
@@ -16,6 +17,29 @@ Show help message and exit.
 .TP
 .BR -v , --version
 Show program version and exit.
+.TP
+.BR -j , --json
+Output drive information in JSON format. This is useful for parsing the output in scripts or other programs.
+.TP
+.BR -n , --no-color
+Disable ANSI color codes in the output. Use this option when redirecting output to a file or when running in a terminal that does not support colors.
+.TP
+.BR -s , --sort \ \fITYPE\fP
+Sort the drives by the specified \fITYPE\fP. Available types are:
+.RS
+.TP
+.B size
+Sort by total size (descending). This is the default.
+.TP
+.B usage
+Sort by usage percentage (descending).
+.TP
+.B mount
+Sort alphabetically by mount point.
+.TP
+.B name
+Sort alphabetically by device name.
+.RE
 
 .SH AUTHOR
 Lennart Martens <monkeynator78@gmail.com>

main.c

@@ -14,10 +14,11 @@
 #include <stdbool.h>
 #include <errno.h>
 #include <sys/types.h>
+#include <getopt.h>
 
 // Constants for terminal and display
 #define TERM_FALLBACK_WIDTH 80
-#define VERSION "1.0.4"
+#define VERSION "1.2.0"
 #define COLOR_BUFFER_SIZE 32
 #define MAX_UNITS 5
 #define BYTES_PER_KB 1024.0
@@ -70,8 +71,6 @@
 #define BACKGROUND_COLOR_FORMAT "\033[48;2;%d;%d;%dm"
 #define BLUE_TEXT_FORMAT "\033[38;2;%d;%d;%dm"
 #define RESET_FORMAT "\033[0m"
-#define BOLD_YELLOW_FORMAT "\033[1;33m"
-#define RESET_COLOR_FORMAT "\033[0m"
 
 // Constants for file system types
 #define MOUNT_TABLE_PATH "/proc/mounts"
@@ -80,6 +79,15 @@
 // Maximum number of drives to handle
 #define MAX_DRIVES 100
 
+// Global options
+bool opt_json = false;
+bool opt_no_color = false;
+enum { SORT_SIZE, SORT_USAGE, SORT_MOUNT, SORT_NAME } opt_sort = SORT_SIZE;
+
+// Color strings (can be disabled)
+const char *c_bold_yellow = "\033[1;33m";
+const char *c_reset = "\033[0m";
+
 // Constants for file system types to skip
 const char *skip_filesystems[] = {
     "proc", "sysfs", "devpts", "tmpfs", "devtmpfs", "securityfs",
@@ -127,6 +135,35 @@ int compare_drives_by_capacity(const void *a, const void *b)
     return 0;
 }
 
+// Function to compare drives by usage (descending order)
+int compare_drives_by_usage(const void *a, const void *b)
+{
+    const drive_info_t *drive_a = (const drive_info_t *)a;
+    const drive_info_t *drive_b = (const drive_info_t *)b;
+
+    if (drive_b->usage_percent > drive_a->usage_percent)
+        return 1;
+    if (drive_b->usage_percent < drive_a->usage_percent)
+        return -1;
+    return 0;
+}
+
+// Function to compare drives by mount point (alphabetical)
+int compare_drives_by_mount(const void *a, const void *b)
+{
+    const drive_info_t *drive_a = (const drive_info_t *)a;
+    const drive_info_t *drive_b = (const drive_info_t *)b;
+    return strcmp(drive_a->mount_point, drive_b->mount_point);
+}
+
+// Function to compare drives by device name (alphabetical)
+int compare_drives_by_name(const void *a, const void *b)
+{
+    const drive_info_t *drive_a = (const drive_info_t *)a;
+    const drive_info_t *drive_b = (const drive_info_t *)b;
+    return strcmp(drive_a->device, drive_b->device);
+}
+
 // Function to display help text
 void show_help(const char *program_name)
 {
@@ -137,6 +174,9 @@ void show_help(const char *program_name)
     printf("Options:\n");
     printf("  -h, --help       Show this help message\n");
     printf("  -v, --version    Show program version\n");
+    printf("  -j, --json       Output in JSON format\n");
+    printf("  -n, --no-color   Disable color output\n");
+    printf("  -s, --sort TYPE  Sort drives by TYPE (size, usage, mount, name)\n");
     printf("\n");
     printf("This program is licensed under the MIT License.\n");
     printf("https://github.com/lennart1978/drinfo\n");
@@ -232,6 +272,11 @@ bool is_appimage_or_temp(const char *fsname, const char *mountpoint)
 // Helper for true-color gradient (red-yellow-green)
 void get_bar_color(int idx, int max, char *buffer, size_t size)
 {
+    if (opt_no_color) {
+        buffer[0] = '\0';
+        return;
+    }
+
     // New gradient: 0% = green (0,255,0), 50% = yellow (255,255,0), 100% = red (255,0,0)
     float ratio = (float)idx / (float)(max - 1);
     int r, g, b;
@@ -269,19 +314,6 @@ int visible_length(const char *s)
     return len;
 }
 
-// Adjusted: calculate max visible line length for block
-int max_visible_line_length(const char *lines[], int n)
-{
-    int max = 0;
-    for (int i = 0; i < n; ++i)
-    {
-        int len = visible_length(lines[i]);
-        if (len > max)
-            max = len;
-    }
-    return max;
-}
-
 // Function to check if a directory contains cloud storage
 bool is_cloud_storage_directory(const char *path)
 {
@@ -455,7 +487,7 @@ void get_cloud_storage_info(const char *gvfs_path, drive_info_t *drives, int *dr
             int text_length = strlen(percent_text);
             int text_start = filled_length > text_length ? (filled_length - text_length) / 2 : 0;
 
-            // Create progress bar (same logic as before)
+            // Create progress bar
             size_t bar_bufsize = bar_length * MAX_BAR_BUFFER_MULTIPLIER + 1;
             char *bar = malloc(bar_bufsize);
             if (!bar)
@@ -468,22 +500,35 @@ void get_cloud_storage_info(const char *gvfs_path, drive_info_t *drives, int *dr
             {
                 if (i >= text_start && i < text_start + text_length && i < filled_length)
                 {
+                    if (!opt_no_color) {
                         get_bar_color(i, bar_length, colorbuf, sizeof(colorbuf));
                         int r, g, b;
                         sscanf(colorbuf, COLOR_FORMAT, &r, &g, &b);
                         char tmp[MAX_TEMP_BUFFER_LENGTH];
                         snprintf(tmp, sizeof(tmp), BACKGROUND_COLOR_FORMAT BLUE_TEXT_FORMAT "%c" RESET_FORMAT, r, g, b, BLUE_TEXT_R, BLUE_TEXT_G, BLUE_TEXT_B, percent_text[i - text_start]);
                         strncat(bar, tmp, bar_bufsize - strlen(bar) - 1);
+                    } else {
+                        char tmp[2] = {percent_text[i - text_start], '\0'};
+                        strncat(bar, tmp, bar_bufsize - strlen(bar) - 1);
+                    }
                 }
                 else if (i < filled_length)
                 {
+                    if (!opt_no_color) {
                         get_bar_color(i, bar_length, colorbuf, sizeof(colorbuf));
                         strncat(bar, colorbuf, bar_bufsize - strlen(bar) - 1);
                         strncat(bar, "█" RESET_FORMAT, bar_bufsize - strlen(bar) - 1);
+                    } else {
+                        strncat(bar, "█", bar_bufsize - strlen(bar) - 1);
+                    }
                 }
                 else
                 {
+                    if (!opt_no_color) {
                         strncat(bar, "\033[48;2;64;64;64m\033[38;2;160;160;160m░\033[0m", bar_bufsize - strlen(bar) - 1);
+                    } else {
+                        strncat(bar, "░", bar_bufsize - strlen(bar) - 1);
+                    }
                 }
             }
 
@@ -650,40 +695,48 @@ void get_smart_status(const char *device, char *status, size_t status_size)
     pclose(fp);
 }
 
-int main(int argc, char *argv[])
+void print_json(drive_info_t *drives, int count) {
-{
+    printf("[\n");
-    if (argc > 1)
+    for (int i = 0; i < count; i++) {
-    {
+        drive_info_t *d = &drives[i];
-        if (strcmp(argv[1], "-h") == 0 || strcmp(argv[1], "--help") == 0)
+        printf("  {\n");
-        {
+        printf("    \"device\": \"%s\",\n", d->device);
-            show_help(argv[0]);
+        printf("    \"mount_point\": \"%s\",\n", d->mount_point);
-            return 0;
+        printf("    \"filesystem\": \"%s\",\n", d->filesystem);
-        }
+        printf("    \"total_bytes\": %llu,\n", d->total_bytes);
-        else if (strcmp(argv[1], "-v") == 0 || strcmp(argv[1], "--version") == 0)
+        printf("    \"used_bytes\": %llu,\n", d->used_bytes);
-        {
+        printf("    \"available_bytes\": %llu,\n", d->available_bytes);
-            show_version();
+        printf("    \"usage_percent\": %.1f,\n", d->usage_percent);
-            return 0;
+        printf("    \"type\": \"%s\",\n", d->drive_type);
+        printf("    \"is_cloud\": %s,\n", d->is_cloud_storage ? "true" : "false");
+        printf("    \"cloud_service\": \"%s\",\n", d->cloud_service_name);
+        printf("    \"uuid\": \"%s\",\n", d->uuid);
+        printf("    \"label\": \"%s\",\n", d->label);
+        printf("    \"mount_options\": \"%s\",\n", d->mount_options);
+        printf("    \"total_inodes\": %llu,\n", d->total_inodes);
+        printf("    \"used_inodes\": %llu,\n", d->used_inodes);
+        printf("    \"inode_usage\": %.1f\n", d->inode_usage);
+        if (i < count - 1) printf("  },\n");
+        else printf("  }\n");
     }
+    printf("]\n");
 }
 
-    printf("\n");
+void discover_drives(drive_info_t *drives, int *drive_count) {
-
+    *drive_count = 0;
-    // Array to store all drive information
-    drive_info_t drives[MAX_DRIVES];
-    int drive_count = 0;
 
     // Open the mount table
     FILE *mtab = setmntent(MOUNT_TABLE_PATH, "r");
     if (mtab == NULL)
     {
         perror("Error opening mount table");
-        return 1;
+        return;
     }
 
     struct mntent *entry;
 
     // Loop through all mount points and collect drive information
-    while ((entry = getmntent(mtab)) != NULL && drive_count < MAX_DRIVES)
+    while ((entry = getmntent(mtab)) != NULL && *drive_count < MAX_DRIVES)
     {
         // Skip special file systems
         const int skip_count = sizeof(skip_filesystems) / sizeof(skip_filesystems[0]);
@@ -774,22 +827,35 @@ int main(int argc, char *argv[])
         {
             if (i >= text_start && i < text_start + text_length && i < filled_length)
             {
+                if (!opt_no_color) {
                     get_bar_color(i, bar_length, colorbuf, sizeof(colorbuf));
                     int r, g, b;
                     sscanf(colorbuf, COLOR_FORMAT, &r, &g, &b);
                     char tmp[MAX_TEMP_BUFFER_LENGTH];
                     snprintf(tmp, sizeof(tmp), BACKGROUND_COLOR_FORMAT BLUE_TEXT_FORMAT "%c" RESET_FORMAT, r, g, b, BLUE_TEXT_R, BLUE_TEXT_G, BLUE_TEXT_B, percent_text[i - text_start]);
                     strncat(bar, tmp, bar_bufsize - strlen(bar) - 1);
+                } else {
+                    char tmp[2] = {percent_text[i - text_start], '\0'};
+                    strncat(bar, tmp, bar_bufsize - strlen(bar) - 1);
+                }
             }
             else if (i < filled_length)
             {
+                if (!opt_no_color) {
                     get_bar_color(i, bar_length, colorbuf, sizeof(colorbuf));
                     strncat(bar, colorbuf, bar_bufsize - strlen(bar) - 1);
                     strncat(bar, "█" RESET_FORMAT, bar_bufsize - strlen(bar) - 1);
+                } else {
+                    strncat(bar, "█", bar_bufsize - strlen(bar) - 1);
+                }
             }
             else
             {
+                if (!opt_no_color) {
                     strncat(bar, "\033[48;2;64;64;64m\033[38;2;160;160;160m░\033[0m", bar_bufsize - strlen(bar) - 1);
+                } else {
+                    strncat(bar, "░", bar_bufsize - strlen(bar) - 1);
+                }
             }
         }
 
@@ -813,7 +879,7 @@ int main(int argc, char *argv[])
         get_uuid_and_label(entry->mnt_fsname, uuid, sizeof(uuid), label, sizeof(label));
 
         // Store information in drive_info_t structure
-        drive_info_t *drive = &drives[drive_count];
+        drive_info_t *drive = &drives[*drive_count];
         fill_drive_info(drive, entry->mnt_dir, entry->mnt_type, entry->mnt_fsname,
                         uuid, label,
                         total_str, used_str, available_str,
@@ -821,7 +887,7 @@ int main(int argc, char *argv[])
                         usage_percent, drive_type, bar, false, NULL, entry->mnt_opts,
                         total_inodes, used_inodes, inode_usage);
 
-        drive_count++;
+        (*drive_count)++;
     }
 
     endmntent(mtab);
@@ -831,12 +897,89 @@ int main(int argc, char *argv[])
     snprintf(gvfs_path, sizeof(gvfs_path), GVFS_BASE_PATH, getuid());
     if (is_cloud_storage_directory(gvfs_path))
     {
-        get_cloud_storage_info(gvfs_path, drives, &drive_count);
+        get_cloud_storage_info(gvfs_path, drives, drive_count);
+    }
 }
 
-    // Sort drives by capacity (largest first)
+int main(int argc, char *argv[])
-    qsort(drives, drive_count, sizeof(drive_info_t), compare_drives_by_capacity);
+{
+    static struct option long_options[] = {
+        {"help", no_argument, 0, 'h'},
+        {"version", no_argument, 0, 'v'},
+        {"json", no_argument, 0, 'j'},
+        {"no-color", no_argument, 0, 'n'},
+        {"sort", required_argument, 0, 's'},
+        {0, 0, 0, 0}
+    };
 
+    int opt;
+    int option_index = 0;
+
+    while ((opt = getopt_long(argc, argv, "hvjns:", long_options, &option_index)) != -1)
+    {
+        switch (opt)
+        {
+        case 'h':
+            show_help(argv[0]);
+            return 0;
+        case 'v':
+            show_version();
+            return 0;
+        case 'j':
+            opt_json = true;
+            break;
+        case 'n':
+            opt_no_color = true;
+            break;
+        case 's':
+            if (strcmp(optarg, "size") == 0) opt_sort = SORT_SIZE;
+            else if (strcmp(optarg, "usage") == 0) opt_sort = SORT_USAGE;
+            else if (strcmp(optarg, "mount") == 0) opt_sort = SORT_MOUNT;
+            else if (strcmp(optarg, "name") == 0) opt_sort = SORT_NAME;
+            else {
+                fprintf(stderr, "Invalid sort option: %s\n", optarg);
+                return 1;
+            }
+            break;
+        default:
+            return 1;
+        }
+    }
+
+    if (opt_no_color) {
+        c_bold_yellow = "";
+        c_reset = "";
+    }
+
+    if (!opt_json) {
+        printf("\n");
+    }
+
+    // Array to store all drive information
+    drive_info_t drives[MAX_DRIVES];
+    int drive_count = 0;
+
+    discover_drives(drives, &drive_count);
+
+    // Sort drives
+    switch (opt_sort) {
+        case SORT_SIZE:
+            qsort(drives, drive_count, sizeof(drive_info_t), compare_drives_by_capacity);
+            break;
+        case SORT_USAGE:
+            qsort(drives, drive_count, sizeof(drive_info_t), compare_drives_by_usage);
+            break;
+        case SORT_MOUNT:
+            qsort(drives, drive_count, sizeof(drive_info_t), compare_drives_by_mount);
+            break;
+        case SORT_NAME:
+            qsort(drives, drive_count, sizeof(drive_info_t), compare_drives_by_name);
+            break;
+    }
+
+    if (opt_json) {
+        print_json(drives, drive_count);
+    } else {
         // Display sorted drives
         for (int i = 0; i < drive_count; i++)
         {
@@ -845,11 +988,11 @@ int main(int argc, char *argv[])
             // Display drive information
             if (drive->is_cloud_storage)
             {
-            printf("  " BOLD_YELLOW_FORMAT "Network Drive %d (%s)" RESET_COLOR_FORMAT "\n", i + 1, drive->cloud_service_name);
+                printf("  %sNetwork Drive %d (%s)%s\n", c_bold_yellow, i + 1, drive->cloud_service_name, c_reset);
             }
             else
             {
-            printf("  " BOLD_YELLOW_FORMAT "%s %d" RESET_COLOR_FORMAT "\n", drive->drive_type, i + 1);
+                printf("  %s%s %d%s\n", c_bold_yellow, drive->drive_type, i + 1, c_reset);
             }
             printf("  Mount point:   %s\n", drive->mount_point);
             printf("  Filesystem:    %s\n", drive->filesystem);
@@ -902,6 +1045,7 @@ int main(int argc, char *argv[])
         {
             printf("A total of %d drives found.\n", drive_count);
         }
+    }
 
     return 0;
 }