tblyler/hoarder
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use floating points for download sizes

Browse source
This commit is contained in:
Tony Blyler 2016-05-13 19:09:14 -04:00
parent 3ebb4798dc
commit cab6926338
No known key found for this signature in database
GPG key ID: 25C9D3A655D1A65C
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
queue/queue.go
View file

@ -50,7 +50,7 @@ type Queue struct {
lock sync.RWMutex lock sync.RWMutex
} }
var prettyBytesValues = []int64{ var prettyBytesValues = []float64{
1024, 1024,
1024 * 1024, 1024 * 1024,
1024 * 1024 * 1024, 1024 * 1024 * 1024,
@ -68,8 +68,8 @@ var prettyBytesNames = []string{
"EiB", "EiB",
} }
func prettyBytes(bytes int64) string { func prettyBytes(bytes float64) string {
output := strconv.FormatInt(bytes, 10) + "B" output := strconv.FormatFloat(bytes, 'f', 2, 64) + "B"
for i, divisor := range prettyBytesValues { for i, divisor := range prettyBytesValues {
newBytes := bytes / divisor newBytes := bytes / divisor
if newBytes > 1024 { if newBytes > 1024 {
@ -80,7 +80,7 @@ func prettyBytes(bytes int64) string {
break break
} }
output = strconv.FormatInt(newBytes, 10) + prettyBytesNames[i] output = strconv.FormatFloat(newBytes, 'f', 2, 64) + prettyBytesNames[i]
} }
return output return output
@ -272,7 +272,7 @@ func (q *Queue) downloadTorrents(torrents []rtorrent.Torrent) {
} }
go func(torrentFilePath string, downloadPath string, torrent rtorrent.Torrent) { go func(torrentFilePath string, downloadPath string, torrent rtorrent.Torrent) {
q.logger.Printf("Downloading '%s' (%s) to '%s' (%s) %s", torrent.Name, torrentFilePath, downloadPath, destDownloadPath, prettyBytes(int64(torrent.Size))) q.logger.Printf("Downloading '%s' (%s) to '%s' (%s) %s", torrent.Name, torrentFilePath, downloadPath, destDownloadPath, prettyBytes(float64(torrent.Size)))
err := q.sftpClient.Mirror(torrent.Path, downloadPath) err := q.sftpClient.Mirror(torrent.Path, downloadPath)
if err != nil { if err != nil {
q.logger.Printf("Failed to download '%s' to '%s' error '%s'", torrent.Path, downloadPath, err) q.logger.Printf("Failed to download '%s' to '%s' error '%s'", torrent.Path, downloadPath, err)