diff --git a/backends/dump/dump.go b/backends/dump/dump.go index a946c6e..e81a1e8 100644 --- a/backends/dump/dump.go +++ b/backends/dump/dump.go @@ -32,8 +32,8 @@ func (b *DumpBackend) FromConfig(config *viper.Viper) models.Backend { return b } -func (b *DumpBackend) Init() error { return nil } -func (b *DumpBackend) Finish() error { return nil } +func (b *DumpBackend) StartImport() error { return nil } +func (b *DumpBackend) FinishImport() error { return nil } func (b *DumpBackend) ImportListens(export models.ListensResult, importResult models.ImportResult, progress chan models.Progress) (models.ImportResult, error) { for _, listen := range export.Listens { diff --git a/backends/jspf/jspf.go b/backends/jspf/jspf.go index 6bdfd8a..f99f09d 100644 --- a/backends/jspf/jspf.go +++ b/backends/jspf/jspf.go @@ -48,8 +48,8 @@ func (b *JspfBackend) FromConfig(config *viper.Viper) models.Backend { return b } -func (b *JspfBackend) Init() error { return nil } -func (b *JspfBackend) Finish() error { +func (b *JspfBackend) StartImport() error { return nil } +func (b *JspfBackend) FinishImport() error { err := b.writeJspf(b.tracks) return err } diff --git a/backends/listenbrainz/listenbrainz.go b/backends/listenbrainz/listenbrainz.go index 6b1132c..4360b9b 100644 --- a/backends/listenbrainz/listenbrainz.go +++ b/backends/listenbrainz/listenbrainz.go @@ -43,8 +43,8 @@ func (b *ListenBrainzApiBackend) FromConfig(config *viper.Viper) models.Backend return b } -func (b *ListenBrainzApiBackend) Init() error { return nil } -func (b *ListenBrainzApiBackend) Finish() error { return nil } +func (b *ListenBrainzApiBackend) StartImport() error { return nil } +func (b *ListenBrainzApiBackend) FinishImport() error { return nil } func (b *ListenBrainzApiBackend) ExportListens(oldestTimestamp time.Time, results chan models.ListensResult, progress chan models.Progress) { startTime := time.Now() diff --git a/backends/maloja/maloja.go b/backends/maloja/maloja.go index 72b82ff..3a3f9c7 100644 --- a/backends/maloja/maloja.go +++ b/backends/maloja/maloja.go @@ -45,8 +45,8 @@ func (b *MalojaApiBackend) FromConfig(config *viper.Viper) models.Backend { return b } -func (b *MalojaApiBackend) Init() error { return nil } -func (b *MalojaApiBackend) Finish() error { return nil } +func (b *MalojaApiBackend) StartImport() error { return nil } +func (b *MalojaApiBackend) FinishImport() error { return nil } func (b *MalojaApiBackend) ExportListens(oldestTimestamp time.Time, results chan models.ListensResult, progress chan models.Progress) { page := 0 diff --git a/backends/process.go b/backends/process.go index d16a867..4f73752 100644 --- a/backends/process.go +++ b/backends/process.go @@ -29,7 +29,7 @@ func ProcessListensImports(importer models.ListensImport, results chan models.Li defer close(progress) result := models.ImportResult{} - err := importer.Init() + err := importer.StartImport() if err != nil { handleError(result, err, out, progress) return @@ -52,7 +52,7 @@ func ProcessListensImports(importer models.ListensImport, results chan models.Li progress <- models.Progress{}.FromImportResult(result) } - err = importer.Finish() + err = importer.FinishImport() if err != nil { handleError(result, err, out, progress) return @@ -67,7 +67,7 @@ func ProcessLovesImports(importer models.LovesImport, results chan models.LovesR defer close(progress) result := models.ImportResult{} - err := importer.Init() + err := importer.StartImport() if err != nil { handleError(result, err, out, progress) return @@ -90,7 +90,7 @@ func ProcessLovesImports(importer models.LovesImport, results chan models.LovesR progress <- models.Progress{}.FromImportResult(result) } - err = importer.Finish() + err = importer.FinishImport() if err != nil { handleError(result, err, out, progress) return diff --git a/backends/scrobblerlog/scrobblerlog.go b/backends/scrobblerlog/scrobblerlog.go index e5c27ea..b6fd4a7 100644 --- a/backends/scrobblerlog/scrobblerlog.go +++ b/backends/scrobblerlog/scrobblerlog.go @@ -43,7 +43,7 @@ func (b *ScrobblerLogBackend) FromConfig(config *viper.Viper) models.Backend { return b } -func (b *ScrobblerLogBackend) Init() error { +func (b *ScrobblerLogBackend) StartImport() error { file, err := os.Create(b.filePath) if err != nil { return err @@ -64,7 +64,7 @@ func (b *ScrobblerLogBackend) Init() error { return nil } -func (b *ScrobblerLogBackend) Finish() error { +func (b *ScrobblerLogBackend) FinishImport() error { return b.file.Close() } diff --git a/models/interfaces.go b/models/interfaces.go index 6d2b294..14d3abb 100644 --- a/models/interfaces.go +++ b/models/interfaces.go @@ -39,11 +39,11 @@ type ImportBackend interface { // If the backend needs to setup resources before starting to import, // this can be done here. - Init() error + StartImport() error // The implementation can perform all steps here to finalize the // export/import and free used resources. - Finish() error + FinishImport() error } // Must be implemented by services supporting the export of listens.