projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c430802
)
[voewster] Detect series geo restriction
author
Sergey M․
<dstftw@gmail.com>
Tue, 22 Sep 2015 15:52:41 +0000
(21:52 +0600)
committer
Sergey M․
<dstftw@gmail.com>
Tue, 22 Sep 2015 15:52:41 +0000
(21:52 +0600)
youtube_dl/extractor/viewster.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/viewster.py
b/youtube_dl/extractor/viewster.py
index 8defc18000e90394776ebc13782c689da248bdc6..f8f4143c63edf8aa9dc1bd00ea6aef9c56b4607c 100644
(file)
--- a/
youtube_dl/extractor/viewster.py
+++ b/
youtube_dl/extractor/viewster.py
@@
-3,12
+3,14
@@
from __future__ import unicode_literals
from .common import InfoExtractor
from ..compat import (
from .common import InfoExtractor
from ..compat import (
+ compat_HTTPError,
compat_urllib_request,
compat_urllib_parse,
compat_urllib_parse_unquote,
)
from ..utils import (
determine_ext,
compat_urllib_request,
compat_urllib_parse,
compat_urllib_parse_unquote,
)
from ..utils import (
determine_ext,
+ ExtractorError,
int_or_none,
parse_iso8601,
HEADRequest,
int_or_none,
parse_iso8601,
HEADRequest,
@@
-86,9
+88,15
@@
class ViewsterIE(InfoExtractor):
# unfinished serie has no Type
if info.get('Type') in ['Serie', None]:
# unfinished serie has no Type
if info.get('Type') in ['Serie', None]:
- episodes = self._download_json(
- 'https://public-api.viewster.com/series/%s/episodes' % entry_id,
- video_id, 'Downloading series JSON')
+ try:
+ episodes = self._download_json(
+ 'https://public-api.viewster.com/series/%s/episodes' % entry_id,
+ video_id, 'Downloading series JSON')
+ except ExtractorError as e:
+ if isinstance(e.cause, compat_HTTPError) and e.cause.code == 404:
+ self.raise_geo_restricted()
+ else:
+ raise
entries = [
self.url_result(
'http://www.viewster.com/movie/%s' % episode['OriginId'], 'Viewster')
entries = [
self.url_result(
'http://www.viewster.com/movie/%s' % episode['OriginId'], 'Viewster')