gabehf/Koito
1
0
Fork 0
mirror of https://github.com/gabehf/Koito.git synced 2026-04-22 12:01:52 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Maloja importer resilience: nil MBZ client, null album, error handling

Browse source 
Root cause of the panic at ~1,693 items: importers created
`&mbz.MusicBrainzClient{}` (nil requestQueue) instead of using the
engine's properly initialized client. When any code path called an MBZ
method, it panicked on the nil channel.

Changes:
- Pass engine's MBZ client to Maloja and Spotify importers
- Change MalojaTrack.Album to pointer type to handle null album JSON
- Continue on error instead of aborting the entire import
- Accept both Maloja export formats ("scrobbles" and "list" keys)
- Extract per-file import into importFile() with its own defer/recover
- Add progress logging every 500 items

Test fixtures:
- maloja_import_null_album_test.json (null album, valid album, empty artists)
- maloja_api_format_test.json (API "list" format)

New tests: TestImportMaloja_NullAlbum, TestImportMaloja_ApiFormat

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
safierinx-a 2026-03-24 23:58:45 +05:30
parent 0ec7b458cc
commit c2d393aa03
6 changed files with 224 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

80
engine/engine.go
View file

@ -263,47 +263,51 @@ func RunImporter(l *zerolog.Logger, store db.DB, mbzc mbz.MusicBrainzCaller) {
} else {
return
}
defer func() {
if r := recover(); r != nil {
l.Error().Interface("recover", r).Msg("Importer: Panic when importing files")
}
}()
for _, file := range files {
if file.IsDir() {
continue
}
if strings.Contains(file.Name(), "Streaming_History_Audio") {
l.Info().Msgf("Importer: Import file %s detecting as being Spotify export", file.Name())
err := importer.ImportSpotifyFile(logger.NewContext(l), store, file.Name())
if err != nil {
l.Err(err).Msgf("Importer: Failed to import file: %s", file.Name())
}
} else if strings.Contains(file.Name(), "maloja") {
l.Info().Msgf("Importer: Import file %s detecting as being Maloja export", file.Name())
err := importer.ImportMalojaFile(logger.NewContext(l), store, file.Name())
if err != nil {
l.Err(err).Msgf("Importer: Failed to import file: %s", file.Name())
}
} else if strings.Contains(file.Name(), "recenttracks") {
l.Info().Msgf("Importer: Import file %s detecting as being ghan.nl LastFM export", file.Name())
err := importer.ImportLastFMFile(logger.NewContext(l), store, mbzc, file.Name())
if err != nil {
l.Err(err).Msgf("Importer: Failed to import file: %s", file.Name())
}
} else if strings.Contains(file.Name(), "listenbrainz") {
l.Info().Msgf("Importer: Import file %s detecting as being ListenBrainz export", file.Name())
err := importer.ImportListenBrainzExport(logger.NewContext(l), store, mbzc, file.Name())
if err != nil {
l.Err(err).Msgf("Importer: Failed to import file: %s", file.Name())
}
} else if strings.Contains(file.Name(), "koito") {
l.Info().Msgf("Importer: Import file %s detecting as being Koito export", file.Name())
err := importer.ImportKoitoFile(logger.NewContext(l), store, file.Name())
if err != nil {
l.Err(err).Msgf("Importer: Failed to import file: %s", file.Name())
}
} else {
l.Warn().Msgf("Importer: File %s not recognized as a valid import file; make sure it is valid and named correctly", file.Name())
}
importFile(l, store, mbzc, file.Name())
}
}
func importFile(l *zerolog.Logger, store db.DB, mbzc mbz.MusicBrainzCaller, filename string) {
defer func() {
if r := recover(); r != nil {
l.Error().Interface("recover", r).Msgf("Importer: Panic when importing file: %s", filename)
}
}()
if strings.Contains(filename, "Streaming_History_Audio") {
l.Info().Msgf("Importer: Import file %s detecting as being Spotify export", filename)
err := importer.ImportSpotifyFile(logger.NewContext(l), store, mbzc, filename)
if err != nil {
l.Err(err).Msgf("Importer: Failed to import file: %s", filename)
}
} else if strings.Contains(filename, "maloja") {
l.Info().Msgf("Importer: Import file %s detecting as being Maloja export", filename)
err := importer.ImportMalojaFile(logger.NewContext(l), store, mbzc, filename)
if err != nil {
l.Err(err).Msgf("Importer: Failed to import file: %s", filename)
}
} else if strings.Contains(filename, "recenttracks") {
l.Info().Msgf("Importer: Import file %s detecting as being ghan.nl LastFM export", filename)
err := importer.ImportLastFMFile(logger.NewContext(l), store, mbzc, filename)
if err != nil {
l.Err(err).Msgf("Importer: Failed to import file: %s", filename)
}
} else if strings.Contains(filename, "listenbrainz") {
l.Info().Msgf("Importer: Import file %s detecting as being ListenBrainz export", filename)
err := importer.ImportListenBrainzExport(logger.NewContext(l), store, mbzc, filename)
if err != nil {
l.Err(err).Msgf("Importer: Failed to import file: %s", filename)
}
} else if strings.Contains(filename, "koito") {
l.Info().Msgf("Importer: Import file %s detecting as being Koito export", filename)
err := importer.ImportKoitoFile(logger.NewContext(l), store, filename)
if err != nil {
l.Err(err).Msgf("Importer: Failed to import file: %s", filename)
}
} else {
l.Warn().Msgf("Importer: File %s not recognized as a valid import file; make sure it is valid and named correctly", filename)
}
}