projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[dramafever] Fix subtitles extraction (Closes #8049)
[youtube-dl]
/
youtube_dl
/
extractor
/
engadget.py
diff --git
a/youtube_dl/extractor/engadget.py
b/youtube_dl/extractor/engadget.py
index 92ada81d24b4b542d93222d4d9ba5be877005629..e4180701d7d5fe7f538d029e8ffb27235b6135df 100644
(file)
--- a/
youtube_dl/extractor/engadget.py
+++ b/
youtube_dl/extractor/engadget.py
@@
-3,7
+3,6
@@
from __future__ import unicode_literals
import re
from .common import InfoExtractor
import re
from .common import InfoExtractor
-from .fivemin import FiveMinIE
from ..utils import (
url_basename,
)
from ..utils import (
url_basename,
)
@@
-11,7
+10,7
@@
from ..utils import (
class EngadgetIE(InfoExtractor):
_VALID_URL = r'''(?x)https?://www.engadget.com/
class EngadgetIE(InfoExtractor):
_VALID_URL = r'''(?x)https?://www.engadget.com/
- (?:video
/5min
/(?P<id>\d+)|
+ (?:video
(?:/5min)?
/(?P<id>\d+)|
[\d/]+/.*?)
'''
[\d/]+/.*?)
'''
@@
-27,11
+26,10
@@
class EngadgetIE(InfoExtractor):
}
def _real_extract(self, url):
}
def _real_extract(self, url):
- mobj = re.match(self._VALID_URL, url)
- video_id = mobj.group('id')
+ video_id = self._match_id(url)
if video_id is not None:
if video_id is not None:
- return
FiveMinIE._build_result(
video_id)
+ return
self.url_result('5min:%s' %
video_id)
else:
title = url_basename(url)
webpage = self._download_webpage(url, title)
else:
title = url_basename(url)
webpage = self._download_webpage(url, title)
@@
-39,5
+37,5
@@
class EngadgetIE(InfoExtractor):
return {
'_type': 'playlist',
'title': title,
return {
'_type': 'playlist',
'title': title,
- 'entries': [
FiveMinIE._build_result(id) for
id in ids]
+ 'entries': [
self.url_result('5min:%s' % vid) for v
id in ids]
}
}