Skip to content

Commit 141f76f

Browse files
committed
fix: allow dot in mounted on
Signed-off-by: Daniel Kesselberg <[email protected]>
1 parent d3ce8fc commit 141f76f

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

lib/OperatingSystems/Linux.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ public function getDiskInfo(): array {
200200
}
201201

202202
$matches = [];
203-
$pattern = '/^(?<Filesystem>[\S]+)\s*(?<Type>[\S]+)\s*(?<Blocks>\d+)\s*(?<Used>\d+)\s*(?<Available>\d+)\s*(?<Capacity>\d+%)\s*(?<Mounted>[\w\/-]+)$/m';
203+
$pattern = '/^(?<Filesystem>[\S]+)\s*(?<Type>[\S]+)\s*(?<Blocks>\d+)\s*(?<Used>\d+)\s*(?<Available>\d+)\s*(?<Capacity>\d+%)\s*(?<Mounted>[\w\/\-\.]+)$/m';
204204

205205
$result = preg_match_all($pattern, $disks, $matches);
206206
if ($result === 0 || $result === false) {

tests/data/linux_df_tp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ home_vagrant_code vboxsf 958123168 614831132 343292036
1111
tmpfs tmpfs 816800 0 816800 0% /run/user/1000
1212
nfs.example.com:/export nfs4 14820 0 1230 0% /nfs
1313
198.51.100.42:/storage fuse.sshfs 47929956 53116 45419052 1% /mnt/sshfs
14+
/dev/vda5 ext4 205314024 110088996 84722884 57% /nextcloud/my.cloud.domain.xx

tests/lib/LinuxTest.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,15 @@ public function testGetDiskInfo(): void {
188188
$disk6->setPercent('1%');
189189
$disk6->setMount('/mnt/sshfs');
190190

191-
$this->assertEquals([$disk1, $disk2, $disk3, $disk4, $disk5, $disk6], $this->os->getDiskInfo());
191+
$disk7 = new Disk();
192+
$disk7->setDevice('/dev/vda5');
193+
$disk7->setFs('ext4');
194+
$disk7->setUsed(107508);
195+
$disk7->setAvailable(82737);
196+
$disk7->setPercent('57%');
197+
$disk7->setMount('/nextcloud/my.cloud.domain.xx');
198+
199+
$this->assertEquals([$disk1, $disk2, $disk3, $disk4, $disk5, $disk6, $disk7], $this->os->getDiskInfo());
192200
}
193201

194202
public function testGetDiskInfoNoCommandOutput(): void {

0 commit comments

Comments
 (0)