fixed trashbin size calculation

Author: memurats

lib/Settings/Personal/NmcPersonalInfoStorage.php

@@ -68,7 +68,7 @@ public function getForm(): TemplateResponse {
 			$totalSpace = $this->humanFileSize($storageInfo['total']);
 		}
 
-		$trashSizeinBytes = self::getTrashbinSize($this->uid);
+		$trashSizeinBytes = $this->getTrashbinSize($this->uid);
 		$filesSizeInBytes = $storageInfo['used'] - $photoVideoSizeInBytes;
 
 		if($filesSizeInBytes < 0) {
@@ -142,12 +142,35 @@ private function getTariff($quota) {
 
 		return $tariff;
 	}
-
+/*
 	private static function getTrashbinSize($user) {
 		$view = new View('/' . $user);
 		$fileInfo = $view->getFileInfo('/files_trashbin');
 		return isset($fileInfo['size']) ? $fileInfo['size'] : 0;
 	}
+*/
+	private function getTrashbinSize($user) {
+		$details = null;
+
+		$rootFolder = \OC::$server->getRootFolder()->getUserFolder($user);
+		$storageId = $rootFolder->getStorage()->getCache()->getNumericStorageId();
+
+		$query = $this->db->getQueryBuilder();
+
+		$query->selectAlias($query->func()->sum('size'), 'f1')
+			->from('filecache', 'fc')
+			->where($query->expr()->neq('fc.size', $query->createPositionalParameter(-1)))
+			->andWhere("fc.path Like 'files_trashbin/files/%'")
+			->andWhere($query->expr()->eq('fc.storage', $query->createPositionalParameter($storageId)));
+
+		$result = $query->execute();
+
+		while ($row = $result->fetch()) {
+			$details = $row['f1'];
+		}
+		$result->closeCursor();
+		return $details;
+	}
 
 	private function storageUtilization($user = null, $filterMimetypes = null) {
 		$details = null;
@@ -204,7 +227,7 @@ private function humanFileSize($bytes, $binary = true) {
 				return $relativeSize . ' ' . $readableFormat;
 			}
 		} else {
-			return $bytes . ' ' . $humanList[0];
+			return '0 ' . $humanList[0];
 		}
 	}
 }