secstate/vrobbler
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reorganize tadb lookup to actually work

Browse Source
This commit is contained in:
Colin Powell
2023-06-21 14:36:01 -04:00
parent ca65ce11f2
commit 8a597ef1b0
1 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
vrobbler/apps/music/theaudiodb.py
View File

@ -15,25 +15,16 @@ logger = logging.getLogger(__name__)
def lookup_artist_from_tadb(name_or_id: str) -> dict: def lookup_artist_from_tadb(name_or_id: str) -> dict:
artist_info = {} artist_info = {}
name = urllib.parse.quote(name_or_id) response = None
response = requests.get(ARTIST_SEARCH_URL + name)
found_by_name = True # Look for an ID as an integer
if response.status_code != 200: try:
logger.warn(f"Bad response from TADB: {response.status_code}") tadb_id = int(name_or_id)
found_by_name = False except ValueError:
tadb_id = None
if not response.content: if tadb_id:
logger.warn(f"Bad content from TADB: {response.content}") response = requests.get(ARTIST_FETCH_URL + str(tadb_id))
found_by_name = False
if "null" in str(response.content):
logger.warn(f"Bad content from TADB: {response.content}")
found_by_name = False
if not found_by_name:
# Try using an TABD ID
response = requests.get(ARTIST_FETCH_URL + name_or_id)
if response.status_code != 200: if response.status_code != 200:
logger.warn(f"Bad response from TADB: {response.status_code}") logger.warn(f"Bad response from TADB: {response.status_code}")
@ -43,6 +34,22 @@ def lookup_artist_from_tadb(name_or_id: str) -> dict:
logger.warn(f"Bad content from TADB: {response.content}") logger.warn(f"Bad content from TADB: {response.content}")
return artist_info return artist_info
if not response:
name = urllib.parse.quote(name_or_id)
response = requests.get(ARTIST_SEARCH_URL + name)
if response.status_code != 200:
logger.warn(f"Bad response from TADB: {response.status_code}")
return artist_info
if not response.content:
logger.warn(f"Bad content from TADB: {response.content}")
return artist_info
if '{"artists": null}' in str(response.content):
logger.warn(f"Bad content from TADB: {response.content}")
return artist_info
results = json.loads(response.content) results = json.loads(response.content)
if results["artists"]: if results["artists"]:
artist = results["artists"][0] artist = results["artists"][0]