mirror of
https://git.sr.ht/~phw/scotty
synced 2025-05-10 02:07:05 +02:00
Call "FinishImport" even on error
This gives the importer the chance to close connections and free resources to ensure already imported items are properly handled.
This commit is contained in:
parent
338b2654ef
commit
873a1b88af
1 changed files with 3 additions and 4 deletions
|
@ -90,8 +90,7 @@ func process[R models.LovesResult | models.ListensResult, P ImportProcessor[R]](
|
||||||
defer close(progress)
|
defer close(progress)
|
||||||
result := models.ImportResult{}
|
result := models.ImportResult{}
|
||||||
|
|
||||||
err := processor.ImportBackend().StartImport()
|
if err := processor.ImportBackend().StartImport(); err != nil {
|
||||||
if err != nil {
|
|
||||||
out <- handleError(result, err, progress)
|
out <- handleError(result, err, progress)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
@ -99,6 +98,7 @@ func process[R models.LovesResult | models.ListensResult, P ImportProcessor[R]](
|
||||||
for exportResult := range results {
|
for exportResult := range results {
|
||||||
importResult, err := processor.Import(exportResult, result, out, progress)
|
importResult, err := processor.Import(exportResult, result, out, progress)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
processor.ImportBackend().FinishImport()
|
||||||
out <- handleError(result, err, progress)
|
out <- handleError(result, err, progress)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
@ -106,8 +106,7 @@ func process[R models.LovesResult | models.ListensResult, P ImportProcessor[R]](
|
||||||
progress <- models.Progress{}.FromImportResult(result)
|
progress <- models.Progress{}.FromImportResult(result)
|
||||||
}
|
}
|
||||||
|
|
||||||
err = processor.ImportBackend().FinishImport()
|
if err := processor.ImportBackend().FinishImport(); err != nil {
|
||||||
if err != nil {
|
|
||||||
out <- handleError(result, err, progress)
|
out <- handleError(result, err, progress)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue