mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-01-30 12:11:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3304 from takluyver/trash-linux-home-only

Browse Source 
Don't trash files on different device to home dir on Linux
This commit is contained in:
Min RK 2018-02-13 18:13:00 +01:00 committed by GitHub
commit 6ac6f97b80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
notebook/services/contents/filemanager.py
View File

@ -492,13 +492,28 @@ class FileContentsManager(FileManagerMixin, ContentsManager):
if not os.path.exists(os_path): if not os.path.exists(os_path):
raise web.HTTPError(404, u'File or directory does not exist: %s' % os_path) raise web.HTTPError(404, u'File or directory does not exist: %s' % os_path)
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
if self.delete_to_trash: if self.delete_to_trash:
if _check_trash(os_path):
self.log.debug("Sending %s to trash", os_path) self.log.debug("Sending %s to trash", os_path)
# Looking at the code in send2trash, I don't think the errors it # Looking at the code in send2trash, I don't think the errors it
# raises let us distinguish permission errors from other errors in # raises let us distinguish permission errors from other errors in
# code. So for now, just let them all get logged as server errors. # code. So for now, just let them all get logged as server errors.
send2trash(os_path) send2trash(os_path)
return return
else:
self.log.warning("Skipping trash for %s, on different device "
"to home directory", os_path)
if os.path.isdir(os_path): if os.path.isdir(os_path):
listing = os.listdir(os_path) listing = os.listdir(os_path)