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

add username to lastfm import logs

Browse Source
This commit is contained in:
riwiwa
2026-02-08 21:49:55 -08:00
parent a33e724199
commit 32ccdcd5f3
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
migrate/lastfm.go
View File

@@ -97,10 +97,11 @@ func fetchPage(client *http.Client, page int, lfmUsername, apiKey string, userId
} }
func ImportLastFM( func ImportLastFM(
username string, lfmUsername string,
apiKey string, apiKey string,
userId int, userId int,
progressChan chan<- ProgressUpdate, progressChan chan<- ProgressUpdate,
username string,
) error { ) error {
totalImported := 0 totalImported := 0
@@ -110,7 +111,7 @@ func ImportLastFM(
resp, err := client.Get( resp, err := client.Get(
"https://ws.audioscrobbler.com/2.0/?method=user.getrecenttracks&user=" + "https://ws.audioscrobbler.com/2.0/?method=user.getrecenttracks&user=" +
username + "&api_key=" + apiKey + "&format=json&limit=100", lfmUsername + "&api_key=" + apiKey + "&format=json&limit=100",
) )
if err != nil { if err != nil {
fmt.Fprintf(os.Stderr, "Error getting LastFM HTTP response: %v\n", err) fmt.Fprintf(os.Stderr, "Error getting LastFM HTTP response: %v\n", err)
@@ -135,7 +136,8 @@ func ImportLastFM(
} }
return err return err
} }
fmt.Printf("Total pages: %d\n", totalPages) fmt.Printf("%s started a LastFM import job of %d total pages\n", username,
totalPages)
// send initial progress update // send initial progress update
if progressChan != nil { if progressChan != nil {
@@ -215,7 +217,10 @@ func ImportLastFM(
} }
} }
fmt.Printf("%d tracks imported from LastFM for user %s\n", totalImported, username) fmt.Printf("User %s imported %d tracks from LastFM account %s\n",
username,
totalImported,
lfmUsername)
// send completion update // send completion update
if progressChan != nil { if progressChan != nil {

3
web/web.go
View File

@@ -433,7 +433,8 @@ func importLastFMHandler(w http.ResponseWriter, r *http.Request) {
jobsMu.Unlock() jobsMu.Unlock()
go func() { go func() {
migrate.ImportLastFM(lastfmUsername, lastfmAPIKey, userId, progressChan) migrate.ImportLastFM(lastfmUsername, lastfmAPIKey, userId, progressChan,
username)
jobsMu.Lock() jobsMu.Lock()
delete(importJobs, jobID) delete(importJobs, jobID)