1
0
mirror of https://gitlab.com/ytdl-org/youtube-dl.git synced 2026-01-24 00:00:10 -05:00

Compare commits

...

7 Commits

Author SHA1 Message Date
Philipp Hagemeister
7b1a2bbe17 release 2011.09.18 2011-09-15 19:29:16 +02:00
Philipp Hagemeister
c25303c3d5 Set continue to false again; we need to send to actually send a HEAD request to determine whether we can continue or not 2011-09-15 19:27:21 +02:00
Philipp Hagemeister
cc025e1226 release 2011.09.17 2011-09-15 19:23:52 +02:00
Philipp Hagemeister
eca1b76f01 Update README 2011-09-15 19:23:17 +02:00
Philipp Hagemeister
366cbfb04a Fix _do_download signature 2011-09-15 19:22:18 +02:00
Philipp Hagemeister
18bb3d1e35 Make --continue the default and provide --no-continue (Closes #119) 2011-09-15 19:12:04 +02:00
Michael Haggerty
10e7194db1 If --continue is not enabled, set resume_len to zero.
This corrects the reporting of download progress (which previously
started at a value greater than zero).
2011-09-15 19:07:53 +02:00
3 changed files with 22 additions and 14 deletions

View File

@@ -1 +1 @@
2011.09.16
2011.09.18

View File

@@ -37,6 +37,8 @@ which means you can modify it, redistribute it or use it however you like.
-a, --batch-file FILE file containing URLs to download ('-' for stdin)
-w, --no-overwrites do not overwrite files
-c, --continue resume partially downloaded files
--no-continue do not resume partially downloaded files (restart
from beginning)
--cookies FILE file to dump cookie jar to
--no-part do not use .part files
--no-mtime do not use the Last-modified header to set the file

View File

@@ -15,7 +15,7 @@ __author__ = (
)
__license__ = 'Public Domain'
__version__ = '2011.09.16'
__version__ = '2011.09.18'
UPDATE_URL = 'https://raw.github.com/rg3/youtube-dl/master/youtube-dl'
@@ -775,8 +775,7 @@ class FileDownloader(object):
if not self.params.get('skip_download', False):
try:
success,add_data = self._do_download(filename, info_dict['url'].encode('utf-8'), info_dict.get('player_url', None))
info_dict.update(add_data)
success = self._do_download(filename, info_dict)
except (OSError, IOError), err:
raise UnavailableVideoError
except (urllib2.URLError, httplib.HTTPException, socket.error), err:
@@ -865,7 +864,10 @@ class FileDownloader(object):
self.trouble(u'\nERROR: rtmpdump exited with code %d' % retval)
return False
def _do_download(self, filename, url, player_url):
def _do_download(self, filename, info_dict):
url = info_dict['url']
player_url = info_dict.get('player_url', None)
# Check file already present
if self.params.get('continuedl', False) and os.path.isfile(filename) and not self.params.get('nopart', False):
self.report_file_already_downloaded(filename)
@@ -877,7 +879,6 @@ class FileDownloader(object):
tmpfilename = self.temp_name(filename)
stream = None
open_mode = 'wb'
# Do not include the Accept-Encoding header
headers = {'Youtubedl-no-compression': 'True'}
@@ -890,11 +891,14 @@ class FileDownloader(object):
else:
resume_len = 0
# Request parameters in case of being able to resume
if self.params.get('continuedl', False) and resume_len != 0:
self.report_resuming_byte(resume_len)
request.add_header('Range', 'bytes=%d-' % resume_len)
open_mode = 'ab'
open_mode = 'wb'
if resume_len != 0:
if self.params.get('continuedl', False):
self.report_resuming_byte(resume_len)
request.add_header('Range','bytes=%d-' % resume_len)
open_mode = 'ab'
else:
resume_len = 0
count = 0
retries = self.params.get('retries', 0)
@@ -996,11 +1000,10 @@ class FileDownloader(object):
self.try_rename(tmpfilename, filename)
# Update file modification time
filetime = None
if self.params.get('updatetime', True):
filetime = self.try_utime(filename, data.info().get('last-modified', None))
info_dict['filetime'] = self.try_utime(filename, data.info().get('last-modified', None))
return True, {'filetime': filetime}
return True
class InfoExtractor(object):
@@ -3567,6 +3570,9 @@ def parseOpts():
action='store_true', dest='nooverwrites', help='do not overwrite files', default=False)
filesystem.add_option('-c', '--continue',
action='store_true', dest='continue_dl', help='resume partially downloaded files', default=False)
filesystem.add_option('--no-continue',
action='store_false', dest='continue_dl',
help='do not resume partially downloaded files (restart from beginning)')
filesystem.add_option('--cookies',
dest='cookiefile', metavar='FILE', help='file to dump cookie jar to')
filesystem.add_option('--no-part',