simon987/music-graph-scripts
1
0
Fork 0
mirror of https://github.com/simon987/music-graph-scripts.git synced 2025-04-10 05:56:42 +00:00
Code Issues Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
simon987 2020-06-14 20:55:35 -04:00
parent 5385143d27
commit 768999351e
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mb_scratch.sql
View File

@ -314,7 +314,7 @@ CREATE TABLE mg.covers
CREATE TABLE mg.lastfm_artist CREATE TABLE mg.lastfm_artist
( (
name TEXT PRIMARY KEY, name TEXT PRIMARY KEY,
mbid uuid mbid uuid UNIQUE
); );
CREATE TABLE mg.lastfm_raw_data CREATE TABLE mg.lastfm_raw_data

21
task_get_lastfm.py
View File

@ -23,9 +23,9 @@ def get_mbid(conn, lfm_name):
def get_names(conn, mbid): def get_names(conn, mbid):
cur = conn.cursor() cur = conn.cursor()
cur.execute( cur.execute(
"SELECT lfa.name, listeners " "SELECT lfa.name, coalesce(listeners, 0) "
"FROM mg.lastfm_artist lfa " "FROM mg.lastfm_artist lfa "
"INNER JOIN mg.lastfm_artist_meta lfm ON lfm.name=lfa.name " "LEFT JOIN mg.lastfm_artist_meta lfm ON lfm.name=lfa.name "
"WHERE mbid=%s", (mbid,) "WHERE mbid=%s", (mbid,)
) )
@ -143,9 +143,9 @@ def get_cached_artist_data(conn, name, mbid, max_age_days):
def get_artist_data(conn, name: str, mbid: str): def get_artist_data(conn, name: str, mbid: str):
cached_data = get_cached_artist_data(conn, name, mbid, max_age_days=30) # cached_data = get_cached_artist_data(conn, name, mbid, max_age_days=30)
if cached_data: # if cached_data:
return cached_data # return cached_data
raw = [] raw = []
url = "https://ws.audioscrobbler.com/2.0/?method=artist.getinfo&mbid=%s&api_key=%s&format=json" % \ url = "https://ws.audioscrobbler.com/2.0/?method=artist.getinfo&mbid=%s&api_key=%s&format=json" % \
@ -188,8 +188,8 @@ def get_artist_data(conn, name: str, mbid: str):
"mbid": info_json["artist"]["mbid"] if "mbid" in info_json["artist"] else None, "mbid": info_json["artist"]["mbid"] if "mbid" in info_json["artist"] else None,
"tags": [t["name"] for t in info_json["artist"]["tags"]["tag"]] if "tags" in info_json["artist"] and "tag" in "tags": [t["name"] for t in info_json["artist"]["tags"]["tag"]] if "tags" in info_json["artist"] and "tag" in
info_json["artist"]["tags"] else [], info_json["artist"]["tags"] else [],
"listeners": info_json["artist"]["stats"]["listeners"], "listeners": int(info_json["artist"]["stats"]["listeners"]),
"playcount": info_json["artist"]["stats"]["playcount"], "playcount": int(info_json["artist"]["stats"]["playcount"]),
"similar": [ "similar": [
{ {
"mbid": a["mbid"] if "mbid" in a else None, "mbid": a["mbid"] if "mbid" in a else None,
@ -240,9 +240,8 @@ if __name__ == "__main__":
queue = Queue() queue = Queue()
conn = psycopg2.connect(config.connstr()) with psycopg2.connect(config.connstr()) as conn:
for task in get_task(conn, args.count): for task in get_task(conn, args.count):
queue.put(task) queue.put(task)
conn.close()
queue_thread_exec(queue, func=worker, thread_count=args.threads) queue_thread_exec(queue, func=worker, thread_count=args.threads)