projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #8739 from remitamine/update_url_params
[youtube-dl]
/
youtube_dl
/
downloader
/
common.py
diff --git
a/youtube_dl/downloader/common.py
b/youtube_dl/downloader/common.py
index eb63ccffd9428f1a87fadcfc51094591b4083346..f39db58f6c13f623a00b37ef0565dad70f18a305 100644
(file)
--- a/
youtube_dl/downloader/common.py
+++ b/
youtube_dl/downloader/common.py
@@
-5,9
+5,10
@@
import re
import sys
import time
import sys
import time
+from ..compat import compat_os_name
from ..utils import (
encodeFilename,
from ..utils import (
encodeFilename,
- error_to_str,
+ error_to_
compat_
str,
decodeArgument,
format_bytes,
timeconvert,
decodeArgument,
format_bytes,
timeconvert,
@@
-45,6
+46,7
@@
class FileDownloader(object):
(experimental)
external_downloader_args: A list of additional command-line arguments for the
external downloader.
(experimental)
external_downloader_args: A list of additional command-line arguments for the
external downloader.
+ hls_use_mpegts: Use the mpegts container for HLS videos.
Subclasses of this one must re-define the real_download method.
"""
Subclasses of this one must re-define the real_download method.
"""
@@
-156,7
+158,7
@@
class FileDownloader(object):
def slow_down(self, start_time, now, byte_counter):
"""Sleep if the download speed is over the rate limit."""
def slow_down(self, start_time, now, byte_counter):
"""Sleep if the download speed is over the rate limit."""
- rate_limit = self.params.get('ratelimit'
, None
)
+ rate_limit = self.params.get('ratelimit')
if rate_limit is None or byte_counter == 0:
return
if now is None:
if rate_limit is None or byte_counter == 0:
return
if now is None:
@@
-186,7
+188,7
@@
class FileDownloader(object):
return
os.rename(encodeFilename(old_filename), encodeFilename(new_filename))
except (IOError, OSError) as err:
return
os.rename(encodeFilename(old_filename), encodeFilename(new_filename))
except (IOError, OSError) as err:
- self.report_error('unable to rename file: %s' % error_to_str(err))
+ self.report_error('unable to rename file: %s' % error_to_
compat_
str(err))
def try_utime(self, filename, last_modified_hdr):
"""Try to set the last-modified time of the given file."""
def try_utime(self, filename, last_modified_hdr):
"""Try to set the last-modified time of the given file."""
@@
-218,7
+220,7
@@
class FileDownloader(object):
if self.params.get('progress_with_newline', False):
self.to_screen(fullmsg)
else:
if self.params.get('progress_with_newline', False):
self.to_screen(fullmsg)
else:
- if
os.
name == 'nt':
+ if
compat_os_
name == 'nt':
prev_len = getattr(self, '_report_progress_prev_line_length',
0)
if prev_len > len(fullmsg):
prev_len = getattr(self, '_report_progress_prev_line_length',
0)
if prev_len > len(fullmsg):
@@
-295,7
+297,7
@@
class FileDownloader(object):
def report_retry(self, count, retries):
"""Report retry in case of HTTP error 5xx"""
def report_retry(self, count, retries):
"""Report retry in case of HTTP error 5xx"""
- self.to_screen('[download] Got server HTTP error. Retrying (attempt %d of %
d
)...' % (count, retries))
+ self.to_screen('[download] Got server HTTP error. Retrying (attempt %d of %
.0f
)...' % (count, retries))
def report_file_already_downloaded(self, file_name):
"""Report file has already been fully downloaded."""
def report_file_already_downloaded(self, file_name):
"""Report file has already been fully downloaded."""