From 649da240b260c58a4a20fbf71bcaf17cdaeb62b5 Mon Sep 17 00:00:00 2001 From: DmitryFrolovTri <23313323+DmitryFrolovTri@users.noreply.github.com> Date: Wed, 7 Jun 2023 17:24:52 +0000 Subject: [PATCH] Removing unneeded comments --- models/repo/repo.go | 38 +++----------------------------------- modules/base/tool.go | 3 --- 2 files changed, 3 insertions(+), 38 deletions(-) diff --git a/models/repo/repo.go b/models/repo/repo.go index 95e9684dfb1..e528afca04d 100644 --- a/models/repo/repo.go +++ b/models/repo/repo.go @@ -496,40 +496,8 @@ func (repo *Repository) IsOwnedBy(userID int64) bool { return repo.OwnerID == userID } -// TODO - DmitryFrolovTri Review every commented function and see if we need to reinstate it -// func (repo *Repository) computeSize() (int64, error) { -// size, err := util.GetDirectorySize(repo.RepoPath()) -// if err != nil { -// return 0, fmt.Errorf("computeSize: %v", err) -// } - -// objs, err := repo.GetLFSMetaObjects(repo.ID, -1, 0) -// if err != nil { -// return 0, fmt.Errorf("computeSize: GetLFSMetaObjects: %v", err) -// } -// for _, obj := range objs { -// size += obj.Size -// } - -// return size, nil -// } - -// func (repo *Repository) updateSize(ctx context.Context Engine) error { -// size, err := repo.computeSize() -// if err != nil { -// return fmt.Errorf("updateSize: %v", err) -// } - -// repo.Size = size -// _, err = e.ID(repo.ID).Cols("size").Update(repo) -// return err -// } - -// // UpdateSize updates the repository size, calculating it using util.GetDirectorySize -// func (repo *Repository) UpdateSize(ctx DBContext) error { -// return repo.updateSize(ctx.e) -// } - +// GetActualSizeLimit returns repository size limit in bytes +// or global repository limit setting if per repository size limit is not set func (repo *Repository) GetActualSizeLimit() int64 { sizeLimit := repo.SizeLimit if setting.RepoSizeLimit > 0 && sizeLimit == 0 { @@ -538,7 +506,7 @@ func (repo *Repository) GetActualSizeLimit() int64 { return sizeLimit } -// RepoSizeIsOversized return if is over size limitation +// RepoSizeIsOversized return true if is over size limitation func (repo *Repository) RepoSizeIsOversized(additionalSize int64) bool { return setting.EnableSizeLimit && repo.GetActualSizeLimit() > 0 && repo.Size+additionalSize > repo.GetActualSizeLimit() } diff --git a/modules/base/tool.go b/modules/base/tool.go index 5fe486b9b96..a6579ab5152 100644 --- a/modules/base/tool.go +++ b/modules/base/tool.go @@ -138,9 +138,6 @@ func CreateTimeLimitCode(data string, minutes int, startInf interface{}) string // FileSize calculates the file size and generate user-friendly string. func FileSize(s int64) string { - // sizes := []string{"B", "kB", "MB", "GB", "TB", "PB", "EB"} - // return humanize.humanateBytes(uint64(s), 1000, sizes) - // return humanize.Bytes(uint64(s)) return humanize.IBytes(uint64(s)) }