projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e0938e7
)
[aparat] Modernize
author
Philipp Hagemeister
<phihag@phihag.de>
Wed, 26 Nov 2014 11:40:51 +0000
(12:40 +0100)
committer
Philipp Hagemeister
<phihag@phihag.de>
Wed, 26 Nov 2014 11:40:51 +0000
(12:40 +0100)
youtube_dl/extractor/aparat.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/aparat.py
b/youtube_dl/extractor/aparat.py
index 56775289b5ff0d5bc19218a9b4c80a4e0dc366c7..15006336faacb0c7f6ab9c24263726776866dbb6 100644
(file)
--- a/
youtube_dl/extractor/aparat.py
+++ b/
youtube_dl/extractor/aparat.py
@@
-1,5
+1,4
@@
# coding: utf-8
# coding: utf-8
-
from __future__ import unicode_literals
import re
from __future__ import unicode_literals
import re
@@
-26,8
+25,7
@@
class AparatIE(InfoExtractor):
}
def _real_extract(self, url):
}
def _real_extract(self, url):
- m = re.match(self._VALID_URL, url)
- video_id = m.group('id')
+ video_id = self._match_id(url)
# Note: There is an easier-to-parse configuration at
# http://www.aparat.com/video/video/config/videohash/%video_id
# Note: There is an easier-to-parse configuration at
# http://www.aparat.com/video/video/config/videohash/%video_id
@@
-40,15
+38,15
@@
class AparatIE(InfoExtractor):
for i, video_url in enumerate(video_urls):
req = HEADRequest(video_url)
res = self._request_webpage(
for i, video_url in enumerate(video_urls):
req = HEADRequest(video_url)
res = self._request_webpage(
- req, video_id, note=
u
'Testing video URL %d' % i, errnote=False)
+ req, video_id, note='Testing video URL %d' % i, errnote=False)
if res:
break
else:
if res:
break
else:
- raise ExtractorError(
u
'No working video URLs found')
+ raise ExtractorError('No working video URLs found')
- title = self._search_regex(r'\s+title:\s*"([^"]+)"', webpage,
u
'title')
+ title = self._search_regex(r'\s+title:\s*"([^"]+)"', webpage, 'title')
thumbnail = self._search_regex(
thumbnail = self._search_regex(
- r'\s+image:\s*"([^"]+)"', webpage,
u
'thumbnail', fatal=False)
+ r'\s+image:\s*"([^"]+)"', webpage, 'thumbnail', fatal=False)
return {
'id': video_id,
return {
'id': video_id,