Merge pull request #228 from nextcloud/bugfix/noid/disk-nfs

Match any non-whitespace character in filesystem pattern
nextcloud · Aug 26, 2020 · e3dc3bf · e3dc3bf
2 parents fe6496d + 57668af
commit e3dc3bf
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/lib/OperatingSystems/DefaultOs.php b/lib/OperatingSystems/DefaultOs.php
@@ -209,7 +209,7 @@ public function getDiskInfo(): array {
 		}
 
 		$matches = [];
-		$pattern = '/^(?<Filesystem>[\w\/-]+)\s*(?<Type>\w+)\s*(?<Blocks>\d+)\s*(?<Used>\d+)\s*(?<Available>\d+)\s*(?<Capacity>\d+%)\s*(?<Mounted>[\w\/-]+)$/m';
+		$pattern = '/^(?<Filesystem>[\S]+)\s*(?<Type>\w+)\s*(?<Blocks>\d+)\s*(?<Used>\d+)\s*(?<Available>\d+)\s*(?<Capacity>\d+%)\s*(?<Mounted>[\w\/-]+)$/m';
 
 		$result = preg_match_all($pattern, $disks, $matches);
 		if ($result === 0 || $result === false) {

diff --git a/tests/data/df_tp b/tests/data/df_tp
@@ -9,3 +9,4 @@ tmpfs                                   tmpfs        4084000         0   4084000
 vagrant                                 vboxsf     958123168 614831132 343292036      65% /vagrant
 home_vagrant_code                       vboxsf     958123168 614831132 343292036      65% /home/vagrant/code
 tmpfs                                   tmpfs         816800         0    816800       0% /run/user/1000
+nfs.example.com:/export                 nfs4           14820         0      1230       0% /nfs
diff --git a/tests/lib/DefaultOsTest.php b/tests/lib/DefaultOsTest.php
@@ -166,6 +166,14 @@ public function testGetDiskInfo(): void {
 				'percent' => '65%',
 				'mount' => '/home/vagrant/code',
 			],
+			[
+				'device' => 'nfs.example.com:/export',
+				'fs' => 'nfs4',
+				'used' => 0,
+				'available' => 1259520,
+				'percent' => '0%',
+				'mount' => '/nfs',
+			]
 		];
 
 		$this->assertSame($disks, $this->os->getDiskInfo());