arsenetar/send2trash
1
0
Fork 0
mirror of https://github.com/arsenetar/send2trash.git synced 2025-05-08 09:49:52 +00:00
Code Releases Activity

Fix #31: Silently failing on Windows

Browse Source
This commit is contained in:
sharkykh 2019-04-29 23:15:50 +03:00
parent 1c32d471f2
commit d1f8b4a2db
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
send2trash/plat_win.py
View File

@ -7,7 +7,8 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from ctypes import (windll, Structure, byref, c_uint, from ctypes import (windll, Structure, byref, c_uint,
create_unicode_buffer, addressof) create_unicode_buffer, addressof,
GetLastError, FormatError)
from ctypes.wintypes import HWND, UINT, LPCWSTR, BOOL from ctypes.wintypes import HWND, UINT, LPCWSTR, BOOL
import os.path as op import os.path as op
@ -49,6 +50,11 @@ def get_short_path_name(long_name):
if not long_name.startswith('\\\\?\\'): if not long_name.startswith('\\\\?\\'):
long_name = '\\\\?\\' + long_name long_name = '\\\\?\\' + long_name
buf_size = GetShortPathNameW(long_name, None, 0) buf_size = GetShortPathNameW(long_name, None, 0)
# FIX: https://github.com/hsoft/send2trash/issues/31
# If buffer size is zero, an error has occurred.
if not buf_size:
err_no = GetLastError()
raise WindowsError(err_no, FormatError(err_no), long_name[4:])
output = create_unicode_buffer(buf_size) output = create_unicode_buffer(buf_size)
GetShortPathNameW(long_name, output, buf_size) GetShortPathNameW(long_name, output, buf_size)
return output.value[4:] # Remove '\\?\' for SHFileOperationW return output.value[4:] # Remove '\\?\' for SHFileOperationW
@ -83,4 +89,4 @@ def send2trash(path):
fileop.lpszProgressTitle = None fileop.lpszProgressTitle = None
result = SHFileOperationW(byref(fileop)) result = SHFileOperationW(byref(fileop))
if result: if result:
raise WindowsError(None, None, path, result) raise WindowsError(result, FormatError(result), path)