Skip to content

add bandwidth to m3u8 regex and return values #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anxdpanic merged 1 commit into from
Apr 3, 2017
Merged

add bandwidth to m3u8 regex and return values #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions resources/lib/twitch/parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
r'#EXT-X-MEDIA:TYPE=VIDEO.*'
r'GROUP-ID="(?P<group_id>[^"]*)",'
r'NAME="(?P<group_name>[^"]*)"[,=\w]*\n'
r'#EXT-X-STREAM-INF:.*\n('
r'#EXT-X-STREAM-INF:.*'
r'BANDWIDTH=(?P<bandwidth>[0-9]+).*\n('
r'?P<url>http.*)')

_clip_embed_pattern = re.compile(r'quality_options:\s*(?P<qualities>\[[^\]]+?\])')
Expand Down Expand Up @@ -45,11 +46,11 @@ def m3u8_to_list(string):
matches = re.finditer(_m3u_pattern, string)
chunked = None
for m in matches:
l.append((m.group('group_name'), m.group('url')))
l.append((m.group('group_name'), m.group('url'), m.group('bandwidth')))
if m.group('group_id') == 'chunked':
chunked = m.group('url')
if (chunked) and (not any(re.match('[Ss]ource', name) for name, url in l)):
l.insert(0, ('Source', chunked))
chunked = ('Source', m.group('url'), int(m.group('bandwidth')))
if (chunked) and (not any(re.match('[Ss]ource', name) for name, url, bandwidth in l)):
l.insert(0, chunked)

log.debug('m3u8_to_list result:\n{}'.format(l))
return l
Expand All @@ -61,8 +62,8 @@ def clip_embed_to_list(string):
l = list()
if match:
match = eval(match.group('qualities'))
l = [(item['quality'], item['source']) for item in match]
l.insert(0, ('Source', l[0][1]))
l = [(item['quality'], item['source'], -1) for item in match]
l.insert(0, ('Source', l[0][1], -1))

log.debug('clip_embed_to_list result:\n{}'.format(l))
return l