projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add support for https for rest of the exctractors.
[youtube-dl]
/
youtube_dl
/
extractor
/
uplynk.py
diff --git
a/youtube_dl/extractor/uplynk.py
b/youtube_dl/extractor/uplynk.py
index 4313bc9cbbd11d01682fad8b4382cf3b5eaeedd3..2cd22cf8a1afa51403b3b9801ca7dd08c03503a9 100644
(file)
--- a/
youtube_dl/extractor/uplynk.py
+++ b/
youtube_dl/extractor/uplynk.py
@@
-11,6
+11,7
@@
from ..utils import (
class UplynkIE(InfoExtractor):
class UplynkIE(InfoExtractor):
+ IE_NAME = 'uplynk'
_VALID_URL = r'https?://.*?\.uplynk\.com/(?P<path>ext/[0-9a-f]{32}/(?P<external_id>[^/?&]+)|(?P<id>[0-9a-f]{32}))\.(?:m3u8|json)(?:.*?\bpbs=(?P<session_id>[^&]+))?'
_TEST = {
'url': 'http://content.uplynk.com/e89eaf2ce9054aa89d92ddb2d817a52e.m3u8',
_VALID_URL = r'https?://.*?\.uplynk\.com/(?P<path>ext/[0-9a-f]{32}/(?P<external_id>[^/?&]+)|(?P<id>[0-9a-f]{32}))\.(?:m3u8|json)(?:.*?\bpbs=(?P<session_id>[^&]+))?'
_TEST = {
'url': 'http://content.uplynk.com/e89eaf2ce9054aa89d92ddb2d817a52e.m3u8',
@@
-32,9
+33,7
@@
class UplynkIE(InfoExtractor):
formats = self._extract_m3u8_formats('http://content.uplynk.com/%s.m3u8' % path, display_id, 'mp4')
if session_id:
for f in formats:
formats = self._extract_m3u8_formats('http://content.uplynk.com/%s.m3u8' % path, display_id, 'mp4')
if session_id:
for f in formats:
- f['extra_param_to_segment_url'] = {
- 'pbs': session_id,
- }
+ f['extra_param_to_segment_url'] = 'pbs=' + session_id
self._sort_formats(formats)
asset = self._download_json('http://content.uplynk.com/player/assetinfo/%s.json' % path, display_id)
if asset.get('error') == 1:
self._sort_formats(formats)
asset = self._download_json('http://content.uplynk.com/player/assetinfo/%s.json' % path, display_id)
if asset.get('error') == 1:
@@
-54,7
+53,9
@@
class UplynkIE(InfoExtractor):
class UplynkPreplayIE(UplynkIE):
class UplynkPreplayIE(UplynkIE):
+ IE_NAME = 'uplynk:preplay'
_VALID_URL = r'https?://.*?\.uplynk\.com/preplay2?/(?P<path>ext/[0-9a-f]{32}/(?P<external_id>[^/?&]+)|(?P<id>[0-9a-f]{32}))\.json'
_VALID_URL = r'https?://.*?\.uplynk\.com/preplay2?/(?P<path>ext/[0-9a-f]{32}/(?P<external_id>[^/?&]+)|(?P<id>[0-9a-f]{32}))\.json'
+ _TEST = None
def _real_extract(self, url):
path, external_id, video_id = re.match(self._VALID_URL, url).groups()
def _real_extract(self, url):
path, external_id, video_id = re.match(self._VALID_URL, url).groups()