Split lfs size from repository size

models/migrations/migrations.go

@@ -457,6 +457,8 @@ var migrations = []Migration{
 	NewMigration("Add actions tables", v1_19.AddActionsTables),
 	// v241 -> v242
 	NewMigration("Add card_type column to project table", v1_19.AddCardTypeToProjectTable),
+	// v242 -> v243
+	NewMigration("Add lfs_size column to repository table", v1_19.AddLFSSizeToRepositoryTable),
 }
 
 // GetCurrentDBVersion returns the current db version

models/migrations/v1_19/v242.go

@@ -0,0 +1,17 @@
+// Copyright 2023 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package v1_19 //nolint
+
+import (
+	"xorm.io/xorm"
+)
+
+// AddLFSSizeToRepositoryTable: add LFSSize column to Repository
+func AddLFSSizeToRepositoryTable(x *xorm.Engine) error {
+	type Repository struct {
+		LFSSize int64 `xorm:"NOT NULL DEFAULT 0"`
+	}
+
+	return x.Sync2(new(Repository))
+}

models/repo/repo.go

@@ -163,6 +163,7 @@ type Repository struct {
 	IsTemplate                      bool               `xorm:"INDEX NOT NULL DEFAULT false"`
 	TemplateID                      int64              `xorm:"INDEX"`
 	Size                            int64              `xorm:"NOT NULL DEFAULT 0"`
+	LFSSize                         int64              `xorm:"NOT NULL DEFAULT 0"`
 	CodeIndexerStatus               *RepoIndexerStatus `xorm:"-"`
 	StatsIndexerStatus              *RepoIndexerStatus `xorm:"-"`
 	IsFsckEnabled                   bool               `xorm:"NOT NULL DEFAULT true"`

models/repo/update.go

@@ -185,9 +185,10 @@ func ChangeRepositoryName(doer *user_model.User, repo *Repository, newRepoName s
 }
 
 // UpdateRepoSize updates the repository size, calculating it using getDirectorySize
-func UpdateRepoSize(ctx context.Context, repoID, size int64) error {
-	_, err := db.GetEngine(ctx).ID(repoID).Cols("size").NoAutoTime().Update(&Repository{
-		Size: size,
+func UpdateRepoSize(ctx context.Context, repoID, size, lfsSize int64) error {
+	_, err := db.GetEngine(ctx).ID(repoID).Cols("size", "lfs_size").NoAutoTime().Update(&Repository{
+		Size:    size,
+		LFSSize: lfsSize,
 	})
 	return err
 }

modules/repository/create.go

@@ -330,7 +330,7 @@ func UpdateRepoSize(ctx context.Context, repo *repo_model.Repository) error {
 		return fmt.Errorf("updateSize: GetLFSMetaObjects: %w", err)
 	}
 
-	return repo_model.UpdateRepoSize(ctx, repo.ID, size+lfsSize)
+	return repo_model.UpdateRepoSize(ctx, repo.ID, size, lfsSize)
 }
 
 // CheckDaemonExportOK creates/removes git-daemon-export-ok for git-daemon...

modules/templates/helper.go

@@ -120,11 +120,31 @@ func NewFuncMap() []template.FuncMap {
 		"Subtract":       base.Subtract,
 		"EntryIcon":      base.EntryIcon,
 		"MigrationIcon":  MigrationIcon,
-		"Add": func(a ...int) int {
-			sum := 0
+		"Add": func(a ...interface{}) interface{} {
+			sum := int64(0)
+
 			for _, val := range a {
-				sum += val
+				switch v := val.(type) {
+				case int:
+					sum += int64(v)
+				case int32:
+					sum += int64(v)
+				case int64:
+					sum += v
+				default:
+					return -1
+				}
 			}
+
+			if len(a) > 0 {
+				switch a[0].(type) {
+				case int:
+					return int(sum)
+				case int32:
+					return int32(sum)
+				}
+			}
+
 			return sum
 		},
 		"Mul": func(a ...int) int {

services/convert/repository.go

@@ -148,7 +148,7 @@ func innerToRepo(ctx context.Context, repo *repo_model.Repository, mode perm.Acc
 		Template:                      repo.IsTemplate,
 		Empty:                         repo.IsEmpty,
 		Archived:                      repo.IsArchived,
-		Size:                          int(repo.Size / 1024),
+		Size:                          int((repo.Size + repo.LFSSize) / 1024),
 		Fork:                          repo.IsFork,
 		Parent:                        parent,
 		Mirror:                        repo.IsMirror,

templates/repo/settings/options.tmpl

@@ -16,9 +16,9 @@
 					<label for="repo_name">{{.locale.Tr "repo.repo_name"}}</label>
 					<input id="repo_name" name="repo_name" value="{{.Repository.Name}}" data-repo-name="{{.Repository.Name}}" autofocus required>
 				</div>
-				<div class="inline field">
+				<div class="inline field" {{if not (eq .Repository.LFSSize 0)}}title="git: {{FileSize .Repository.Size}}, lfs: {{FileSize .Repository.LFSSize}}"{{end}}>
 					<label>{{.locale.Tr "repo.repo_size"}}</label>
-					<span>{{FileSize .Repository.Size}}</span>
+					<span>{{FileSize (Add .Repository.Size .Repository.LFSSize)}}</span>
 				</div>
 				<div class="inline field">
 					<label>{{.locale.Tr "repo.template"}}</label>

templates/repo/sub_menu.tmpl

@@ -15,7 +15,10 @@
 					</div>
 				{{end}}
 				<div class="item">
-					<span class="ui">{{svg "octicon-database"}} <b>{{FileSize .Repository.Size}}</b></span>
+					<span class="ui" {{if not (eq .Repository.LFSSize 0)}}title="git: {{FileSize .Repository.Size}}, lfs: {{FileSize .Repository.LFSSize}}"{{end}}>
+						{{svg "octicon-database"}}
+						<b>{{FileSize (Add .Repository.Size .Repository.LFSSize)}}</b>
+					</span>
 				</div>
 			{{end}}
 		</div>

templates/user/settings/repos.tmpl

@@ -27,7 +27,9 @@
 											<span class="icon">{{svg "octicon-repo"}}</span>
 										{{end}}
 										<a class="name" href="{{$repo.Link}}">{{$repo.OwnerName}}/{{$repo.Name}}</a>
-										<span>{{FileSize $repo.Size}}</span>
+										<span  {{if not (eq $repo.LFSSize 0)}}title="git: {{FileSize $repo.Size}}, lfs: {{FileSize $repo.LFSSize}}"{{end}}>
+											{{FileSize (Add $repo.Size $repo.LFSSize)}}
+										</span>
 										{{if $repo.IsFork}}
 											{{$.locale.Tr "repo.forked_from"}}
 											<span><a href="{{$repo.BaseRepo.Link}}">{{$repo.BaseRepo.OwnerName}}/{{$repo.BaseRepo.Name}}</a></span>