diff --git a/internal/backends/deezer/deezer.go b/internal/backends/deezer/deezer.go index 7b6e1ad..756e271 100644 --- a/internal/backends/deezer/deezer.go +++ b/internal/backends/deezer/deezer.go @@ -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 diff --git a/internal/backends/funkwhale/funkwhale.go b/internal/backends/funkwhale/funkwhale.go index 99bf43d..3e296c1 100644 --- a/internal/backends/funkwhale/funkwhale.go +++ b/internal/backends/funkwhale/funkwhale.go @@ -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 { diff --git a/internal/backends/listenbrainz/listenbrainz.go b/internal/backends/listenbrainz/listenbrainz.go index d0074b1..cc2ac24 100644 --- a/internal/backends/listenbrainz/listenbrainz.go +++ b/internal/backends/listenbrainz/listenbrainz.go @@ -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 { diff --git a/internal/backends/spotify/spotify.go b/internal/backends/spotify/spotify.go index 1827769..8c17903 100644 --- a/internal/backends/spotify/spotify.go +++ b/internal/backends/spotify/spotify.go @@ -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 diff --git a/internal/backends/subsonic/subsonic.go b/internal/backends/subsonic/subsonic.go index 1c26bfd..d605324 100644 --- a/internal/backends/subsonic/subsonic.go +++ b/internal/backends/subsonic/subsonic.go @@ -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) } } diff --git a/internal/cli/transfer.go b/internal/cli/transfer.go index ade7ece..0ba04b9 100644 --- a/internal/cli/transfer.go +++ b/internal/cli/transfer.go @@ -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) diff --git a/internal/models/models.go b/internal/models/models.go index 18e3b44..f2dd71d 100644 --- a/internal/models/models.go +++ b/internal/models/models.go @@ -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 } }