Merge pull request OpenShot#2949 from ferdnyc/import-fail-log

Image sequence import improvements
angelvilaplana · Nov 17, 2019 · ec0cd97 · ec0cd97
2 parents 7dc30f1 + ef34fde
commit ec0cd97
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/src/windows/views/files_listview.py b/src/windows/views/files_listview.py
@@ -192,10 +192,15 @@ def add_file(self, filepath):
 
             # Save file
             file.save()
+            # Reset list of ignored paths
+            self.ignore_image_sequence_paths = []
+
             return True
 
-        except:
-            # Handle exception
+        except Exception as ex:
+            # Log exception
+            log.warning("Failed to import file: {}".format(str(ex)))
+            # Show message to user
             msg = QMessageBox()
             msg.setText(_("{} is not a valid video, audio, or image file.".format(filename)))
             msg.exec_()
@@ -237,7 +242,7 @@ def get_image_sequence_details(self, file_path):
                 is_sequence = False
 
             if is_sequence and dirName not in self.ignore_image_sequence_paths:
-                log.info('Prompt user to import image sequence')
+                log.info('Prompt user to import image sequence from {}'.format(dirName))
                 # Ignore this path (temporarily)
                 self.ignore_image_sequence_paths.append(dirName)
 
@@ -248,6 +253,7 @@ def get_image_sequence_details(self, file_path):
                 ret = QMessageBox.question(self, _("Import Image Sequence"), _("Would you like to import %s as an image sequence?") % fileName, QMessageBox.No | QMessageBox.Yes)
                 if ret == QMessageBox.Yes:
                     # Yes, import image sequence
+                    log.info('Importing {} as image sequence {}'.format(file_path, base_name + '*.' + extension))
                     parameters = {"file_path":file_path, "folder_path":dirName, "base_name":base_name, "fixlen":fixlen, "digits":digits, "extension":extension}
                     return parameters
                 else:

diff --git a/src/windows/views/files_treeview.py b/src/windows/views/files_treeview.py
@@ -191,10 +191,15 @@ def add_file(self, filepath):
 
             # Save file
             file.save()
+            # Reset list of ignored paths
+            self.ignore_image_sequence_paths = []
+
             return True
 
-        except:
-            # Handle exception
+        except Exception as ex:
+            # Log exception
+            log.warning("Failed to import file: {}".format(str(ex)))
+            # Show message to user
             msg = QMessageBox()
             msg.setText(_("{} is not a valid video, audio, or image file.".format(filename)))
             msg.exec_()
@@ -236,7 +241,7 @@ def get_image_sequence_details(self, file_path):
                 is_sequence = False
 
             if is_sequence and dirName not in self.ignore_image_sequence_paths:
-                log.info('Prompt user to import image sequence')
+                log.info('Prompt user to import image sequence from {}'.format(dirName))
                 # Ignore this path (temporarily)
                 self.ignore_image_sequence_paths.append(dirName)
 
@@ -247,6 +252,7 @@ def get_image_sequence_details(self, file_path):
                 ret = QMessageBox.question(self, _("Import Image Sequence"), _("Would you like to import %s as an image sequence?") % fileName, QMessageBox.No | QMessageBox.Yes)
                 if ret == QMessageBox.Yes:
                     # Yes, import image sequence
+                    log.info('Importing {} as image sequence {}'.format(file_path, base_name + '*.' + extension))
                     parameters = {"file_path":file_path, "folder_path":dirName, "base_name":base_name, "fixlen":fixlen, "digits":digits, "extension":extension}
                     return parameters
                 else: