-
-
Notifications
You must be signed in to change notification settings - Fork 5.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactor template & test related code (#32938)
Move some legacy code from "base" package to proper packages.
- Loading branch information
1 parent
afe314f
commit a163c53
Showing
109 changed files
with
479 additions
and
476 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
// Copyright 2024 The Gitea Authors. All rights reserved. | ||
// SPDX-License-Identifier: MIT | ||
|
||
package templates | ||
|
||
import ( | ||
"fmt" | ||
|
||
"code.gitea.io/gitea/modules/util" | ||
) | ||
|
||
func timeEstimateString(timeSec any) string { | ||
v, _ := util.ToInt64(timeSec) | ||
if v == 0 { | ||
return "" | ||
} | ||
return util.TimeEstimateString(v) | ||
} | ||
|
||
func countFmt(data any) string { | ||
// legacy code, not ideal, still used in some places | ||
num, err := util.ToInt64(data) | ||
if err != nil { | ||
return "" | ||
} | ||
if num < 1000 { | ||
return fmt.Sprintf("%d", num) | ||
} else if num < 1_000_000 { | ||
num2 := float32(num) / 1000.0 | ||
return fmt.Sprintf("%.1fk", num2) | ||
} else if num < 1_000_000_000 { | ||
num2 := float32(num) / 1_000_000.0 | ||
return fmt.Sprintf("%.1fM", num2) | ||
} | ||
num2 := float32(num) / 1_000_000_000.0 | ||
return fmt.Sprintf("%.1fG", num2) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
// Copyright 2024 The Gitea Authors. All rights reserved. | ||
// SPDX-License-Identifier: MIT | ||
|
||
package templates | ||
|
||
import ( | ||
"testing" | ||
|
||
"github.com/stretchr/testify/assert" | ||
) | ||
|
||
func TestCountFmt(t *testing.T) { | ||
assert.Equal(t, "125", countFmt(125)) | ||
assert.Equal(t, "1.3k", countFmt(int64(1317))) | ||
assert.Equal(t, "21.3M", countFmt(21317675)) | ||
assert.Equal(t, "45.7G", countFmt(45721317675)) | ||
assert.Equal(t, "", countFmt("test")) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.