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

Fix duplicate calls to handle import errors

Browse source 
This fixes the import process hanging on error
This commit is contained in:
Philipp Wolfer 2025-05-02 09:25:07 +02:00
parent 5fb1596d61
commit 338b2654ef
No known key found for this signature in database
GPG key ID: 8FDF744D4919943B
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
internal/backends/import.go
View file

@ -1,5 +1,5 @@
/* /*
Copyright © 2023 Philipp Wolfer <phw@uploadedlobster.com> Copyright © 2023-2025 Philipp Wolfer <phw@uploadedlobster.com>
This file is part of Scotty. This file is part of Scotty.
@ -41,7 +41,7 @@ func (p ListensImportProcessor) Process(results chan models.ListensResult, out c
func (p ListensImportProcessor) Import(export models.ListensResult, result models.ImportResult, out chan models.ImportResult, progress chan models.Progress) (models.ImportResult, error) { func (p ListensImportProcessor) Import(export models.ListensResult, result models.ImportResult, out chan models.ImportResult, progress chan models.Progress) (models.ImportResult, error) {
if export.Error != nil { if export.Error != nil {
return handleError(result, export.Error, progress), export.Error return result, export.Error
} }
if export.Total > 0 { if export.Total > 0 {
@ -51,7 +51,7 @@ func (p ListensImportProcessor) Import(export models.ListensResult, result model
} }
importResult, err := p.Backend.ImportListens(export, result, progress) importResult, err := p.Backend.ImportListens(export, result, progress)
if err != nil { if err != nil {
return handleError(result, err, progress), err return result, err
} }
return importResult, nil return importResult, nil
} }
@ -70,7 +70,7 @@ func (p LovesImportProcessor) Process(results chan models.LovesResult, out chan
func (p LovesImportProcessor) Import(export models.LovesResult, result models.ImportResult, out chan models.ImportResult, progress chan models.Progress) (models.ImportResult, error) { func (p LovesImportProcessor) Import(export models.LovesResult, result models.ImportResult, out chan models.ImportResult, progress chan models.Progress) (models.ImportResult, error) {
if export.Error != nil { if export.Error != nil {
return handleError(result, export.Error, progress), export.Error return result, export.Error
} }
if export.Total > 0 { if export.Total > 0 {
@ -80,7 +80,7 @@ func (p LovesImportProcessor) Import(export models.LovesResult, result models.Im
} }
importResult, err := p.Backend.ImportLoves(export, result, progress) importResult, err := p.Backend.ImportLoves(export, result, progress)
if err != nil { if err != nil {
return handleError(importResult, err, progress), err return result, err
} }
return importResult, nil return importResult, nil
} }