projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4c6d2ff
)
[trilulilu] Modernize
author
Philipp Hagemeister
<phihag@phihag.de>
Wed, 26 Nov 2014 11:56:28 +0000
(12:56 +0100)
committer
Philipp Hagemeister
<phihag@phihag.de>
Wed, 26 Nov 2014 11:56:43 +0000
(12:56 +0100)
youtube_dl/extractor/trilulilu.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/trilulilu.py
b/youtube_dl/extractor/trilulilu.py
index 2f2c8aeda9f422101819b087d6efc4e5240df90a..220a05b7b493fb728f3cd3c6dab74208a8f587eb 100644
(file)
--- a/
youtube_dl/extractor/trilulilu.py
+++ b/
youtube_dl/extractor/trilulilu.py
@@
-1,28
+1,28
@@
+from __future__ import unicode_literals
+
import json
import json
-import re
from .common import InfoExtractor
class TriluliluIE(InfoExtractor):
from .common import InfoExtractor
class TriluliluIE(InfoExtractor):
- _VALID_URL = r'
(?x)(?:https?://)?(?:www\.)?trilulilu\.ro/video-(?P<category>[^/]+)/(?P<video_
id>[^/]+)'
+ _VALID_URL = r'
https?://(?:www\.)?trilulilu\.ro/video-[^/]+/(?P<
id>[^/]+)'
_TEST = {
_TEST = {
- u"url": u"http://www.trilulilu.ro/video-animatie/big-buck-bunny-1",
- u'file': u"big-buck-bunny-1.mp4",
- u'info_dict': {
- u"title": u"Big Buck Bunny",
- u"description": u":) pentru copilul din noi",
+ 'url': 'http://www.trilulilu.ro/video-animatie/big-buck-bunny-1',
+ 'info_dict': {
+ 'id': 'big-buck-bunny-1',
+ 'ext': 'mp4',
+ 'title': 'Big Buck Bunny',
+ 'description': ':) pentru copilul din noi',
},
# Server ignores Range headers (--test)
},
# Server ignores Range headers (--test)
-
u"params"
: {
-
u"skip_download"
: True
+
'params'
: {
+
'skip_download'
: True
}
}
def _real_extract(self, url):
}
}
def _real_extract(self, url):
- mobj = re.match(self._VALID_URL, url)
- video_id = mobj.group('video_id')
-
+ video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id)
title = self._og_search_title(webpage)
webpage = self._download_webpage(url, video_id)
title = self._og_search_title(webpage)
@@
-30,20
+30,20
@@
class TriluliluIE(InfoExtractor):
description = self._og_search_description(webpage)
log_str = self._search_regex(
description = self._og_search_description(webpage)
log_str = self._search_regex(
- r'block_flash_vars[ ]=[ ]({[^}]+})', webpage,
u
'log info')
+ r'block_flash_vars[ ]=[ ]({[^}]+})', webpage, 'log info')
log = json.loads(log_str)
log = json.loads(log_str)
- format_url = (
u
'http://fs%(server)s.trilulilu.ro/%(hash)s/'
-
u
'video-formats2' % log)
+ format_url = ('http://fs%(server)s.trilulilu.ro/%(hash)s/'
+ 'video-formats2' % log)
format_doc = self._download_xml(
format_url, video_id,
format_doc = self._download_xml(
format_url, video_id,
- note=
u
'Downloading formats',
- errnote=
u
'Error while downloading formats')
+ note='Downloading formats',
+ errnote='Error while downloading formats')
video_url_template = (
video_url_template = (
-
u
'http://fs%(server)s.trilulilu.ro/stream.php?type=video'
-
u
'&source=site&hash=%(hash)s&username=%(userid)s&'
-
u
'key=ministhebest&format=%%s&sig=&exp=' %
+ 'http://fs%(server)s.trilulilu.ro/stream.php?type=video'
+ '&source=site&hash=%(hash)s&username=%(userid)s&'
+ 'key=ministhebest&format=%%s&sig=&exp=' %
log)
formats = [
{
log)
formats = [
{