projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cc42941
)
[itv] Improve extraction (closes #16253)
author
Sergey M․
<dstftw@gmail.com>
Tue, 1 May 2018 15:46:06 +0000
(22:46 +0700)
committer
Sergey M․
<dstftw@gmail.com>
Tue, 1 May 2018 15:48:08 +0000
(22:48 +0700)
youtube_dl/extractor/itv.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/itv.py
b/youtube_dl/extractor/itv.py
index 18a7d7f8cde2f2434d0db003836b5e7a437b2c9a..457b424a2089d2b6c40103a04d579682bebe4bb3 100644
(file)
--- a/
youtube_dl/extractor/itv.py
+++ b/
youtube_dl/extractor/itv.py
@@
-41,6
+41,14
@@
class ITVIE(InfoExtractor):
# unavailable via data-playlist-url
'url': 'https://www.itv.com/hub/through-the-keyhole/2a2271a0033',
'only_matching': True,
# unavailable via data-playlist-url
'url': 'https://www.itv.com/hub/through-the-keyhole/2a2271a0033',
'only_matching': True,
+ }, {
+ # InvalidVodcrid
+ 'url': 'https://www.itv.com/hub/james-martins-saturday-morning/2a5159a0034',
+ 'only_matching': True,
+ }, {
+ # ContentUnavailable
+ 'url': 'https://www.itv.com/hub/whos-doing-the-dishes/2a2898a0024',
+ 'only_matching': True,
}]
def _real_extract(self, url):
}]
def _real_extract(self, url):
@@
-127,7
+135,8
@@
class ITVIE(InfoExtractor):
if fault_code == 'InvalidGeoRegion':
self.raise_geo_restricted(
msg=fault_string, countries=self._GEO_COUNTRIES)
if fault_code == 'InvalidGeoRegion':
self.raise_geo_restricted(
msg=fault_string, countries=self._GEO_COUNTRIES)
- elif fault_code != 'InvalidEntity':
+ elif fault_code not in (
+ 'InvalidEntity', 'InvalidVodcrid', 'ContentUnavailable'):
raise ExtractorError(
'%s said: %s' % (self.IE_NAME, fault_string), expected=True)
info.update({
raise ExtractorError(
'%s said: %s' % (self.IE_NAME, fault_string), expected=True)
info.update({