From c8338f1ffddcc9ea4e05c1bea79ce0c66bca3f2a Mon Sep 17 00:00:00 2001 From: "Buster \"Silver Eagle\" Neece" Date: Mon, 28 Jan 2019 17:08:12 -0600 Subject: [PATCH] Don't default to the partition size if the used size is zero. --- src/Entity/Station.php | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/src/Entity/Station.php b/src/Entity/Station.php index 45ae8face..d6666f782 100644 --- a/src/Entity/Station.php +++ b/src/Entity/Station.php @@ -920,19 +920,14 @@ class Station } /** - * @return BigInteger|null + * @return BigInteger */ - public function getRawStorageUsed(): ?BigInteger + public function getRawStorageUsed(): BigInteger { $size = $this->storage_used; if (null === $size) { - $total_size = disk_total_space($this->getRadioMediaDir()); - $used_size = disk_free_space($this->getRadioMediaDir()); - - return BigInteger::of($total_size) - ->minus($used_size) - ->abs(); + return BigInteger::zero(); } return BigInteger::of($size); @@ -955,10 +950,6 @@ class Station public function addStorageUsed($new_storage_amount): void { $current_storage_used = $this->getRawStorageUsed(); - if (null === $current_storage_used) { - return; - } - $this->storage_used = (string)$current_storage_used->plus($new_storage_amount); } @@ -970,11 +961,12 @@ class Station public function removeStorageUsed($amount_to_remove): void { $current_storage_used = $this->getRawStorageUsed(); - if (null === $current_storage_used) { - return; + $storage_used = $current_storage_used->minus($amount_to_remove); + if ($storage_used->isLessThan(0)) { + $storage_used = BigInteger::zero(); } - $this->storage_used = (string)$current_storage_used->minus($amount_to_remove); + $this->storage_used = (string)$storage_used; } /**