marc/scotty
1
0
Fork 0
mirror of https://git.sr.ht/~phw/scotty synced 2025-05-31 10:58:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify timestamp comparisons

Browse source
This commit is contained in:
Philipp Wolfer 2025-05-01 12:27:24 +02:00
parent 389c7c6ec1
commit c305b6c7e3
No known key found for this signature in database
GPG key ID: 8FDF744D4919943B
7 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
internal/backends/deezer/deezer.go
View file

@ -117,7 +117,7 @@ out:
listens := make(models.ListensList, 0, perPage)
for _, track := range result.Tracks {
listen := track.AsListen()
if listen.ListenedAt.Unix() > oldestTimestamp.Unix() {
if listen.ListenedAt.After(oldestTimestamp) {
listens = append(listens, listen)
} else {
break
@ -186,7 +186,7 @@ out:
loves := make(models.LovesList, 0, perPage)
for _, track := range result.Tracks {
love := track.AsLove()
if love.Created.Unix() > oldestTimestamp.Unix() {
if love.Created.After(oldestTimestamp) {
loves = append(loves, love)
} else {
totalCount -= 1

4
internal/backends/funkwhale/funkwhale.go
View file

@ -84,7 +84,7 @@ out:
for _, fwListen := range result.Results {
listen := fwListen.AsListen()
if listen.ListenedAt.Unix() > oldestTimestamp.Unix() {
if listen.ListenedAt.After(oldestTimestamp) {
p.Elapsed += 1
listens = append(listens, listen)
} else {
@ -135,7 +135,7 @@ out:
for _, favorite := range result.Results {
love := favorite.AsLove()
if love.Created.Unix() > oldestTimestamp.Unix() {
if love.Created.After(oldestTimestamp) {
p.Elapsed += 1
loves = append(loves, love)
} else {

2
internal/backends/listenbrainz/listenbrainz.go
View file

@ -246,7 +246,7 @@ out:
}
love := feedback.AsLove()
if love.Created.Unix() > oldestTimestamp.Unix() {
if love.Created.After(oldestTimestamp) {
loves = append(loves, love)
p.Elapsed += 1
} else {

4
internal/backends/spotify/spotify.go
View file

@ -139,7 +139,7 @@ func (b *SpotifyApiBackend) ExportListens(oldestTimestamp time.Time, results cha
for _, listen := range result.Items {
l := listen.AsListen()
if l.ListenedAt.Unix() > oldestTimestamp.Unix() {
if l.ListenedAt.After(oldestTimestamp) {
listens = append(listens, l)
} else {
// result contains listens older then oldestTimestamp
@ -195,7 +195,7 @@ out:
loves := make(models.LovesList, 0, perPage)
for _, track := range result.Items {
love := track.AsLove()
if love.Created.Unix() > oldestTimestamp.Unix() {
if love.Created.After(oldestTimestamp) {
loves = append(loves, love)
} else {
continue

2
internal/backends/subsonic/subsonic.go
View file

@ -90,7 +90,7 @@ func (b *SubsonicApiBackend) filterSongs(songs []*subsonic.Child, oldestTimestam
loves := make(models.LovesList, 0, len(songs))
for _, song := range songs {
love := SongAsLove(*song, b.client.User)
if love.Created.Unix() > oldestTimestamp.Unix() {
if love.Created.After(oldestTimestamp) {
loves = append(loves, love)
}
}

4
internal/cli/transfer.go
View file

@ -123,7 +123,7 @@ func (c *TransferCmd[E, I, R]) Transfer(exp backends.ExportProcessor[R], imp bac
resultChan := make(chan models.ImportResult)
go imp.Process(exportChan, resultChan, importProgress)
result := <-resultChan
if result.LastTimestamp.Unix() < timestamp.Unix() {
if timestamp.After(result.LastTimestamp) {
result.LastTimestamp = timestamp
}
wg.Wait()
@ -180,7 +180,7 @@ func (c *TransferCmd[E, I, R]) timestamp() (time.Time, error) {
}
func (c *TransferCmd[E, I, R]) updateTimestamp(result models.ImportResult, oldTimestamp time.Time) error {
if result.LastTimestamp.Unix() < oldTimestamp.Unix() {
if oldTimestamp.After(result.LastTimestamp) {
result.LastTimestamp = oldTimestamp
}
printTimestamp("Latest timestamp: %v (%v)", result.LastTimestamp)

8
internal/models/models.go
View file

@ -121,7 +121,7 @@ type ListensList []Listen
func (l ListensList) NewerThan(t time.Time) ListensList {
result := make(ListensList, 0, len(l))
for _, item := range l {
if item.ListenedAt.Unix() > t.Unix() {
if item.ListenedAt.After(t) {
result = append(result, item)
}
}
@ -133,7 +133,7 @@ func (l ListensList) Len() int {
}
func (l ListensList) Less(i, j int) bool {
return l[i].ListenedAt.Unix() < l[j].ListenedAt.Unix()
return l[j].ListenedAt.After(l[i].ListenedAt)
}
func (l ListensList) Swap(i, j int) {
@ -147,7 +147,7 @@ func (l LovesList) Len() int {
}
func (l LovesList) Less(i, j int) bool {
return l[i].Created.Unix() < l[j].Created.Unix()
return l[j].Created.After(l[i].Created)
}
func (l LovesList) Swap(i, j int) {
@ -190,7 +190,7 @@ type ImportResult struct {
// Sets LastTimestamp to newTime, if newTime is newer than LastTimestamp
func (i *ImportResult) UpdateTimestamp(newTime time.Time) {
if newTime.Unix() > i.LastTimestamp.Unix() {
if newTime.After(i.LastTimestamp) {
i.LastTimestamp = newTime
}
}