diff options
| author | Chris Lu <chrislusf@users.noreply.github.com> | 2020-05-28 23:27:29 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-28 23:27:29 -0700 |
| commit | 5837fe72fc097ce3db4cd839cfc0f6dfe09f9051 (patch) | |
| tree | fc8a114c4aa05f59b4a25abdab9d1c150a63c5f3 /weed/server | |
| parent | 6286a454c7fa37198b7cffb8f895b8b9443ced8b (diff) | |
| parent | b4e93b639d95da4954052c583e2368baef2992c7 (diff) | |
| download | seaweedfs-5837fe72fc097ce3db4cd839cfc0f6dfe09f9051.tar.xz seaweedfs-5837fe72fc097ce3db4cd839cfc0f6dfe09f9051.zip | |
Merge pull request #1335 from bingoohuang/master
add BytesToHumanReadable for see_dat and see_idx
Diffstat (limited to 'weed/server')
| -rw-r--r-- | weed/server/volume_server_ui/templates.go | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/weed/server/volume_server_ui/templates.go b/weed/server/volume_server_ui/templates.go index a3175e9ca..8705bc088 100644 --- a/weed/server/volume_server_ui/templates.go +++ b/weed/server/volume_server_ui/templates.go @@ -2,24 +2,12 @@ package master_ui import ( "fmt" + "github.com/chrislusf/seaweedfs/weed/util" "html/template" "strconv" "strings" ) -func bytesToHumanReadble(b uint64) string { - const unit = 1024 - if b < unit { - return fmt.Sprintf("%d B", b) - } - div, exp := uint64(unit), 0 - for n := b / unit; n >= unit; n /= unit { - div *= unit - exp++ - } - return fmt.Sprintf("%.2f %ciB", float64(b)/float64(div), "KMGTPE"[exp]) -} - func percentFrom(total uint64, part_of uint64) string { return fmt.Sprintf("%.2f", (float64(part_of)/float64(total))*100) } @@ -33,9 +21,9 @@ func join(data []int64) string { } var funcMap = template.FuncMap{ - "join": join, - "bytesToHumanReadble": bytesToHumanReadble, - "percentFrom": percentFrom, + "join": join, + "bytesToHumanReadable": util.BytesToHumanReadable, + "percentFrom": percentFrom, } var StatusTpl = template.Must(template.New("status").Funcs(funcMap).Parse(`<!DOCTYPE html> @@ -90,8 +78,8 @@ var StatusTpl = template.Must(template.New("status").Funcs(funcMap).Parse(`<!DOC {{ range .DiskStatuses }} <tr> <td>{{ .Dir }}</td> - <td>{{ bytesToHumanReadble .All }}</td> - <td>{{ bytesToHumanReadble .Free }}</td> + <td>{{ bytesToHumanReadable .All }}</td> + <td>{{ bytesToHumanReadable .Free }}</td> <td>{{ percentFrom .All .Used}}%</td> </tr> {{ end }} @@ -151,9 +139,9 @@ var StatusTpl = template.Must(template.New("status").Funcs(funcMap).Parse(`<!DOC <tr> <td><code>{{ .Id }}</code></td> <td>{{ .Collection }}</td> - <td>{{ bytesToHumanReadble .Size }}</td> + <td>{{ bytesToHumanReadable .Size }}</td> <td>{{ .FileCount }}</td> - <td>{{ .DeleteCount }} / {{bytesToHumanReadble .DeletedByteCount}}</td> + <td>{{ .DeleteCount }} / {{bytesToHumanReadable .DeletedByteCount}}</td> <td>{{ .Ttl }}</td> <td>{{ .ReadOnly }}</td> </tr> @@ -181,9 +169,9 @@ var StatusTpl = template.Must(template.New("status").Funcs(funcMap).Parse(`<!DOC <tr> <td><code>{{ .Id }}</code></td> <td>{{ .Collection }}</td> - <td>{{ bytesToHumanReadble .Size }}</td> + <td>{{ bytesToHumanReadable .Size }}</td> <td>{{ .FileCount }}</td> - <td>{{ .DeleteCount }} / {{bytesToHumanReadble .DeletedByteCount}}</td> + <td>{{ .DeleteCount }} / {{bytesToHumanReadable .DeletedByteCount}}</td> <td>{{ .RemoteStorageName }}</td> <td>{{ .RemoteStorageKey }}</td> </tr> @@ -209,7 +197,7 @@ var StatusTpl = template.Must(template.New("status").Funcs(funcMap).Parse(`<!DOC <tr> <td><code>{{ .VolumeId }}</code></td> <td>{{ .Collection }}</td> - <td>{{ bytesToHumanReadble .ShardSize }}</td> + <td>{{ bytesToHumanReadable .ShardSize }}</td> <td>{{ .ShardIdList }}</td> <td>{{ .CreatedAt.Format "02 Jan 06 15:04 -0700" }}</td> </tr> |