Apply suggestions from code review

Thank you, ferdnyc!

Co-authored-by: Frank Dana <[email protected]>

Author: MartinThoma

src/windows/main_window.py

@@ -751,7 +751,7 @@ def promptImageSequence(self, filename=None):
             _("Would you like to import %s as an image sequence?") % filename,
             QMessageBox.No | QMessageBox.Yes
         )
-        return ret == QMessageBox.Yes
+        return bool(ret == QMessageBox.Yes)
 
     def actionAdd_to_Timeline_trigger(self, event):
         # Loop through selected files

src/windows/models/files_model.py

@@ -69,11 +69,11 @@ def filterAcceptsRow(self, sourceRow, sourceParent):
             index = self.sourceModel().index(sourceRow, 2, sourceParent)
             tags = self.sourceModel().data(index)  # tags (i.e. intro, custom, etc...)
 
-            if get_app().window.actionFilesShowVideo.isChecked() and media_type != "video":
-                return False
-            elif get_app().window.actionFilesShowAudio.isChecked() and media_type != "audio":
-                return False
-            elif get_app().window.actionFilesShowImage.isChecked() and media_type != "image":
+            if any(
+                get_app().window.actionFilesShowVideo.isChecked() and media_type != "video",
+                get_app().window.actionFilesShowAudio.isChecked() and media_type != "audio",
+                get_app().window.actionFilesShowImage.isChecked() and media_type != "image",
+            ):
                 return False
 
             # Match against regex pattern

src/windows/views/timeline_webview.py

@@ -2372,12 +2372,14 @@ def Time_Triggered(self, action, clip_ids, speed="1X", playhead_position=0.0):
                     clip.data["reader"]["video_length"] = self.round_to_multiple(
                         float(clip.data["reader"]["video_length"]) / speed_factor, even_multiple)
 
-                if action == MENU_TIME_NONE and "original_data" in clip.data.keys():
+                if action == MENU_TIME_NONE and "original_data" in clip.data:
                     # Reset original end & duration (if available)
-                    clip.data["end"] = clip.data["original_data"]["end"]
-                    clip.data["duration"] = clip.data["original_data"]["duration"]
-                    clip.data["reader"]["video_length"] = clip.data["original_data"]["video_length"]
-                    clip.data.pop("original_data")
+                    orig = clip.data.pop("original_data")
+                    clip.data.update({
+                        "end": orig["end"],
+                        "duration": orig["duration"],
+                    })
+                    clip.data["reader"]["video_length"] = orig["video_length"]
 
             # Save changes
             self.update_clip_data(clip.data, only_basic_props=False, ignore_reader=True)