Merge pull request #665 from nextcloud/bug/664/allow-dot-in-mounted

fix: allow dot in mounted on
nextcloud · Aug 21, 2024 · 52aaf72 · 52aaf72
2 parents c59c806 + 93165a7
commit 52aaf72
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/lib/OperatingSystems/Linux.php b/lib/OperatingSystems/Linux.php
@@ -200,7 +200,7 @@ public function getDiskInfo(): array {
 		}
 
 		$matches = [];
-		$pattern = '/^(?<Filesystem>[\S]+)\s*(?<Type>[\S]+)\s*(?<Blocks>\d+)\s*(?<Used>\d+)\s*(?<Available>\d+)\s*(?<Capacity>\d+%)\s*(?<Mounted>[\w\/-]+)$/m';
+		$pattern = '/^(?<Filesystem>[\S]+)\s*(?<Type>[\S]+)\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/linux_df_tp b/tests/data/linux_df_tp
@@ -11,3 +11,4 @@ home_vagrant_code                       vboxsf     958123168 614831132 343292036
 tmpfs                                   tmpfs         816800         0    816800       0% /run/user/1000
 nfs.example.com:/export                 nfs4           14820         0      1230       0% /nfs
 198.51.100.42:/storage                  fuse.sshfs  47929956     53116  45419052       1% /mnt/sshfs
+/dev/vda5                               ext4       205314024 110088996  84722884      57% /nextcloud/my.cloud.domain.xx
diff --git a/tests/lib/LinuxTest.php b/tests/lib/LinuxTest.php
@@ -188,7 +188,15 @@ public function testGetDiskInfo(): void {
 		$disk6->setPercent('1%');
 		$disk6->setMount('/mnt/sshfs');
 
-		$this->assertEquals([$disk1, $disk2, $disk3, $disk4, $disk5, $disk6], $this->os->getDiskInfo());
+		$disk7 = new Disk();
+		$disk7->setDevice('/dev/vda5');
+		$disk7->setFs('ext4');
+		$disk7->setUsed(107508);
+		$disk7->setAvailable(82737);
+		$disk7->setPercent('57%');
+		$disk7->setMount('/nextcloud/my.cloud.domain.xx');
+
+		$this->assertEquals([$disk1, $disk2, $disk3, $disk4, $disk5, $disk6, $disk7], $this->os->getDiskInfo());
 	}
 
 	public function testGetDiskInfoNoCommandOutput(): void {