projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'rrooij-gamekings_fix'
[youtube-dl]
/
youtube_dl
/
extractor
/
dbtv.py
diff --git
a/youtube_dl/extractor/dbtv.py
b/youtube_dl/extractor/dbtv.py
index 1d3e2ff087fe611d6b660a59963a16765e3ac53e..133cdc50b8c8379021d6d7fffb7c7c28dd2ba30d 100644
(file)
--- a/
youtube_dl/extractor/dbtv.py
+++ b/
youtube_dl/extractor/dbtv.py
@@
-4,6
+4,7
@@
from __future__ import unicode_literals
import re
from .common import InfoExtractor
import re
from .common import InfoExtractor
+from ..compat import compat_str
from ..utils import (
float_or_none,
int_or_none,
from ..utils import (
float_or_none,
int_or_none,
@@
-12,8
+13,8
@@
from ..utils import (
class DBTVIE(InfoExtractor):
class DBTVIE(InfoExtractor):
- _VALID_URL = r'http
://dbtv\.no/(?P<id>[0-9]+)#(?P<display_id>.+)
'
- _TEST
=
{
+ _VALID_URL = r'http
s?://(?:www\.)?dbtv\.no/(?:(?:lazyplayer|player)/)?(?P<id>[0-9]+)(?:#(?P<display_id>.+))?
'
+ _TEST
S = [
{
'url': 'http://dbtv.no/3649835190001#Skulle_teste_ut_fornøyelsespark,_men_kollegaen_var_bare_opptatt_av_bikinikroppen',
'md5': 'b89953ed25dacb6edb3ef6c6f430f8bc',
'info_dict': {
'url': 'http://dbtv.no/3649835190001#Skulle_teste_ut_fornøyelsespark,_men_kollegaen_var_bare_opptatt_av_bikinikroppen',
'md5': 'b89953ed25dacb6edb3ef6c6f430f8bc',
'info_dict': {
@@
-29,12
+30,18
@@
class DBTVIE(InfoExtractor):
'view_count': int,
'categories': list,
}
'view_count': int,
'categories': list,
}
- }
+ }, {
+ 'url': 'http://dbtv.no/3649835190001',
+ 'only_matching': True,
+ }, {
+ 'url': 'http://www.dbtv.no/lazyplayer/4631135248001',
+ 'only_matching': True,
+ }]
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
video_id = mobj.group('id')
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
video_id = mobj.group('id')
- display_id = mobj.group('display_id')
+ display_id = mobj.group('display_id')
or video_id
data = self._download_json(
'http://api.dbtv.no/discovery/%s' % video_id, display_id)
data = self._download_json(
'http://api.dbtv.no/discovery/%s' % video_id, display_id)
@@
-61,7
+68,7
@@
class DBTVIE(InfoExtractor):
self._sort_formats(formats)
return {
self._sort_formats(formats)
return {
- 'id':
video['id']
,
+ 'id':
compat_str(video['id'])
,
'display_id': display_id,
'title': video['title'],
'description': clean_html(video['desc']),
'display_id': display_id,
'title': video['title'],
'description': clean_html(video['desc']),