Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use sanitize file name instead of ascii_filename when saving to disk from device

Browse Source
This commit is contained in:
Kovid Goyal 2013-08-30 11:18:33 +05:30
parent 9d73fd3750
commit 610f29d223
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/gui2/device.py
View File

@ -22,7 +22,7 @@ from calibre.gui2 import (config, error_dialog, Dispatcher, dynamic,
warning_dialog, info_dialog, choose_dir, FunctionDispatcher, warning_dialog, info_dialog, choose_dir, FunctionDispatcher,
show_restart_warning, gprefs, question_dialog) show_restart_warning, gprefs, question_dialog)
from calibre.ebooks.metadata import authors_to_string from calibre.ebooks.metadata import authors_to_string
from calibre import preferred_encoding, prints, force_unicode, as_unicode from calibre import preferred_encoding, prints, force_unicode, as_unicode, sanitize_file_name2
from calibre.utils.filenames import ascii_filename from calibre.utils.filenames import ascii_filename
from calibre.devices.errors import (FreeSpaceError, WrongDestinationError, from calibre.devices.errors import (FreeSpaceError, WrongDestinationError,
BlacklistedDevice) BlacklistedDevice)
@ -591,7 +591,7 @@ class DeviceManager(Thread): # {{{
def _save_books(self, paths, target): def _save_books(self, paths, target):
'''Copy books from device to disk''' '''Copy books from device to disk'''
for path in paths: for path in paths:
name = ascii_filename(os.path.basename(path)) name = sanitize_file_name2(os.path.basename(path))
dest = os.path.join(target, name) dest = os.path.join(target, name)
if os.path.abspath(dest) != os.path.abspath(path): if os.path.abspath(dest) != os.path.abspath(path):
with open(dest, 'wb') as f: with open(dest, 'wb') as f: