R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix some fallback logic for RTMP link parsing

Browse Source
This commit is contained in:
mars67857 2017-10-15 14:26:05 -07:00
parent 6e9f40c86d
commit d538ff2e58
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
youtube_dl/extractor/cammodels.py
View File

@ -2,6 +2,7 @@ from __future__ import unicode_literals
from .common import InfoExtractor from .common import InfoExtractor
from .common import ExtractorError from .common import ExtractorError
import json import json
import re
class CamModelsIE(InfoExtractor): class CamModelsIE(InfoExtractor):
@ -67,15 +68,16 @@ class CamModelsIE(InfoExtractor):
# If they change the JSON format, then fallback to parsing out RTMP links via regex. # If they change the JSON format, then fallback to parsing out RTMP links via regex.
except: except:
manifest_json = json.dumps(manifest) manifest_json = json.dumps(manifest)
manifest_links = self._search_regex(pattern=self._RTMP_URL_FALLBACK, string=manifest_json, name='RTMP URLs', fatal=False) manifest_links = re.finditer(pattern=self._RTMP_URL_FALLBACK, string=manifest_json)
if not manifest_links: if not manifest_links:
raise ExtractorError(msg=self._RTMP_URL_FALLBACK_CONSOLE_ERROR, expected=False, video_id=video_id) raise ExtractorError(msg=self._RTMP_URL_FALLBACK_CONSOLE_ERROR, expected=False, video_id=video_id)
formats = [] formats = []
for manifest_link in manifest_links: for manifest_link in manifest_links:
url = manifest_link.group('id')
formats.append({ formats.append({
'ext': 'flv', 'ext': 'flv',
'url': manifest_link, 'url': url,
'format_id': manifest_link.split(sep='/')[-1] 'format_id': url.split(sep='/')[-1]
}) })
self._sort_formats(formats) self._sort_formats(formats)
return formats return formats