Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

progress: secondary sort by start time #271

Merged
merged 1 commit into from
Aug 12, 2023
Merged

progress: secondary sort by start time #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
38 changes: 17 additions & 21 deletions progress/tracker_sort.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ func (sb SortBy) Sort(trackers []*Tracker) {
case SortByMessage:
sort.Sort(sortByMessage(trackers))
case SortByMessageDsc:
sort.Sort(sortByMessageDsc(trackers))
sort.Sort(sortDsc{sortByMessage(trackers)})
case SortByPercent:
sort.Sort(sortByPercent(trackers))
case SortByPercentDsc:
sort.Sort(sortByPercentDsc(trackers))
sort.Sort(sortDsc{sortByPercent(trackers)})
case SortByValue:
sort.Sort(sortByValue(trackers))
case SortByValueDsc:
sort.Sort(sortByValueDsc(trackers))
sort.Sort(sortDsc{sortByValue(trackers)})
default:
// no sort
}
Expand All @@ -54,32 +54,28 @@ func (sb sortByMessage) Len() int { return len(sb) }
func (sb sortByMessage) Swap(i, j int) { sb[i], sb[j] = sb[j], sb[i] }
func (sb sortByMessage) Less(i, j int) bool { return sb[i].message() < sb[j].message() }

type sortByMessageDsc []*Tracker

func (sb sortByMessageDsc) Len() int { return len(sb) }
func (sb sortByMessageDsc) Swap(i, j int) { sb[i], sb[j] = sb[j], sb[i] }
func (sb sortByMessageDsc) Less(i, j int) bool { return sb[i].message() > sb[j].message() }

type sortByPercent []*Tracker

func (sb sortByPercent) Len() int { return len(sb) }
func (sb sortByPercent) Swap(i, j int) { sb[i], sb[j] = sb[j], sb[i] }
func (sb sortByPercent) Less(i, j int) bool { return sb[i].PercentDone() < sb[j].PercentDone() }

type sortByPercentDsc []*Tracker

func (sb sortByPercentDsc) Len() int { return len(sb) }
func (sb sortByPercentDsc) Swap(i, j int) { sb[i], sb[j] = sb[j], sb[i] }
func (sb sortByPercentDsc) Less(i, j int) bool { return sb[i].PercentDone() > sb[j].PercentDone() }
func (sb sortByPercent) Less(i, j int) bool {
if sb[i].PercentDone() == sb[j].PercentDone() {
return sb[i].timeStart.Before(sb[j].timeStart)
}
return sb[i].PercentDone() < sb[j].PercentDone()
}

type sortByValue []*Tracker

func (sb sortByValue) Len() int { return len(sb) }
func (sb sortByValue) Swap(i, j int) { sb[i], sb[j] = sb[j], sb[i] }
func (sb sortByValue) Less(i, j int) bool { return sb[i].value < sb[j].value }
func (sb sortByValue) Less(i, j int) bool {
if sb[i].value == sb[j].value {
return sb[i].timeStart.Before(sb[j].timeStart)
}
return sb[i].value < sb[j].value
}

type sortByValueDsc []*Tracker
type sortDsc struct{ sort.Interface }

func (sb sortByValueDsc) Len() int { return len(sb) }
func (sb sortByValueDsc) Swap(i, j int) { sb[i], sb[j] = sb[j], sb[i] }
func (sb sortByValueDsc) Less(i, j int) bool { return sb[i].value > sb[j].value }
func (sd sortDsc) Less(i, j int) bool { return !sd.Interface.Less(i, j) }
27 changes: 18 additions & 9 deletions progress/tracker_sort_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package progress

import (
"testing"
"time"

"github.com/stretchr/testify/assert"
)
Expand All @@ -11,40 +12,48 @@ func TestSortBy(t *testing.T) {
{Message: "Downloading File # 2", Total: 1000, value: 300},
{Message: "Downloading File # 1", Total: 1000, value: 100},
{Message: "Downloading File # 3", Total: 1000, value: 500},
{Message: "Downloading File # 4", Total: 1000, value: 300, timeStart: time.Now()},
}

SortByNone.Sort(trackers)
assert.Equal(t, "Downloading File # 2", trackers[0].Message)
assert.Equal(t, "Downloading File # 1", trackers[1].Message)
assert.Equal(t, "Downloading File # 3", trackers[2].Message)
assert.Equal(t, "Downloading File # 4", trackers[3].Message)

SortByMessage.Sort(trackers)
assert.Equal(t, "Downloading File # 1", trackers[0].Message)
assert.Equal(t, "Downloading File # 2", trackers[1].Message)
assert.Equal(t, "Downloading File # 3", trackers[2].Message)
assert.Equal(t, "Downloading File # 4", trackers[3].Message)

SortByMessageDsc.Sort(trackers)
assert.Equal(t, "Downloading File # 3", trackers[0].Message)
assert.Equal(t, "Downloading File # 2", trackers[1].Message)
assert.Equal(t, "Downloading File # 1", trackers[2].Message)
assert.Equal(t, "Downloading File # 4", trackers[0].Message)
assert.Equal(t, "Downloading File # 3", trackers[1].Message)
assert.Equal(t, "Downloading File # 2", trackers[2].Message)
assert.Equal(t, "Downloading File # 1", trackers[3].Message)

SortByPercent.Sort(trackers)
assert.Equal(t, "Downloading File # 1", trackers[0].Message)
assert.Equal(t, "Downloading File # 2", trackers[1].Message)
assert.Equal(t, "Downloading File # 3", trackers[2].Message)
assert.Equal(t, "Downloading File # 4", trackers[2].Message)
assert.Equal(t, "Downloading File # 3", trackers[3].Message)

SortByPercentDsc.Sort(trackers)
assert.Equal(t, "Downloading File # 3", trackers[0].Message)
assert.Equal(t, "Downloading File # 2", trackers[1].Message)
assert.Equal(t, "Downloading File # 1", trackers[2].Message)
assert.Equal(t, "Downloading File # 4", trackers[1].Message)
assert.Equal(t, "Downloading File # 2", trackers[2].Message)
assert.Equal(t, "Downloading File # 1", trackers[3].Message)

SortByValue.Sort(trackers)
assert.Equal(t, "Downloading File # 1", trackers[0].Message)
assert.Equal(t, "Downloading File # 2", trackers[1].Message)
assert.Equal(t, "Downloading File # 3", trackers[2].Message)
assert.Equal(t, "Downloading File # 4", trackers[2].Message)
assert.Equal(t, "Downloading File # 3", trackers[3].Message)

SortByValueDsc.Sort(trackers)
assert.Equal(t, "Downloading File # 3", trackers[0].Message)
assert.Equal(t, "Downloading File # 2", trackers[1].Message)
assert.Equal(t, "Downloading File # 1", trackers[2].Message)
assert.Equal(t, "Downloading File # 4", trackers[1].Message)
assert.Equal(t, "Downloading File # 2", trackers[2].Message)
assert.Equal(t, "Downloading File # 1", trackers[3].Message)
}