Changed variable names

originalURL makes more sense than dlstring
This commit is contained in:
TellowKrinkle 2016-05-27 22:10:22 -05:00
parent 5b7d70d625
commit bdaf8a82b0

View File

@ -105,16 +105,16 @@ class GoogleDriveIE(InfoExtractor):
if 'html' in downloadPage: if 'html' in downloadPage:
confirm = self._search_regex(r'confirm=([^&"]+)', downloadPage, 'confirm', default=None) confirm = self._search_regex(r'confirm=([^&"]+)', downloadPage, 'confirm', default=None)
if confirm: if confirm:
dlstring = 'https://docs.google.com/uc?export=download&confirm=%s&id=%s' % (confirm, video_id) originalURL = 'https://docs.google.com/uc?export=download&confirm=%s&id=%s' % (confirm, video_id)
else: else:
downloadable = False downloadable = False
else: else:
dlstring = 'https://docs.google.com/uc?export=download&id=%s' % video_id originalURL = 'https://docs.google.com/uc?export=download&id=%s' % video_id
if downloadable: if downloadable:
originalExtension = self._search_regex(r'"([^"]+)",[^,]*,[^,]*$', webpage, 'original extension', default=None) originalExtension = self._search_regex(r'"([^"]+)",[^,]*,[^,]*$', webpage, 'original extension', default=None)
originalSize = int_or_none(self._search_regex(r'"([^"]+)"[^"]*\n[^\n]*,[^,]*$', webpage, 'original size', default=None)) originalSize = int_or_none(self._search_regex(r'"([^"]+)"[^"]*\n[^\n]*,[^,]*$', webpage, 'original size', default=None))
formats.append({ formats.append({
'url': dlstring, 'url': originalURL,
'format_id': 'Original', 'format_id': 'Original',
'ext': originalExtension, 'ext': originalExtension,
'filesize': originalSize, 'filesize': originalSize,