projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[iqiyi] Make _VALID_URL more accurate
[youtube-dl]
/
youtube_dl
/
extractor
/
common.py
diff --git
a/youtube_dl/extractor/common.py
b/youtube_dl/extractor/common.py
index 34e27a35ad2d28d0618e22a42cfedfb97b70dc5f..cecf917ffb67040739bbacf573297ba891ec9ea1 100644
(file)
--- a/
youtube_dl/extractor/common.py
+++ b/
youtube_dl/extractor/common.py
@@
-786,8
+786,8
@@
class InfoExtractor(object):
return True
except ExtractorError as e:
if isinstance(e.cause, compat_HTTPError):
return True
except ExtractorError as e:
if isinstance(e.cause, compat_HTTPError):
- self.
report_warning
(
- '%s
URL is invalid, skipping' % item, video_id
)
+ self.
to_screen
(
+ '%s
: %s URL is invalid, skipping' % (video_id, item)
)
return False
raise
return False
raise
@@
-896,7
+896,7
@@
class InfoExtractor(object):
format_id = []
if m3u8_id:
format_id.append(m3u8_id)
format_id = []
if m3u8_id:
format_id.append(m3u8_id)
- last_media_name = last_media.get('NAME') if last_media else None
+ last_media_name = last_media.get('NAME') if last_media
and last_media.get('TYPE') != 'SUBTITLES'
else None
format_id.append(last_media_name if last_media_name else '%d' % (tbr if tbr else len(formats)))
f = {
'format_id': '-'.join(format_id),
format_id.append(last_media_name if last_media_name else '%d' % (tbr if tbr else len(formats)))
f = {
'format_id': '-'.join(format_id),
@@
-1072,9
+1072,6
@@
class InfoExtractor(object):
def _get_automatic_captions(self, *args, **kwargs):
raise NotImplementedError("This method must be implemented by subclasses")
def _get_automatic_captions(self, *args, **kwargs):
raise NotImplementedError("This method must be implemented by subclasses")
- def _subtitles_timecode(self, seconds):
- return '%02d:%02d:%02d.%03d' % (seconds / 3600, (seconds % 3600) / 60, seconds % 60, (seconds % 1) * 1000)
-
class SearchInfoExtractor(InfoExtractor):
"""
class SearchInfoExtractor(InfoExtractor):
"""