Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allow USBMS sub-classes to override delete extra book files behavior easily

Browse Source
This commit is contained in:
Kovid Goyal 2015-11-21 10:02:42 +05:30
parent e150b9f159
commit 9a9e5d5d7b
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/calibre/devices/usbms/driver.py
View File

@ -382,6 +382,23 @@ class USBMS(CLI, Device):
def delete_single_book(self, path): def delete_single_book(self, path):
os.unlink(path) os.unlink(path)
def delete_extra_book_files(self, path):
filepath = os.path.splitext(path)[0]
for ext in self.DELETE_EXTS:
for x in (filepath, path):
x += ext
if os.path.exists(x):
if os.path.isdir(x):
shutil.rmtree(x, ignore_errors=True)
else:
os.unlink(x)
if self.SUPPORTS_SUB_DIRS:
try:
os.removedirs(os.path.dirname(path))
except:
pass
def delete_books(self, paths, end_session=True): def delete_books(self, paths, end_session=True):
debug_print('USBMS: deleting %d books'%(len(paths))) debug_print('USBMS: deleting %d books'%(len(paths)))
for i, path in enumerate(paths): for i, path in enumerate(paths):
@ -390,22 +407,8 @@ class USBMS(CLI, Device):
if os.path.exists(path): if os.path.exists(path):
# Delete the ebook # Delete the ebook
self.delete_single_book(path) self.delete_single_book(path)
self.delete_extra_book_files(path)
filepath = os.path.splitext(path)[0]
for ext in self.DELETE_EXTS:
for x in (filepath, path):
x += ext
if os.path.exists(x):
if os.path.isdir(x):
shutil.rmtree(x, ignore_errors=True)
else:
os.unlink(x)
if self.SUPPORTS_SUB_DIRS:
try:
os.removedirs(os.path.dirname(path))
except:
pass
self.report_progress(1.0, _('Removing books from device...')) self.report_progress(1.0, _('Removing books from device...'))
debug_print('USBMS: finished deleting %d books'%(len(paths))) debug_print('USBMS: finished deleting %d books'%(len(paths)))