projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
0bf5cf9
)
[iprima] Clean up a little bit
author
Philipp Hagemeister
<phihag@phihag.de>
Mon, 24 Feb 2014 08:53:48 +0000
(09:53 +0100)
committer
Philipp Hagemeister
<phihag@phihag.de>
Mon, 24 Feb 2014 08:53:48 +0000
(09:53 +0100)
youtube_dl/extractor/iprima.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/iprima.py
b/youtube_dl/extractor/iprima.py
index dde4829981a7adab396a040ccc1566277c39194b..bf5e44d88981c062ee846abc9086004db5793f47 100644
(file)
--- a/
youtube_dl/extractor/iprima.py
+++ b/
youtube_dl/extractor/iprima.py
@@
-10,7
+10,7
@@
from ..utils import compat_urllib_request
class IPrimaIE(InfoExtractor):
class IPrimaIE(InfoExtractor):
- _VALID_URL = r'https?://play\.iprima\.cz/
(?P<videogroup>.+)/(?P<videoid>.
+)'
+ _VALID_URL = r'https?://play\.iprima\.cz/
[^?#]+/(?P<id>[^?#]
+)'
_TESTS = [{
'url': 'http://play.iprima.cz/particka/particka-92',
_TESTS = [{
'url': 'http://play.iprima.cz/particka/particka-92',
@@
-29,7
+29,7
@@
class IPrimaIE(InfoExtractor):
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
- video_id = mobj.group('
video
id')
+ video_id = mobj.group('id')
webpage = self._download_webpage(url, video_id)
webpage = self._download_webpage(url, video_id)
@@
-44,18
+44,19
@@
class IPrimaIE(InfoExtractor):
base_url = ''.join(re.findall(r"embed\['stream'\] = '(.+?)'.+'(\?auth=)'.+'(.+?)';", playerpage)[1])
zoneGEO = self._html_search_regex(r'"zoneGEO":(.+?),', webpage, 'zoneGEO')
base_url = ''.join(re.findall(r"embed\['stream'\] = '(.+?)'.+'(\?auth=)'.+'(.+?)';", playerpage)[1])
zoneGEO = self._html_search_regex(r'"zoneGEO":(.+?),', webpage, 'zoneGEO')
-
if zoneGEO != '0':
if zoneGEO != '0':
- base_url = base_url.replace('token', 'token_'
+
zoneGEO)
+ base_url = base_url.replace('token', 'token_'
+
zoneGEO)
formats = []
for format_id in ['lq', 'hq', 'hd']:
formats = []
for format_id in ['lq', 'hq', 'hd']:
- filename = self._html_search_regex(r'"%s_id":(.+?),' % format_id, webpage, 'filename')
+ filename = self._html_search_regex(
+ r'"%s_id":(.+?),' % format_id, webpage, 'filename')
if filename == 'null':
continue
if filename == 'null':
continue
- real_id = self._search_regex(r'Prima-[0-9]{10}-([0-9]+)_', filename, 'real video id')
+ real_id = self._search_regex(
+ r'Prima-[0-9]{10}-([0-9]+)_', filename, 'real video id')
if format_id == 'lq':
quality = 0
if format_id == 'lq':
quality = 0
@@
-63,13
+64,13
@@
class IPrimaIE(InfoExtractor):
quality = 1
elif format_id == 'hd':
quality = 2
quality = 1
elif format_id == 'hd':
quality = 2
- filename = 'hq/'
+
filename
+ filename = 'hq/'
+
filename
formats.append({
'format_id': format_id,
'url': base_url,
'quality': quality,
formats.append({
'format_id': format_id,
'url': base_url,
'quality': quality,
- 'play_path': 'mp4:'
+
filename.replace('"', '')[:-4],
+ 'play_path': 'mp4:'
+
filename.replace('"', '')[:-4],
'rtmp_live': True,
'ext': 'flv',
})
'rtmp_live': True,
'ext': 'flv',
})