azlux/botamusique
1
0
Fork 0
mirror of https://github.com/azlux/botamusique synced 2024-11-23 22:06:09 +00:00
Code Issues Releases Wiki Activity

Compare commits

base: azlux:6faadd6669aa27f1c65bf7327f2b2eccf6b15255
Branches Tags
azlux:master
azlux:7.2.3
azlux:7.2.2
azlux:7.2.1
azlux:7.2
azlux:7.1
azlux:7.0
azlux:6.5
azlux:6.4
azlux:6.3
azlux:6.2
azlux:6.1.2
azlux:6.1.1
azlux:6.1
azlux:6.0
azlux:5.2
azlux:5.1
azlux:v3
azlux:1.1
azlux:1.0
..
compare: azlux:ba02cdebf2e175dc371995361eafcb88ad2c1b52
Branches Tags
azlux:master
azlux:7.2.3
azlux:7.2.2
azlux:7.2.1
azlux:7.2
azlux:7.1
azlux:7.0
azlux:6.5
azlux:6.4
azlux:6.3
azlux:6.2
azlux:6.1.2
azlux:6.1.1
azlux:6.1
azlux:6.0
azlux:5.2
azlux:5.1
azlux:v3
azlux:1.1
azlux:1.0

2 Commits
6faadd6669 ... ba02cdebf2

Author SHA1 Message Date
azlux
ba02cdebf2
radio: don't get stuck on mpd http streams 
Merge pull request #285 from mweinelt/mpd-radio-stream
 2021-06-01 23:39:44 +02:00
Martin Weinelt
48d54beffd
radio: don't get stuck on mpd http streams 
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.
 2021-06-01 23:16:22 +02:00
1 changed files with 19 additions and 15 deletions
Show Stats Expand all files Collapse all files

34
media/radio.py
View File

@ -22,11 +22,13 @@ 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/")):
title_server = data['servertitle'] response = requests.get(url_shoutcast, timeout=10)
return title_server data = response.json()
# logging.info("TITLE FOUND SHOUTCAST: " + title_server) title_server = data['servertitle']
return title_server
# logging.info("TITLE FOUND SHOUTCAST: " + title_server)
except (requests.exceptions.ConnectionError, except (requests.exceptions.ConnectionError,
requests.exceptions.HTTPError, requests.exceptions.HTTPError,
requests.exceptions.ReadTimeout, requests.exceptions.ReadTimeout,
@ -38,16 +40,18 @@ 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/")):
source = data['icestats']['source'] response = requests.get(url_icecast, timeout=10)
if type(source) is list: data = response.json()
source = source[0] source = data['icestats']['source']
title_server = source['server_name'] if type(source) is list:
if 'server_description' in source: source = source[0]
title_server += ' - ' + source['server_description'] title_server = source['server_name']
# logging.info("TITLE FOUND ICECAST: " + title_server) if 'server_description' in source:
return title_server title_server += ' - ' + source['server_description']
# logging.info("TITLE FOUND ICECAST: " + title_server)
return title_server
except (requests.exceptions.ConnectionError, except (requests.exceptions.ConnectionError,
requests.exceptions.HTTPError, requests.exceptions.HTTPError,
requests.exceptions.ReadTimeout, requests.exceptions.ReadTimeout,