CodeMirror/Bonfire
1
0
Fork 0
mirror of synced 2024-05-20 04:22:29 +12:00
Code Issues Releases Wiki Activity

Add a block for icecast radios

Browse source
This commit is contained in:
Phxntxm 2017-06-29 22:38:15 -05:00
parent b0b6400747
commit 29d6eb4e4c
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cogs/voice_utilities/entry.py
View file

@ -10,9 +10,9 @@ from hashlib import md5
from .exceptions import ExtractionError
async def get_header(session, url, headerfield=None, *, timeout=5):
async def get_header(url, headerfield=None, *, timeout=5):
with aiohttp.Timeout(timeout):
async with session.head(url) as response:
async with aiohttp.ClientSession().head(url) as response:
if headerfield:
return response.headers.get(headerfield)
else:
@ -276,4 +276,4 @@ class URLPlaylistEntry(BasePlaylistEntry):
fmt = "{0[0]}m {0[1]}s".format(length)
embed.add_field(name='Duration', value=fmt, inline=False)
# And return the embed we created
return embed
return embed

7
cogs/voice_utilities/playlist.py
View file

@ -78,8 +78,8 @@ class Playlist(EventEmitter):
# unfortunately this is literally broken
# https://github.com/KeepSafe/aiohttp/issues/758
# https://github.com/KeepSafe/aiohttp/issues/852
content_type = await get_header(self.bot.aiosession, info['url'], 'CONTENT-TYPE')
headers = await get_header(info['url'])
content_type = headers.get('Content-Type')
except Exception as e:
content_type = None
@ -87,6 +87,9 @@ class Playlist(EventEmitter):
if content_type.startswith(('application/', 'image/')):
if '/ogg' not in content_type: # How does a server say `application/ogg` what the actual fuck
raise ExtractionError("Invalid content type \"%s\" for url %s" % (content_type, song_url))
if headers.get('ice-audio-info'):
raise LiveStreamError("Cannot download from a livestream")
if info.get('is_live', False):
raise LiveStreamError("Cannot download from a livestream")