projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
91dff03
)
[aparat] modernize
author
Philipp Hagemeister
<phihag@phihag.de>
Thu, 21 Aug 2014 23:44:35 +0000
(
01:44
+0200)
committer
Philipp Hagemeister
<phihag@phihag.de>
Thu, 21 Aug 2014 23:44:52 +0000
(
01:44
+0200)
youtube_dl/extractor/aparat.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/aparat.py
b/youtube_dl/extractor/aparat.py
index 7e93bc4df286e71554f272fb69ba43348f3c5da4..74860882628017c5ab7a44f22bd9b05286ad556e 100644
(file)
--- a/
youtube_dl/extractor/aparat.py
+++ b/
youtube_dl/extractor/aparat.py
@@
-1,5
+1,7
@@
#coding: utf-8
#coding: utf-8
+from __future__ import unicode_literals
+
import re
from .common import InfoExtractor
import re
from .common import InfoExtractor
@@
-13,13
+15,14
@@
class AparatIE(InfoExtractor):
_VALID_URL = r'^https?://(?:www\.)?aparat\.com/(?:v/|video/video/embed/videohash/)(?P<id>[a-zA-Z0-9]+)'
_TEST = {
_VALID_URL = r'^https?://(?:www\.)?aparat\.com/(?:v/|video/video/embed/videohash/)(?P<id>[a-zA-Z0-9]+)'
_TEST = {
- u'url': u'http://www.aparat.com/v/wP8On',
- u'file': u'wP8On.mp4',
- u'md5': u'6714e0af7e0d875c5a39c4dc4ab46ad1',
- u'info_dict': {
- u"title": u"تیم گلکسی 11 - زومیت",
+ 'url': 'http://www.aparat.com/v/wP8On',
+ 'md5': '6714e0af7e0d875c5a39c4dc4ab46ad1',
+ 'info_dict': {
+ 'id': 'wP8On',
+ 'ext': 'mp4',
+ 'title': 'تیم گلکسی 11 - زومیت',
},
},
- #
u'skip': u
'Extremely unreliable',
+ #
'skip':
'Extremely unreliable',
}
def _real_extract(self, url):
}
def _real_extract(self, url):
@@
-29,8
+32,8
@@
class AparatIE(InfoExtractor):
# Note: There is an easier-to-parse configuration at
# http://www.aparat.com/video/video/config/videohash/%video_id
# but the URL in there does not work
# Note: There is an easier-to-parse configuration at
# http://www.aparat.com/video/video/config/videohash/%video_id
# but the URL in there does not work
- embed_url = (
u
'http://www.aparat.com/video/video/embed/videohash/' +
- video_id +
u
'/vt/frame')
+ embed_url = ('http://www.aparat.com/video/video/embed/videohash/' +
+ video_id + '/vt/frame')
webpage = self._download_webpage(embed_url, video_id)
video_urls = re.findall(r'fileList\[[0-9]+\]\s*=\s*"([^"]+)"', webpage)
webpage = self._download_webpage(embed_url, video_id)
video_urls = re.findall(r'fileList\[[0-9]+\]\s*=\s*"([^"]+)"', webpage)