storm/bragi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radio: don't get stuck on mpd http streams

Browse Source 
MPD HTTP streaming provide the media content at every URL thrown at the
HTTP backend. So requests for shoutcast and icecast metadata get stuck
receiving the actual media content, instead of the expected metadata.

The conclusion is to only request these metadata files, when they're not
actually advertised as audio or video content types in a HEAD request.
This commit is contained in:
Martin Weinelt 2021-06-01 23:16:22 +02:00
parent 6faadd6669
commit 48d54beffd
No known key found for this signature in database
GPG Key ID: 87C1E9888F856759
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
media/radio.py
View File

@ -22,8 +22,10 @@ def get_radio_server_description(url):
url_icecast = base_url + '/status-json.xsl' url_icecast = base_url + '/status-json.xsl'
url_shoutcast = base_url + '/stats?json=1' url_shoutcast = base_url + '/stats?json=1'
try: try:
r = requests.get(url_shoutcast, timeout=10) response = requests.head(url_shoutcast, timeout=3)
data = r.json() if not response.headers.get('content-type', '').startswith(("audio/", "video/")):
response = requests.get(url_shoutcast, timeout=10)
data = response.json()
title_server = data['servertitle'] title_server = data['servertitle']
return title_server return title_server
# logging.info("TITLE FOUND SHOUTCAST: " + title_server) # logging.info("TITLE FOUND SHOUTCAST: " + title_server)
@ -38,8 +40,10 @@ def get_radio_server_description(url):
return url return url
try: try:
r = requests.get(url_icecast, timeout=10) response = requests.head(url_shoutcast, timeout=3)
data = r.json() if not response.headers.get('content-type', '').startswith(("audio/", "video/")):
response = requests.get(url_icecast, timeout=10)
data = response.json()
source = data['icestats']['source'] source = data['icestats']['source']
if type(source) is list: if type(source) is list:
source = source[0] source = source[0]