mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-09-05 05:55:24 +02:00
Report final URL with -g and do not print URLs normally (fixes issue #49)
This commit is contained in:
parent
eae2666cb4
commit
30edbf89e4
11
youtube-dl
11
youtube-dl
@ -221,11 +221,13 @@ class FileDownloader(object):
|
|||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def verify_url(url):
|
def verify_url(url):
|
||||||
"""Verify a URL is valid and data could be downloaded."""
|
"""Verify a URL is valid and data could be downloaded. Return real data URL."""
|
||||||
request = urllib2.Request(url, None, std_headers)
|
request = urllib2.Request(url, None, std_headers)
|
||||||
data = urllib2.urlopen(request)
|
data = urllib2.urlopen(request)
|
||||||
data.read(1)
|
data.read(1)
|
||||||
|
url = data.geturl()
|
||||||
data.close()
|
data.close()
|
||||||
|
return url
|
||||||
|
|
||||||
def add_info_extractor(self, ie):
|
def add_info_extractor(self, ie):
|
||||||
"""Add an InfoExtractor object to the end of the list."""
|
"""Add an InfoExtractor object to the end of the list."""
|
||||||
@ -307,7 +309,7 @@ class FileDownloader(object):
|
|||||||
# Do nothing else if in simulate mode
|
# Do nothing else if in simulate mode
|
||||||
if self.params.get('simulate', False):
|
if self.params.get('simulate', False):
|
||||||
try:
|
try:
|
||||||
self.verify_url(info_dict['url'])
|
info_dict['url'] = self.verify_url(info_dict['url'])
|
||||||
except (OSError, IOError, urllib2.URLError, httplib.HTTPException, socket.error), err:
|
except (OSError, IOError, urllib2.URLError, httplib.HTTPException, socket.error), err:
|
||||||
raise UnavailableFormatError
|
raise UnavailableFormatError
|
||||||
|
|
||||||
@ -583,10 +585,6 @@ class YoutubeIE(InfoExtractor):
|
|||||||
"""Report attempt to extract video information."""
|
"""Report attempt to extract video information."""
|
||||||
self._downloader.to_stdout(u'[youtube] %s: Extracting video information' % video_id)
|
self._downloader.to_stdout(u'[youtube] %s: Extracting video information' % video_id)
|
||||||
|
|
||||||
def report_video_url(self, video_id, video_real_url):
|
|
||||||
"""Report extracted video URL."""
|
|
||||||
self._downloader.to_stdout(u'[youtube] %s: URL: %s' % (video_id, video_real_url))
|
|
||||||
|
|
||||||
def report_unavailable_format(self, video_id, format):
|
def report_unavailable_format(self, video_id, format):
|
||||||
"""Report extracted video URL."""
|
"""Report extracted video URL."""
|
||||||
self._downloader.to_stdout(u'[youtube] %s: Format %s not available' % (video_id, format))
|
self._downloader.to_stdout(u'[youtube] %s: Format %s not available' % (video_id, format))
|
||||||
@ -712,7 +710,6 @@ class YoutubeIE(InfoExtractor):
|
|||||||
video_real_url = 'http://www.youtube.com/get_video?video_id=%s&t=%s&eurl=&el=detailpage&ps=default&gl=US&hl=en' % (video_id, token)
|
video_real_url = 'http://www.youtube.com/get_video?video_id=%s&t=%s&eurl=&el=detailpage&ps=default&gl=US&hl=en' % (video_id, token)
|
||||||
if format_param is not None:
|
if format_param is not None:
|
||||||
video_real_url = '%s&fmt=%s' % (video_real_url, format_param)
|
video_real_url = '%s&fmt=%s' % (video_real_url, format_param)
|
||||||
self.report_video_url(video_id, video_real_url)
|
|
||||||
|
|
||||||
# uploader
|
# uploader
|
||||||
mobj = re.search(r'(?m)&author=([^&]+)(?:&|$)', video_info_webpage)
|
mobj = re.search(r'(?m)&author=([^&]+)(?:&|$)', video_info_webpage)
|
||||||
|
Loading…
Reference in New Issue
Block a user