Skip to content
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

send2trash now supports deleting from different filesystem type(#1290) #1291

Merged
merged 3 commits into from
Jun 27, 2023
Merged

send2trash now supports deleting from different filesystem type(#1290) #1291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7af74bb
send2trash now supports deleting from different filesystem type (#1290)
Jun 24, 2023
8a2adca
bump the minimum version for Send2Trash (#1290)
Jun 24, 2023
9641dcd
Fix lint error
Jun 26, 2023
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
64 changes: 16 additions & 48 deletions jupyter_server/services/contents/filemanager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,17 +513,6 @@ def delete_file(self, path):
if not self.exists(path):
raise web.HTTPError(404, four_o_four)

def _check_trash(os_path):
if sys.platform in {"win32", "darwin"}:
return True

# It's a bit more nuanced than this, but until we can better
# distinguish errors from send2trash, assume that we can only trash
# files on the same partition as the home directory.
file_dev = os.stat(os_path).st_dev
home_dev = os.stat(os.path.expanduser("~")).st_dev
return file_dev == home_dev

def is_non_empty_dir(os_path):
if os.path.isdir(os_path):
# A directory containing only leftover checkpoints is
Expand All @@ -539,20 +528,15 @@ def is_non_empty_dir(os_path):
# send2trash can really delete files on Windows, so disallow
# deleting non-empty files. See Github issue 3631.
raise web.HTTPError(400, "Directory %s not empty" % os_path)
if _check_trash(os_path):
# Looking at the code in send2trash, I don't think the errors it
# raises let us distinguish permission errors from other errors in
# code. So for now, the "look before you leap" approach is used.
if not self.is_writable(path):
raise web.HTTPError(403, "Permission denied: %s" % path)
self.log.debug("Sending %s to trash", os_path)
# send2trash now supports deleting directories. see #1290
if not self.is_writable(path):
raise web.HTTPError(403, "Permission denied: %s" % path) from None
self.log.debug("Sending %s to trash", os_path)
try:
send2trash(os_path)
return
else:
self.log.warning(
"Skipping trash for %s, on different device to home directory",
os_path,
)
except OSError as e:
raise web.HTTPError(400, "send2trash failed: %s" % e) from e
return

if os.path.isdir(os_path):
# Don't permanently delete non-empty directories.
Expand Down Expand Up @@ -967,17 +951,6 @@ async def delete_file(self, path):
if not os.path.exists(os_path):
raise web.HTTPError(404, "File or directory does not exist: %s" % os_path)

async def _check_trash(os_path):
if sys.platform in {"win32", "darwin"}:
return True

# It's a bit more nuanced than this, but until we can better
# distinguish errors from send2trash, assume that we can only trash
# files on the same partition as the home directory.
file_dev = (await run_sync(os.stat, os_path)).st_dev
home_dev = (await run_sync(os.stat, os.path.expanduser("~"))).st_dev
return file_dev == home_dev

async def is_non_empty_dir(os_path):
if os.path.isdir(os_path):
# A directory containing only leftover checkpoints is
Expand All @@ -998,20 +971,15 @@ async def is_non_empty_dir(os_path):
# send2trash can really delete files on Windows, so disallow
# deleting non-empty files. See Github issue 3631.
raise web.HTTPError(400, "Directory %s not empty" % os_path)
if await _check_trash(os_path):
# Looking at the code in send2trash, I don't think the errors it
# raises let us distinguish permission errors from other errors in
# code. So for now, the "look before you leap" approach is used.
if not self.is_writable(path):
raise web.HTTPError(403, "Permission denied: %s" % path)
self.log.debug("Sending %s to trash", os_path)
# send2trash now supports deleting directories. see #1290
if not self.is_writable(path):
raise web.HTTPError(403, "Permission denied: %s" % path) from None
self.log.debug("Sending %s to trash", os_path)
try:
send2trash(os_path)
return
else:
self.log.warning(
"Skipping trash for %s, on different device to home directory",
os_path,
)
except OSError as e:
raise web.HTTPError(400, "send2trash f`1ailed: %s" % e) from e
return

if os.path.isdir(os_path):
# Don't permanently delete non-empty directories.
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ dependencies = [
"prometheus_client",
"pywinpty;os_name=='nt'",
"pyzmq>=24",
"Send2Trash",
"Send2Trash>=1.8.2",
"terminado>=0.8.3",
"tornado>=6.2.0",
"traitlets>=5.6.0",
Expand Down