D'nd for remove books

src/calibre/gui2/actions/delete.py

@@ -88,6 +88,32 @@ class DeleteAction(InterfaceAction):
     action_add_menu = True
     action_menu_clone_qaction = _('Remove selected books')
 
+    accepts_drops = True
+
+    def accept_enter_event(self, event, mime_data):
+        if mime_data.hasFormat("application/calibre+from_library"):
+            return True
+        return False
+
+    def accept_drag_move_event(self, event, mime_data):
+        if mime_data.hasFormat("application/calibre+from_library"):
+            return True
+        return False
+
+    def drop_event(self, event, mime_data):
+        mime = 'application/calibre+from_library'
+        if mime_data.hasFormat(mime):
+            self.dropped_ids = tuple(map(int, str(mime_data.data(mime)).split()))
+            QTimer.singleShot(1, self.do_drop)
+            return True
+        return False
+
+    def do_drop(self):
+        book_ids = self.dropped_ids
+        del self.dropped_ids
+        if book_ids:
+            self.do_library_delete(book_ids)
+
     def genesis(self):
         self.qaction.triggered.connect(self.delete_books)
         self.delete_menu = self.qaction.menu()
@@ -296,17 +322,8 @@ class DeleteAction(InterfaceAction):
             current_row = rmap.get(next_id, None)
         self.library_ids_deleted(ids_deleted, current_row=current_row)
 
-    def delete_books(self, *args):
-        '''
-        Delete selected books from device or library.
-        '''
+    def do_library_delete(self, to_delete_ids):
         view = self.gui.current_view()
-        rows = view.selectionModel().selectedRows()
-        if not rows or len(rows) == 0:
-            return
-        # Library view is visible.
-        if self.gui.stack.currentIndex() == 0:
-            to_delete_ids = [view.model().id(r) for r in rows]
         # Ask the user if they want to delete the book from the library or device if it is in both.
         if self.gui.device_manager.is_device_connected:
             on_device = False
@@ -336,12 +353,25 @@ class DeleteAction(InterfaceAction):
                             +'</p>', 'library_delete_books', self.gui):
             return
         next_id = view.next_id
-            if len(rows) < 5:
+        if len(to_delete_ids) < 5:
             view.model().delete_books_by_id(to_delete_ids)
             self.library_ids_deleted2(to_delete_ids, next_id=next_id)
         else:
             self.__md = MultiDeleter(self.gui, to_delete_ids,
                     partial(self.library_ids_deleted2, next_id=next_id))
+
+    def delete_books(self, *args):
+        '''
+        Delete selected books from device or library.
+        '''
+        view = self.gui.current_view()
+        rows = view.selectionModel().selectedRows()
+        if not rows or len(rows) == 0:
+            return
+        # Library view is visible.
+        if self.gui.stack.currentIndex() == 0:
+            to_delete_ids = [view.model().id(r) for r in rows]
+            self.do_library_delete(to_delete_ids)
         # Device view is visible.
         else:
             if self.gui.stack.currentIndex() == 1:

src/calibre/gui2/actions/edit_metadata.py

@@ -50,6 +50,7 @@ class EditMetadataAction(InterfaceAction):
     def do_drop(self):
         book_ids = self.dropped_ids
         del self.dropped_ids
+        if book_ids:
             db = self.gui.library_view.model().db
             rows = [db.row(i) for i in book_ids]
             self.edit_metadata_for(rows, book_ids)