mirror of
https://github.com/gabehf/Koito.git
synced 2026-04-22 12:01:52 -07:00
c2d393aa03
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>
80 lines
2.3 KiB
Go
80 lines
2.3 KiB
Go
package importer
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"os"
|
|
"path"
|
|
"time"
|
|
|
|
"github.com/gabehf/koito/internal/catalog"
|
|
"github.com/gabehf/koito/internal/cfg"
|
|
"github.com/gabehf/koito/internal/db"
|
|
"github.com/gabehf/koito/internal/logger"
|
|
"github.com/gabehf/koito/internal/mbz"
|
|
)
|
|
|
|
type SpotifyExportItem struct {
|
|
Timestamp time.Time `json:"ts"`
|
|
TrackName string `json:"master_metadata_track_name"`
|
|
ArtistName string `json:"master_metadata_album_artist_name"`
|
|
AlbumName string `json:"master_metadata_album_album_name"`
|
|
ReasonEnd string `json:"reason_end"`
|
|
MsPlayed int32 `json:"ms_played"`
|
|
}
|
|
|
|
func ImportSpotifyFile(ctx context.Context, store db.DB, mbzc mbz.MusicBrainzCaller, filename string) error {
|
|
l := logger.FromContext(ctx)
|
|
l.Info().Msgf("Beginning spotify import on file: %s", filename)
|
|
file, err := os.Open(path.Join(cfg.ConfigDir(), "import", filename))
|
|
if err != nil {
|
|
l.Err(err).Msgf("Failed to read import file: %s", filename)
|
|
return fmt.Errorf("ImportSpotifyFile: %w", err)
|
|
}
|
|
defer file.Close()
|
|
var throttleFunc = func() {}
|
|
if ms := cfg.ThrottleImportMs(); ms > 0 {
|
|
throttleFunc = func() {
|
|
time.Sleep(time.Duration(ms) * time.Millisecond)
|
|
}
|
|
}
|
|
export := make([]SpotifyExportItem, 0)
|
|
err = json.NewDecoder(file).Decode(&export)
|
|
if err != nil {
|
|
return fmt.Errorf("ImportSpotifyFile: %w", err)
|
|
}
|
|
|
|
for _, item := range export {
|
|
if item.ReasonEnd != "trackdone" {
|
|
continue
|
|
}
|
|
if !inImportTimeWindow(item.Timestamp) {
|
|
l.Debug().Msgf("Skipping import due to import time rules")
|
|
continue
|
|
}
|
|
dur := item.MsPlayed
|
|
if item.TrackName == "" || item.ArtistName == "" {
|
|
l.Debug().Msg("Skipping non-track item")
|
|
continue
|
|
}
|
|
opts := catalog.SubmitListenOpts{
|
|
MbzCaller: mbzc,
|
|
Artist: item.ArtistName,
|
|
TrackTitle: item.TrackName,
|
|
ReleaseTitle: item.AlbumName,
|
|
Duration: dur / 1000,
|
|
Time: item.Timestamp,
|
|
Client: "spotify",
|
|
UserID: 1,
|
|
SkipCacheImage: !cfg.FetchImagesDuringImport(),
|
|
}
|
|
err = catalog.SubmitListen(ctx, store, opts)
|
|
if err != nil {
|
|
l.Err(err).Msg("Failed to import spotify playback item")
|
|
return fmt.Errorf("ImportSpotifyFile: %w", err)
|
|
}
|
|
throttleFunc()
|
|
}
|
|
return finishImport(ctx, filename, len(export))
|
|
}
|