files views: Accept drop event before processing

Author: ferdnyc

src/windows/models/files_model.py

@@ -443,14 +443,12 @@ def process_urls(self, qurl_list):
                     log.warning("Directory recursion failed", exc_info=1)
             elif os.path.isfile(filepath):
                 media_paths.append(filepath)
-
+        if not media_paths:
+            return
         # Import all new media files
-        if media_paths:
-            media_paths.sort()
-            log.debug("Importing file list: {}".format(media_paths))
-            return self.add_files(media_paths, quiet=import_quietly)
-        else:
-            return False
+        media_paths.sort()
+        log.debug("Importing file list: {}".format(media_paths))
+        self.add_files(media_paths, quiet=import_quietly)
 
     def get_thumb_path(
             self, file_id, thumbnail_frame, clear_cache=False):

src/windows/views/files_listview.py

@@ -119,19 +119,19 @@ def dragMoveEvent(self, event):
 
     # Handle a drag and drop being dropped on widget
     def dropEvent(self, event):
+        if not event.mimeData().hasUrls():
+            # Nothing we're interested in
+            event.reject()
+            return
+        event.accept()
         # Use try/finally so we always reset the cursor
         try:
             # Set cursor to waiting
             get_app().setOverrideCursor(QCursor(Qt.WaitCursor))
 
-            if not event.mimeData().hasUrls():
-                return
-
             qurl_list = event.mimeData().urls()
             log.info("Processing drop event for {} urls".format(len(qurl_list)))
-            result = self.files_model.process_urls(qurl_list)
-            if result:
-                event.accept()
+            self.files_model.process_urls(qurl_list)
         finally:
             # Restore cursor
             get_app().restoreOverrideCursor()

src/windows/views/files_treeview.py

@@ -122,19 +122,19 @@ def dragMoveEvent(self, event):
 
     # Handle a drag and drop being dropped on widget
     def dropEvent(self, event):
+        if not event.mimeData().hasUrls():
+            # Nothing we're interested in
+            event.reject()
+            return
+        event.accept()
         # Use try/finally so we always reset the cursor
         try:
             # Set cursor to waiting
             get_app().setOverrideCursor(QCursor(Qt.WaitCursor))
 
-            if not event.mimeData().hasUrls():
-                return
-
             qurl_list = event.mimeData().urls()
             log.info("Processing drop event for {} urls".format(len(qurl_list)))
-            result = self.files_model.process_urls(qurl_list)
-            if result:
-                event.accept()
+            self.files_model.process_urls(qurl_list)
         finally:
             # Restore cursor
             get_app().restoreOverrideCursor()