From acea8d7cfb60d9f9c33ed7662f72110531a54e6d Mon Sep 17 00:00:00 2001 From: Justin Keogh Date: Thu, 3 Mar 2022 13:09:00 +0000 Subject: [PATCH] [utils] Fix file locking for AOSP (#2714) Closes #2080, #2670 Authored by: jakeogh --- yt_dlp/utils.py | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/yt_dlp/utils.py b/yt_dlp/utils.py index 1532210f39..8e9a7dbc8c 100644 --- a/yt_dlp/utils.py +++ b/yt_dlp/utils.py @@ -2141,18 +2141,28 @@ def _unlock_file(f): raise OSError('Unlocking file failed: %r' % ctypes.FormatError()) else: - # Some platforms, such as Jython, is missing fcntl try: import fcntl def _lock_file(f, exclusive, block): - fcntl.flock(f, - fcntl.LOCK_SH if not exclusive - else fcntl.LOCK_EX if block - else fcntl.LOCK_EX | fcntl.LOCK_NB) + try: + fcntl.flock(f, + fcntl.LOCK_SH if not exclusive + else fcntl.LOCK_EX if block + else fcntl.LOCK_EX | fcntl.LOCK_NB) + except BlockingIOError: + raise + except OSError: # AOSP does not have flock() + fcntl.lockf(f, + fcntl.LOCK_SH if not exclusive + else fcntl.LOCK_EX if block + else fcntl.LOCK_EX | fcntl.LOCK_NB) def _unlock_file(f): - fcntl.flock(f, fcntl.LOCK_UN) + try: + fcntl.flock(f, fcntl.LOCK_UN) + except OSError: + fcntl.lockf(f, fcntl.LOCK_UN) except ImportError: UNSUPPORTED_MSG = 'file locking is not supported on this platform'