marc/scotty
1
0
Fork 0
mirror of https://git.sr.ht/~phw/scotty synced 2025-05-11 18:47:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Show progress bars as aborted on export / import error

Browse source
This commit is contained in:
Philipp Wolfer 2025-05-04 12:59:40 +02:00
parent 15d939e150
commit aae5123c3d
No known key found for this signature in database
GPG key ID: 8FDF744D4919943B
12 changed files with 35 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -94,7 +94,7 @@ out:
for {
result, err := b.client.UserHistory(offset, perPage)
if err != nil {
progress <- p.Complete()
progress <- p.Abort()
results <- models.ListensResult{Error: err}
return
}
@ -160,7 +160,7 @@ out:
for {
result, err := b.client.UserTracks(offset, perPage)
if err != nil {
progress <- p.Complete()
progress <- p.Abort()
results <- models.LovesResult{Error: err}
return
}

2
internal/backends/import.go
View file

@ -118,6 +118,6 @@ func process[R models.LovesResult | models.ListensResult, P ImportProcessor[R]](
func handleError(result models.ImportResult, err error, progress chan models.Progress) models.ImportResult {
result.Error = err
progress <- models.Progress{}.FromImportResult(result).Complete()
progress <- models.Progress{}.FromImportResult(result).Abort()
return result
}

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

@ -96,7 +96,7 @@ func (b *JSPFBackend) FinishImport() error {
func (b *JSPFBackend) ExportListens(oldestTimestamp time.Time, results chan models.ListensResult, progress chan models.Progress) {
err := b.readJSPF()
if err != nil {
progress <- models.Progress{}.Complete()
progress <- models.Progress{}.Abort()
results <- models.ListensResult{Error: err}
return
}
@ -128,7 +128,7 @@ func (b *JSPFBackend) ImportListens(export models.ListensResult, importResult mo
func (b *JSPFBackend) ExportLoves(oldestTimestamp time.Time, results chan models.LovesResult, progress chan models.Progress) {
err := b.readJSPF()
if err != nil {
progress <- models.Progress{}.Complete()
progress <- models.Progress{}.Abort()
results <- models.LovesResult{Error: err}
return
}

8
internal/backends/lastfm/lastfm.go
View file

@ -108,7 +108,7 @@ out:
result, err := b.client.User.GetRecentTracks(args)
if err != nil {
results <- models.ListensResult{Error: err}
progress <- p.Complete()
progress <- p.Abort()
return
}
@ -127,7 +127,7 @@ out:
timestamp, err := strconv.ParseInt(scrobble.Date.Uts, 10, 64)
if err != nil {
results <- models.ListensResult{Error: err}
progress <- p.Complete()
progress <- p.Abort()
break out
}
if timestamp > oldestTimestamp.Unix() {
@ -268,7 +268,7 @@ out:
"page": page,
})
if err != nil {
progress <- p.Complete()
progress <- p.Abort()
results <- models.LovesResult{Error: err}
return
}
@ -282,7 +282,7 @@ out:
for _, track := range result.Tracks {
timestamp, err := strconv.ParseInt(track.Date.Uts, 10, 64)
if err != nil {
progress <- p.Complete()
progress <- p.Abort()
results <- models.LovesResult{Error: err}
return
}

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

@ -86,7 +86,7 @@ func (b *ListenBrainzApiBackend) ExportListens(oldestTimestamp time.Time, result
for {
result, err := b.client.GetListens(b.username, time.Now(), minTime)
if err != nil {
progress <- p.Complete()
progress <- p.Abort()
results <- models.ListensResult{Error: err}
return
}
@ -199,8 +199,9 @@ func (b *ListenBrainzApiBackend) ExportLoves(oldestTimestamp time.Time, results
go b.exportLoves(oldestTimestamp, exportChan)
for existingLoves := range exportChan {
if existingLoves.Error != nil {
progress <- p.Complete()
progress <- p.Abort()
results <- models.LovesResult{Error: existingLoves.Error}
return
}
p.Total = int64(existingLoves.Total)

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

@ -134,7 +134,7 @@ func (b *ScrobblerLogBackend) FinishImport() error {
func (b *ScrobblerLogBackend) ExportListens(oldestTimestamp time.Time, results chan models.ListensResult, progress chan models.Progress) {
file, err := os.Open(b.filePath)
if err != nil {
progress <- models.Progress{}.Complete()
progress <- models.Progress{}.Abort()
results <- models.ListensResult{Error: err}
return
}

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

@ -106,7 +106,7 @@ func (b *SpotifyApiBackend) ExportListens(oldestTimestamp time.Time, results cha
for {
result, err := b.client.RecentlyPlayedAfter(minTime, MaxItemsPerGet)
if err != nil {
progress <- p.Complete()
progress <- p.Abort()
results <- models.ListensResult{Error: err}
return
}
@ -118,7 +118,7 @@ func (b *SpotifyApiBackend) ExportListens(oldestTimestamp time.Time, results cha
// Set minTime to the newest returned listen
after, err := strconv.ParseInt(result.Cursors.After, 10, 64)
if err != nil {
progress <- p.Complete()
progress <- p.Abort()
results <- models.ListensResult{Error: err}
return
} else if after <= minTime.Unix() {
@ -169,7 +169,7 @@ out:
for {
result, err := b.client.UserTracks(offset, perPage)
if err != nil {
progress <- p.Complete()
progress <- p.Abort()
results <- models.LovesResult{Error: err}
return
}

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

@ -75,7 +75,7 @@ func (b *SpotifyHistoryBackend) InitConfig(config *config.ServiceConfig) error {
func (b *SpotifyHistoryBackend) ExportListens(oldestTimestamp time.Time, results chan models.ListensResult, progress chan models.Progress) {
files, err := filepath.Glob(path.Join(b.dirPath, historyFileGlob))
if err != nil {
progress <- models.Progress{}.Complete()
progress <- models.Progress{}.Abort()
results <- models.ListensResult{Error: err}
return
}
@ -86,7 +86,7 @@ func (b *SpotifyHistoryBackend) ExportListens(oldestTimestamp time.Time, results
for i, filePath := range files {
history, err := readHistoryFile(filePath)
if err != nil {
progress <- models.Progress{}.Complete()
progress <- models.Progress{}.Abort()
results <- models.ListensResult{Error: err}
return
}

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

@ -66,14 +66,14 @@ func (b *SubsonicApiBackend) InitConfig(config *config.ServiceConfig) error {
func (b *SubsonicApiBackend) ExportLoves(oldestTimestamp time.Time, results chan models.LovesResult, progress chan models.Progress) {
err := b.client.Authenticate(b.password)
if err != nil {
progress <- models.Progress{}.Complete()
progress <- models.Progress{}.Abort()
results <- models.LovesResult{Error: err}
return
}
starred, err := b.client.GetStarred2(map[string]string{})
if err != nil {
progress <- models.Progress{}.Complete()
progress <- models.Progress{}.Abort()
results <- models.LovesResult{Error: err}
return
}