fixed #217

kmvan · Jul 16, 2024 · 685e07e · 685e07e
1 parent e3bc058
commit 685e07e
Showing 1 changed file with 21 additions and 33 deletions.
diff --git a/src/Components/Utils/UtilsDisk.php b/src/Components/Utils/UtilsDisk.php
@@ -9,17 +9,14 @@ public static function getItems()
         switch (\PHP_OS) {
             case 'Linux':
                 return self::getLinuxItems();
-
             default:
                 return;
         }
     }
 
     private static function getLinuxItems()
     {
-        $path = '/proc/mounts';
-
-        if ( ! file_exists($path) || ! \function_exists('shell_exec')) {
+        if ( ! \function_exists('shell_exec')) {
             return array(
                 array(
                     'id' => __DIR__,
@@ -28,45 +25,36 @@ private static function getLinuxItems()
                 ),
             );
         }
-
-        $availableFs = array('ext2', 'ext3', 'ext4', 'xfs', 'btrfs', 'jfs', 'reiserfs', 'zfs', 'ufs', 'fat', 'ntfs', 'f2fs', 'fat32', 'exfat');
         $items = array();
-        $lines = file($path);
-        $df = shell_exec('df -k');
-        $dfLines = explode("\n", $df);
-
-        foreach ($lines as $line) {
-            $line = trim($line);
-
-            if (empty($line)) {
+        $dfLines = explode("\n", shell_exec('df -k'));
+        if (\count($dfLines) <= 1) {
+            return $items;
+        }
+        $dfLines = \array_slice($dfLines, 1);
+        $fsExclude = array('tmpfs', 'run', 'dev');
+        foreach ($dfLines as $dfLine) {
+            $dfObj = explode(' ', preg_replace('/\\s+/', ' ', $dfLine));
+            if (\count($dfObj) < 6) {
                 continue;
             }
-            $line = explode(' ', $line);
-
-            if ( ! \in_array($line[2], $availableFs, true)) {
+            $dfFs = $dfObj[0];
+            $dfTotal = (int) $dfObj[1];
+            $dfAvailable = (int) $dfObj[3];
+            $dfMountedOn = $dfObj[5];
+            if (\in_array($dfFs, $fsExclude, true)) {
                 continue;
             }
-            $mount = $line[1];
-            $free = 0;
-            $total = 0;
-            foreach ($dfLines as $dfLine) {
-                $dfObj = preg_replace('/\\s+/', ' ', $dfLine);
-                $dfObj = explode(' ', $dfObj);
-                if (\count($dfObj) < 6) {
-                    continue;
-                }
-                if ($dfObj[5] !== $mount) {
-                    continue;
-                }
-                $free = $dfObj[3] * 1024;
-                $total = $dfObj[1] * 1024;
-            }
+            $free = $dfAvailable * 1024;
+            $total = $dfTotal * 1024;
             $items[] = array(
-                'id' => $line[1],
+                'id' => "{$dfFs}:{$dfMountedOn}",
                 'free' => $free,
                 'total' => $total,
             );
         }
+        if ( ! $items) {
+            return array();
+        }
         // sort by total desc
         usort($items, function ($a, $b) {
             return $b['total'] - $a['total'];