Merge pull request #2797 from alicevision/fix/dragDropFiles

Improve behaviour when dropping folders

Author: fabiencastan

meshroom/multiview.py

@@ -1,7 +1,7 @@
 import os
 
 # Supported image extensions
-imageExtensions = (
+imageExtensions = [
     # bmp:
     '.bmp',
     # cineon:
@@ -57,21 +57,23 @@
     '.zfile',
     # osl:
     '.osl', '.oso', '.oslgroup', '.oslbody',
-    )
-videoExtensions = (
+    ]
+videoExtensions = [
     '.avi', '.mov', '.qt',
     '.mkv', '.webm',
     '.mp4', '.mpg', '.mpeg', '.m2v', '.m4v',
     '.wmv',
     '.ogv', '.ogg',
     '.mxf',
-    )
-panoramaInfoExtensions = ('.xml')
-meshroomSceneExtensions = ('.mg')
+    ]
+panoramaInfoExtensions = ['.xml']
+meshroomSceneExtensions = ['.mg']
 
 
 def hasExtension(filepath, extensions):
     """ Return whether filepath is one of the following extensions. """
+    if os.path.isdir(filepath):
+        return False
     return os.path.splitext(filepath)[1].lower() in extensions
 
 
@@ -134,13 +136,29 @@ def findFilesByTypeInFolder(folder, recursive=False):
             continue
         elif os.path.isdir(currentFolder):
             if recursive:
+                # Get through all of the depth levels
                 for root, directories, files in os.walk(currentFolder):
                     for filename in files:
                         output.addFile(os.path.join(root, filename))
             else:
-                output.addFiles([os.path.join(currentFolder, filename) for filename in os.listdir(currentFolder)])
+                # Only get the first level of depth, so top-level folders'
+                # files will be added, if they exist.
+                # This may prevent from importing nothing at all when files
+                # are nested a level down
+                try:
+                    root, directories, files = next(os.walk(currentFolder))
+                    output.addFiles([os.path.join(root, file) for file in files])
+                    for directory in directories:
+                        for file in os.listdir(os.path.join(root, directory)):
+                            filepath = os.path.join(root, directory, file)
+                            if os.path.isfile(filepath):
+                                output.addFile(filepath)
+                except (StopIteration, OSError):
+                    # Directory empty or inaccessible, skip processing
+                    pass
+
         else:
-            # if not a directory or a file, it may be an expression
+            # If not a directory or a file, it may be an expression
             import glob
             paths = glob.glob(currentFolder)
             filesByType = findFilesByTypeInFolder(paths, recursive=recursive)

meshroom/ui/graph.py

@@ -952,6 +952,8 @@ def removeAttribute(self, attribute):
 
     @Slot(Attribute)
     def removeImage(self, image):
+        if image is None:
+            return
         with self.groupedGraphModification("Remove Image"):
             # look if the viewpoint's intrinsic is used by another viewpoint
             # if not, remove it

meshroom/ui/reconstruction.py

@@ -763,12 +763,15 @@ def handleFilesUrl(self, filesByType, cameraInit=None, position=None):
     @Slot("QList<QUrl>", result="QVariantMap")
     def getFilesByTypeFromDrop(self, urls):
         """
+        Given a list of filepaths, sort them into distinct categories and return a map for all
+        these categories.
 
         Args:
             urls: list of filepaths
 
         Returns:
-            {images, videos, panoramaInfo, meshroomScenes, otherFiles}: Map containing the lists of paths for recognized images, videos, Meshroom scenes and other files.
+            {images, videos, panoramaInfo, meshroomScenes, otherFiles}: Map containing the lists of paths for
+            recognized images, videos, Meshroom scenes and other files.
         """
         # Build the list of images paths
         filesByType = multiview.FilesByType()