From 9a9e5d5d7b65aea590684189408b5e6914f12c06 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 21 Nov 2015 10:02:42 +0530
Subject: [PATCH] Allow USBMS sub-classes to override delete extra book files
 behavior easily

---
 src/calibre/devices/usbms/driver.py | 33 ++++++++++++++++-------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/calibre/devices/usbms/driver.py b/src/calibre/devices/usbms/driver.py
index d35ac33637..9e53022488 100644
--- a/src/calibre/devices/usbms/driver.py
+++ b/src/calibre/devices/usbms/driver.py
@@ -382,6 +382,23 @@ class USBMS(CLI, Device):
     def delete_single_book(self, 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):
         debug_print('USBMS: deleting %d books'%(len(paths)))
         for i, path in enumerate(paths):
@@ -390,22 +407,8 @@ class USBMS(CLI, Device):
             if os.path.exists(path):
                 # Delete the ebook
                 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...'))
         debug_print('USBMS: finished deleting %d books'%(len(paths)))