Skip to content

Use prefix to allow exceed Windows MAX_PATH #2621

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
albertvillanova merged 6 commits into from
Jul 16, 2021
Merged

Use prefix to allow exceed Windows MAX_PATH #2621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c081367
Use prefix to allow exceed Windows MAX_PATH
albertvillanova Jul 9, 2021
9d050d3
Use prefix only with absolute paths
albertvillanova Jul 11, 2021
02a7160
Fix tests
albertvillanova Jul 11, 2021
137fde8
Remove raise FileNotFoundError in WindowsFileLock
albertvillanova Jul 12, 2021
a24d54c
Use always absolute paths
albertvillanova Jul 13, 2021
eea8d03
Use prefix in FileLock instantiation
albertvillanova Jul 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/datasets/utils/filelock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,13 +352,15 @@ class WindowsFileLock(BaseFileLock):
windows systems.
"""

def __init__(self, lock_file, timeout=-1, max_filename_length=255):
super().__init__(lock_file, timeout=timeout, max_filename_length=max_filename_length)
self._lock_file = "\\\\?\\" + os.path.abspath(os.path.expanduser(os.path.expandvars(self._lock_file)))

def _acquire(self):
open_mode = os.O_RDWR | os.O_CREAT | os.O_TRUNC

try:
fd = os.open(self._lock_file, open_mode)
except FileNotFoundError:
raise
except OSError:
pass
else:
Expand Down
6 changes: 3 additions & 3 deletions tests/test_filelock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@


def test_filelock(tmpdir):
lock1 = FileLock(tmpdir / "foo.lock")
lock2 = FileLock(tmpdir / "foo.lock")
lock1 = FileLock(str(tmpdir / "foo.lock"))
lock2 = FileLock(str(tmpdir / "foo.lock"))
timeout = 0.01
with lock1.acquire():
with pytest.raises(Timeout):
Expand All @@ -19,7 +19,7 @@ def test_filelock(tmpdir):

def test_long_filename(tmpdir):
filename = "a" * 1000 + ".lock"
lock1 = FileLock(tmpdir / filename)
lock1 = FileLock(str(tmpdir / filename))
assert lock1._lock_file.endswith(".lock")
assert not lock1._lock_file.endswith(filename)
assert len(os.path.basename(lock1._lock_file)) <= 255
Expand Down