Merge branch 'master' of github.com:krateng/maloja

README.md

@@ -135,6 +135,7 @@ If you would like to import your previous scrobbles, use the command `maloja imp
 
 * a Last.fm export generated by [benfoxall's website](https://benjaminbenben.com/lastfm-to-csv/) ([GitHub page](https://github.com/benfoxall/lastfm-to-csv))
 * an official [Spotify data export file](https://www.spotify.com/us/account/privacy/)
+* an official [ListenBrainz export file](https://listenbrainz.org/profile/export/)
 * the export of another Maloja instance
 
 ⚠️ Never import your data while maloja is running. When you need to do import inside docker container start it in shell mode instead and perform import before starting the container as mentioned above.

maloja/apis/listenbrainz.py

@@ -55,6 +55,7 @@ class Listenbrainz(APIHandler):
 				try:
 					metadata = listen["track_metadata"]
 					artiststr, titlestr = metadata["artist_name"], metadata["track_name"]
+					albumstr = metadata.get("release_name")
 					additional = metadata.get("additional_info",{})
 					try:
 						timestamp = int(listen["listened_at"])
@@ -67,14 +68,16 @@ class Listenbrainz(APIHandler):
 					# fields that will not be consumed by regular scrobbling
 					# will go into 'extra'
 					k:additional[k]
-					for k in ['release_mbid','artist_mbids','recording_mbid','tags']
+					for k in ['track_mbid', 'release_mbid', 'artist_mbids','recording_mbid','tags']
 					if k in additional
 				}
 
 				self.scrobble({
 					'track_artists':[artiststr],
 					'track_title':titlestr,
+					'album_name':albumstr,
 					'scrobble_time':timestamp,
+					'track_length': additional.get("duration"),
 					**extrafields
 				},client=client)
 

maloja/proccontrol/tasks/import_scrobbles.py

@@ -49,6 +49,11 @@ def import_scrobbles(inputf):
 		typeid,typedesc = "maloja","Maloja"
 		importfunc = parse_maloja
 
+	# username_lb-YYYY-MM-DD.json
+	elif re.match(".*_lb-[0-9-]+\.json",filename):
+		typeid,typedesc = "listenbrainz","ListenBrainz"
+		importfunc = parse_listenbrainz
+
 	else:
 		print("File",inputf,"could not be identified as a valid import source.")
 		return result
@@ -84,7 +89,7 @@ def import_scrobbles(inputf):
 				 	"track":{
 				 		"artists":scrobble['track_artists'],
 				 		"title":scrobble['track_title'],
-				 		"length":None
+				 		"length":scrobble['track_length'],
 				 	},
 				 	"duration":scrobble['scrobble_duration'],
 				 	"origin":"import:" + typeid,
@@ -154,6 +159,7 @@ def parse_spotify_lite(inputf):
 				yield ("CONFIDENT_IMPORT",{
 					'track_title':title,
 					'track_artists': artist,
+					'track_length': None,
 					'scrobble_time': timestamp,
 					'scrobble_duration':played,
 					'album_name': None
@@ -262,6 +268,7 @@ def parse_spotify_full(inputf):
 				yield (status,{
 					'track_title':title,
 					'track_artists': artist,
+					'track_length': None,
 					'album_name': album,
 					'scrobble_time': timestamp,
 					'scrobble_duration':played
@@ -294,6 +301,7 @@ def parse_lastfm(inputf):
 				yield ('CONFIDENT_IMPORT',{
 					'track_title': title,
 					'track_artists': artist,
+					'track_length': None,
 					'album_name': album,
 					'scrobble_time': int(datetime.datetime.strptime(
 						time + '+0000',
@@ -305,6 +313,28 @@ def parse_lastfm(inputf):
 				yield ('FAIL',None,f"{row} (Line {line}) could not be parsed. Scrobble not imported. ({repr(e)})")
 				continue
 
+def parse_listenbrainz(inputf):
+
+	with open(inputf,'r') as inputfd:
+		data = json.load(inputfd)
+
+	for entry in data:
+
+		try:
+			track_metadata = entry['track_metadata']
+			additional_info = track_metadata.get('additional_info', {})
+
+			yield ("CONFIDENT_IMPORT",{
+				'track_title': track_metadata['track_name'],
+				'track_artists': additional_info.get('artist_names') or track_metadata['artist_name'],
+				'track_length': int(additional_info.get('duration_ms', 0) / 1000) or additional_info.get('duration'),
+				'album_name': track_metadata.get('release_name'),
+				'scrobble_time': entry['listened_at'],
+				'scrobble_duration': None,
+			},'')
+		except Exception as e:
+			yield ('FAIL',None,f"{entry} could not be parsed. Scrobble not imported. ({repr(e)})")
+			continue
 
 def parse_maloja(inputf):
 
@@ -318,6 +348,7 @@ def parse_maloja(inputf):
 			yield ('CONFIDENT_IMPORT',{
 				'track_title': s['track']['title'],
 				'track_artists': s['track']['artists'],
+				'track_length': s['track']['length'],
 				'album_name': s['track'].get('album',{}).get('name',''),
 				'scrobble_time': s['time'],
 				'scrobble_duration': s['duration']