riwiwa/muzi
1
0
Fork 0
mirror of https://github.com/riwiwa/muzi.git synced 2026-02-28 11:56:57 -08:00
Code Issues Packages Projects Releases Wiki Activity

lastfm import accepts dynamic track amount and now allows scrobbling while

Browse Source 
importing
This commit is contained in:
riwiwa
2026-01-08 19:18:19 -08:00
parent 679d7f9202
commit 8c3bef6a43
2 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
importsongs/importsongs.go
View File

@@ -83,29 +83,29 @@ func JsonToDB(jsonFile string, platform int) {
}
if platform == spotify {
type Track struct {
Timestamp string `json:"ts"`
//Platform string `json:"platform"`
Played int `json:"ms_played"`
//Country string `json:"conn_country"`
//IP string `json:"ip_addr"`
Name string `json:"master_metadata_track_name"`
Artist string `json:"master_metadata_album_artist_name"`
Album string `json:"master_metadata_album_album_name"`
//TrackURI string `json:"spotify_track_uri"`
//Episode string `json:"episode_name"`
//Show string `json:"episode_show_name"`
//EpisodeURI string `json:"spotify_episode_uri"`
//Audiobook string `json:"audiobook_title"`
//AudiobookURI string `json:"audiobook_uri"`
//AudiobookChapterURI string `json:"audiobook_chapter_uri"`
//AudiobookChapter string `json:"audiobook_chapter_title"`
//ReasonStart string `json:"reason_start"`
//ReasonEnd string `json:"reason_end"`
//Shuffle bool `json:"shuffle"`
//Skipped bool `json:"skipped"`
//Offline bool `json:"offline"`
//OfflineTimestamp int `json:"offline_timestamp"`
//Incognito bool `json:"incognito_mode"`
Timestamp string `json:"ts"`
Platform string `json:"-"`
Played int `json:"ms_played"`
Country string `json:"-"`
IP string `json:"-"`
Name string `json:"master_metadata_track_name"`
Artist string `json:"master_metadata_album_artist_name"`
Album string `json:"master_metadata_album_album_name"`
TrackURI string `json:"-"`
Episode string `json:"-"`
Show string `json:"-"`
EpisodeURI string `json:"-"`
Audiobook string `json:"-"`
AudiobookURI string `json:"-"`
AudiobookChapterURI string `json:"-"`
AudiobookChapter string `json:"-"`
ReasonStart string `json:"-"`
ReasonEnd string `json:"-"`
Shuffle bool `json:"-"`
Skipped bool `json:"-"`
Offline bool `json:"-"`
OfflineTimestamp int `json:"-"`
Incognito bool `json:"-"`
}
var tracks []Track
err := json.Unmarshal(jsonData, &tracks)
@@ -186,32 +186,35 @@ func ImportLastFM() {
Recenttracks struct {
Track []struct {
Artist struct {
Mbid string `json:"mbid"`
Mbid string `json:"-"`
Text string `json:"#text"`
} `json:"artist"`
Streamable string `json:"streamable"`
Streamable string `json:"-"`
Image []struct {
Size string `json:"size"`
Text string `json:"#text"`
} `json:"image"`
Mbid string `json:"mbid"`
Size string `json:"-"`
Text string `json:"-"`
} `json:"-"`
Mbid string `json:"-"`
Album struct {
Mbid string `json:"mbid"`
Mbid string `json:"-"`
Text string `json:"#text"`
} `json:"album"`
Name string `json:"name"`
URL string `json:"url"`
Attr struct {
Nowplaying string `json:"nowplaying"`
} `json:"@attr,omitempty"`
URL string `json:"-"`
Date struct {
Uts string `json:"uts"`
Text string `json:"#text"`
Text string `json:"-"`
} `json:"date"`
} `json:"track"`
Attr struct {
PerPage string `json:"perPage"`
PerPage string `json:"-"`
TotalPages string `json:"totalPages"`
Page string `json:"page"`
Total string `json:"total"`
User string `json:"user"`
Total string `json:"-"`
User string `json:"-"`
} `json:"@attr"`
} `json:"recenttracks"`
}
@@ -231,7 +234,10 @@ func ImportLastFM() {
panic(err)
}
json.NewDecoder(resp.Body).Decode(&data)
for j := range 100 {
for j := range data.Recenttracks.Track {
if data.Recenttracks.Track[j].Attr.Nowplaying == "true" {
continue
}
unixTime, err := strconv.ParseInt(data.Recenttracks.Track[j].Date.Uts, 10, 64)
if err != nil {
panic(err)

6
main.go
View File

@@ -41,8 +41,6 @@ func main() {
dirSpotifyZip := "./imports/spotify/zip/"
dirSpotifyExt := "./imports/spotify/extracted/"
dirLastFM := "./imports/lastfm/"
err := dirCheck(dirImports)
if err != nil {
return
@@ -59,10 +57,6 @@ func main() {
if err != nil {
return
}
err = dirCheck(dirLastFM)
if err != nil {
return
}
err = dbCheck()
if err != nil {
return