xZero707/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2025-02-06 20:39:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

modify sanitize_open() to use locked_file(), preventing silent corruption when a second youtube-dl instance is attempting to write the same file. There is still a corner case, if a .part file is being used (--no-part is not enabled), in that the .part file is closed before it's renamed to remove the .part, in that window, another process could modify the .part file before it's renamed. Using --no-part prevents this corner case.

Browse Source
This commit is contained in:
jakeogh 2018-12-27 17:08:20 -07:00
parent 3729c52f9d
commit 8230a3575e
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
youtube_dl/utils.py
View File

@ -2051,7 +2051,8 @@ def sanitize_open(filename, open_mode):
import msvcrt import msvcrt
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY) msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
return (sys.stdout.buffer if hasattr(sys.stdout, 'buffer') else sys.stdout, filename) return (sys.stdout.buffer if hasattr(sys.stdout, 'buffer') else sys.stdout, filename)
stream = open(encodeFilename(filename), open_mode) stream = locked_file(encodeFilename(filename), open_mode, block=False)
stream = stream.__enter__()
return (stream, filename) return (stream, filename)
except (IOError, OSError) as err: except (IOError, OSError) as err:
if err.errno in (errno.EACCES,): if err.errno in (errno.EACCES,):
@ -2063,7 +2064,8 @@ def sanitize_open(filename, open_mode):
raise raise
else: else:
# An exception here should be caught in the caller # An exception here should be caught in the caller
stream = open(encodeFilename(alt_filename), open_mode) stream = locked_file(encodeFilename(filename), open_mode, block=False)
stream = stream.__enter__()
return (stream, alt_filename) return (stream, alt_filename)
@ -3258,15 +3260,18 @@ else:
try: try:
import fcntl import fcntl
def _lock_file(f, exclusive): def _lock_file(f, exclusive, block):
fcntl.flock(f, fcntl.LOCK_EX if exclusive else fcntl.LOCK_SH) if block:
fcntl.flock(f, fcntl.LOCK_EX if exclusive else fcntl.LOCK_SH)
else:
fcntl.flock(f, fcntl.LOCK_EX|fcntl.LOCK_NB if exclusive else fcntl.LOCK_SH)
def _unlock_file(f): def _unlock_file(f):
fcntl.flock(f, fcntl.LOCK_UN) fcntl.flock(f, fcntl.LOCK_UN)
except ImportError: except ImportError:
UNSUPPORTED_MSG = 'file locking is not supported on this platform' UNSUPPORTED_MSG = 'file locking is not supported on this platform'
def _lock_file(f, exclusive): def _lock_file(f, exclusive, block):
raise IOError(UNSUPPORTED_MSG) raise IOError(UNSUPPORTED_MSG)
def _unlock_file(f): def _unlock_file(f):
@ -3274,15 +3279,16 @@ else:
class locked_file(object): class locked_file(object):
def __init__(self, filename, mode, encoding=None): def __init__(self, filename, mode, block=True, encoding=None):
assert mode in ['r', 'a', 'w'] assert mode in ['r', 'rb', 'a', 'ab', 'w', 'wb']
self.f = io.open(filename, mode, encoding=encoding) self.f = io.open(filename, mode, encoding=encoding)
self.mode = mode self.mode = mode
self.block = block
def __enter__(self): def __enter__(self):
exclusive = self.mode != 'r' exclusive = self.mode not in ['r', 'rb']
try: try:
_lock_file(self.f, exclusive) _lock_file(self.f, exclusive, self.block)
except IOError: except IOError:
self.f.close() self.f.close()
raise raise
@ -3303,6 +3309,8 @@ class locked_file(object):
def read(self, *args): def read(self, *args):
return self.f.read(*args) return self.f.read(*args)
def close(self, *args):
self.__exit__(self, *args, value=False, traceback=False)
def get_filesystem_encoding(): def get_filesystem_encoding():
encoding = sys.getfilesystemencoding() encoding = sys.getfilesystemencoding()