mirror of
https://github.com/rclone/rclone.git
synced 2024-11-26 10:25:03 +01:00
5990573ccd
This fixes several things wrong with the layout of the stats. Transfers which haven't started are printed in the same format as those which have so the stats with `--progress` don't show horrible artifacts. Checkers and transfers now get a ": checkers" and ": transfers" label on the end of the stats line. Transfers will have the transfer stats when the transfer has started instead of this. There was a bug in the routine which shortened the file names (it always produces strings 1 too long). This is now fixed with a test. The formatting string was wrong with a fixed width of 45 - this is now replaces with the value of `--stats-file-name-length`. This also meant that there were unecessary leading spaces in the file names. So the default `--stats-file-name-length` was raised to 45 from 40.
98 lines
2.1 KiB
Go
98 lines
2.1 KiB
Go
package accounting
|
|
|
|
import (
|
|
"fmt"
|
|
"sort"
|
|
"strings"
|
|
"sync"
|
|
|
|
"github.com/ncw/rclone/fs"
|
|
)
|
|
|
|
// stringSet holds a set of strings
|
|
type stringSet struct {
|
|
mu sync.RWMutex
|
|
items map[string]struct{}
|
|
name string
|
|
}
|
|
|
|
// newStringSet creates a new empty string set of capacity size
|
|
func newStringSet(size int, name string) *stringSet {
|
|
return &stringSet{
|
|
items: make(map[string]struct{}, size),
|
|
name: name,
|
|
}
|
|
}
|
|
|
|
// add adds remote to the set
|
|
func (ss *stringSet) add(remote string) {
|
|
ss.mu.Lock()
|
|
ss.items[remote] = struct{}{}
|
|
ss.mu.Unlock()
|
|
}
|
|
|
|
// del removes remote from the set
|
|
func (ss *stringSet) del(remote string) {
|
|
ss.mu.Lock()
|
|
delete(ss.items, remote)
|
|
ss.mu.Unlock()
|
|
}
|
|
|
|
// empty returns whether the set has any items
|
|
func (ss *stringSet) empty() bool {
|
|
ss.mu.RLock()
|
|
defer ss.mu.RUnlock()
|
|
return len(ss.items) == 0
|
|
}
|
|
|
|
// count returns the number of items in the set
|
|
func (ss *stringSet) count() int {
|
|
ss.mu.RLock()
|
|
defer ss.mu.RUnlock()
|
|
return len(ss.items)
|
|
}
|
|
|
|
// Strings returns all the strings in the stringSet
|
|
func (ss *stringSet) Strings() []string {
|
|
ss.mu.RLock()
|
|
defer ss.mu.RUnlock()
|
|
strings := make([]string, 0, len(ss.items))
|
|
for name := range ss.items {
|
|
var out string
|
|
if acc := Stats.inProgress.get(name); acc != nil {
|
|
out = acc.String()
|
|
} else {
|
|
out = fmt.Sprintf("%*s: %s",
|
|
fs.Config.StatsFileNameLength,
|
|
shortenName(name, fs.Config.StatsFileNameLength),
|
|
ss.name,
|
|
)
|
|
}
|
|
strings = append(strings, " * "+out)
|
|
}
|
|
sorted := sort.StringSlice(strings)
|
|
sorted.Sort()
|
|
return sorted
|
|
}
|
|
|
|
// String returns all the file names in the stringSet joined by newline
|
|
func (ss *stringSet) String() string {
|
|
return strings.Join(ss.Strings(), "\n")
|
|
}
|
|
|
|
// progress returns total bytes read as well as the size.
|
|
func (ss *stringSet) progress() (totalBytes, totalSize int64) {
|
|
ss.mu.RLock()
|
|
defer ss.mu.RUnlock()
|
|
for name := range ss.items {
|
|
if acc := Stats.inProgress.get(name); acc != nil {
|
|
bytes, size := acc.progress()
|
|
if size >= 0 && bytes >= 0 {
|
|
totalBytes += bytes
|
|
totalSize += size
|
|
}
|
|
}
|
|
}
|
|
return totalBytes, totalSize
|
|
}
|