projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0f4a5a7
)
[hgtv.com:show] Relax video config regex and update test (closes #13279, closes ...
author
Sergey M․
<dstftw@gmail.com>
Thu, 22 Jun 2017 17:42:42 +0000
(
00:42
+0700)
committer
Sergey M․
<dstftw@gmail.com>
Thu, 22 Jun 2017 17:42:42 +0000
(
00:42
+0700)
youtube_dl/extractor/hgtv.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/hgtv.py
b/youtube_dl/extractor/hgtv.py
index e854300c71b6b5c2592f9c9c84b386831578c482..4d4b068245f75c397774aee74600a84be57d02d3 100644
(file)
--- a/
youtube_dl/extractor/hgtv.py
+++ b/
youtube_dl/extractor/hgtv.py
@@
-7,14
+7,19
@@
from .common import InfoExtractor
class HGTVComShowIE(InfoExtractor):
IE_NAME = 'hgtv.com:show'
_VALID_URL = r'https?://(?:www\.)?hgtv\.com/shows/[^/]+/(?P<id>[^/?#&]+)'
class HGTVComShowIE(InfoExtractor):
IE_NAME = 'hgtv.com:show'
_VALID_URL = r'https?://(?:www\.)?hgtv\.com/shows/[^/]+/(?P<id>[^/?#&]+)'
- _TEST = {
- 'url': 'http://www.hgtv.com/shows/flip-or-flop/flip-or-flop-full-episodes-videos',
+ _TESTS = [{
+ # data-module="video"
+ 'url': 'http://www.hgtv.com/shows/flip-or-flop/flip-or-flop-full-episodes-season-4-videos',
'info_dict': {
'info_dict': {
- 'id': 'flip-or-flop-full-episodes-videos',
+ 'id': 'flip-or-flop-full-episodes-
season-4-
videos',
'title': 'Flip or Flop Full Episodes',
},
'playlist_mincount': 15,
'title': 'Flip or Flop Full Episodes',
},
'playlist_mincount': 15,
- }
+ }, {
+ # data-deferred-module="video"
+ 'url': 'http://www.hgtv.com/shows/good-bones/episodes/an-old-victorian-house-gets-a-new-facelift',
+ 'only_matching': True,
+ }]
def _real_extract(self, url):
display_id = self._match_id(url)
def _real_extract(self, url):
display_id = self._match_id(url)
@@
-23,7
+28,7
@@
class HGTVComShowIE(InfoExtractor):
config = self._parse_json(
self._search_regex(
config = self._parse_json(
self._search_regex(
- r'(?s)data-module=["\']video["\'][^>]*>.*?<script[^>]+type=["\']text/x-config["\'][^>]*>(.+?)</script',
+ r'(?s)data-
(?:deferred)?-
module=["\']video["\'][^>]*>.*?<script[^>]+type=["\']text/x-config["\'][^>]*>(.+?)</script',
webpage, 'video config'),
display_id)['channels'][0]
webpage, 'video config'),
display_id)['channels'][0]