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
/
tvigle.py
diff --git
a/youtube_dl/extractor/tvigle.py
b/youtube_dl/extractor/tvigle.py
index 4e95bd30f92c0c387053bbbce20df7f311043cfe..dc3a8334a6b335143dff417d805a26df412d8783 100644
(file)
--- a/
youtube_dl/extractor/tvigle.py
+++ b/
youtube_dl/extractor/tvigle.py
@@
-5,6
+5,7
@@
import re
from .common import InfoExtractor
from ..utils import (
from .common import InfoExtractor
from ..utils import (
+ ExtractorError,
float_or_none,
int_or_none,
parse_age_limit,
float_or_none,
int_or_none,
parse_age_limit,
@@
-29,6
+30,7
@@
class TvigleIE(InfoExtractor):
'duration': 6586,
'age_limit': 12,
},
'duration': 6586,
'age_limit': 12,
},
+ 'skip': 'georestricted',
},
{
'url': 'http://www.tvigle.ru/video/vladimir-vysotskii/vedushchii-teleprogrammy-60-minut-ssha-o-vladimire-vysotskom/',
},
{
'url': 'http://www.tvigle.ru/video/vladimir-vysotskii/vedushchii-teleprogrammy-60-minut-ssha-o-vladimire-vysotskom/',
@@
-41,6
+43,7
@@
class TvigleIE(InfoExtractor):
'duration': 186.080,
'age_limit': 0,
},
'duration': 186.080,
'age_limit': 0,
},
+ 'skip': 'georestricted',
}, {
'url': 'https://cloud.tvigle.ru/video/5267604/',
'only_matching': True,
}, {
'url': 'https://cloud.tvigle.ru/video/5267604/',
'only_matching': True,
@@
-63,9
+66,16
@@
class TvigleIE(InfoExtractor):
item = video_data['playlist']['items'][0]
item = video_data['playlist']['items'][0]
+ videos = item.get('videos')
+
+ error_message = item.get('errorMessage')
+ if not videos and error_message:
+ raise ExtractorError(
+ '%s returned error: %s' % (self.IE_NAME, error_message), expected=True)
+
title = item['title']
title = item['title']
- description = item
['description']
- thumbnail = item
['thumbnail']
+ description = item
.get('description')
+ thumbnail = item
.get('thumbnail')
duration = float_or_none(item.get('durationMilliseconds'), 1000)
age_limit = parse_age_limit(item.get('ageRestrictions'))
duration = float_or_none(item.get('durationMilliseconds'), 1000)
age_limit = parse_age_limit(item.get('ageRestrictions'))
@@
-83,7
+93,7
@@
class TvigleIE(InfoExtractor):
'format_id': '%s-%s' % (vcodec, format_id),
'vcodec': vcodec,
'height': int_or_none(height),
'format_id': '%s-%s' % (vcodec, format_id),
'vcodec': vcodec,
'height': int_or_none(height),
- 'filesize': i
tem['video_files_size'][vcodec][format_id]
,
+ 'filesize': i
nt_or_none(item.get('video_files_size', {}).get(vcodec, {}).get(format_id))
,
})
self._sort_formats(formats)
})
self._sort_formats(formats)