From e396d9bafbd6913fd770e35410357e843e8f730b Mon Sep 17 00:00:00 2001 From: cubic Date: Tue, 15 Mar 2022 15:42:58 +0800 Subject: [PATCH] fix(Repo Count): fix consumed disk size (github #56) github #56 --- application/controllers/api/repository.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/application/controllers/api/repository.php b/application/controllers/api/repository.php index ed06ec2..e0b4fb1 100755 --- a/application/controllers/api/repository.php +++ b/application/controllers/api/repository.php @@ -193,11 +193,13 @@ class Repository extends Base $config['tags'] = $this->repositoryModel->getTagList($rKey, $uKey); $config['tags'] = $this->repositoryModel->normalizeTags($config['tags']); + $countObjects = $this->repositoryModel->getObjectsCount($rKey, $uKey); + $config['count'] = [ 'commit' => (int) $this->repositoryModel->getCommitCount($rKey, $uKey, $config['repository']['defaultBranch'] ?: ($config['branches'] ? $config['branches'][0]['name'] : '')), 'branch' => count($config['branches']), 'tag' => count($config['tags']), - 'file' => ((int) $this->repositoryModel->getObjectsCount($rKey, $uKey)['size-pack']) * 1024, + 'file' => ((int) $countObjects['size'] + (int) $countObjects['size-pack'] + (int) $countObjects['size-garbage']) * 1024, 'mergeRequest' => $this->repositoryModel->countMergeRequests($rKey), ];