github/rclone
1
Fork 0
mirror of https://github.com/rclone/rclone synced 2024-12-22 13:03:02 +01:00
Code Releases Activity

fs/accounting: sort transfers by start time

Browse Source
This commit is contained in:
Max Sum 2020-06-16 23:18:32 +08:00 committed by Nick Craig-Wood
parent e2183ad661
commit bfa5715017
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/accounting/stats.go
View File

@ -72,8 +72,8 @@ func (s *StatsInfo) RemoteStats() (out rc.Params, err error) {
var c []string
s.checking.mu.RLock()
defer s.checking.mu.RUnlock()
for name := range s.checking.items {
c = append(c, name)
for _, tr := range s.checking.sortedSlice() {
c = append(c, tr.remote)
}
out["checking"] = c
}
@ -81,8 +81,8 @@ func (s *StatsInfo) RemoteStats() (out rc.Params, err error) {
s.transferring.mu.RLock()
var t []rc.Params
for name, tr := range s.transferring.items {
if acc := s.inProgress.get(name); acc != nil {
for _, tr := range s.transferring.sortedSlice() {
if acc := s.inProgress.get(tr.remote); acc != nil {
t = append(t, acc.RemoteStats())
} else {
t = append(t, s.transferRemoteStats(tr))

26
fs/accounting/transfermap.go
View File

@ -63,36 +63,48 @@ func (tm *transferMap) count() int {
return len(tm.items)
}
// sortedSlice returns all transfers sorted by start time
func (tm *transferMap) sortedSlice() []*Transfer {
tm.mu.RLock()
defer tm.mu.RUnlock()
s := make([]*Transfer, 0, len(tm.items))
for _, tr := range tm.items {
s = append(s, tr)
}
sort.Slice(s, func(i, j int) bool {
return s[i].startedAt.Before(s[j].startedAt)
})
return s
}
// String returns string representation of map items excluding any in
// exclude (if set).
func (tm *transferMap) String(progress *inProgress, exclude *transferMap) string {
tm.mu.RLock()
defer tm.mu.RUnlock()
strngs := make([]string, 0, len(tm.items))
for name, _ := range tm.items {
for _, tr := range tm.sortedSlice() {
if exclude != nil {
exclude.mu.RLock()
_, found := exclude.items[name]
_, found := exclude.items[tr.remote]
exclude.mu.RUnlock()
if found {
continue
}
}
var out string
if acc := progress.get(name); acc != nil {
if acc := progress.get(tr.remote); acc != nil {
out = acc.String()
} else {
out = fmt.Sprintf("%*s: %s",
fs.Config.StatsFileNameLength,
shortenName(name, fs.Config.StatsFileNameLength),
shortenName(tr.remote, fs.Config.StatsFileNameLength),
tm.name,
)
}
strngs = append(strngs, " * "+out)
}
sorted := sort.StringSlice(strngs)
sorted.Sort()
return strings.Join(sorted, "\n")
return strings.Join(strngs, "\n")
}
// progress returns total bytes read as well as the size.