Animated titles: Source/imports cleanup

Author: ferdnyc

src/windows/animated_title.py

@@ -26,26 +26,16 @@
  along with OpenShot Library.  If not, see <http://www.gnu.org/licenses/>.
  """
 
-import sys
 import os
-import time
 import uuid
-import shutil
-import subprocess
-import re
-import math
 
-from PyQt5.QtCore import *
-from PyQt5.QtGui import QIcon, QStandardItemModel, QStandardItem
-from PyQt5.QtWidgets import *
-from PyQt5 import uic
+from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QPushButton
 
-from classes import info, metrics, ui_util, settings, qt_types, updates
+from classes import info, ui_util, metrics
 from classes.app import get_app
 from classes.logger import log
 from windows.views.blender_listview import BlenderListView
 
-import json
 
 class AnimatedTitle(QDialog):
     """ Animated Title Dialog """

src/windows/models/blender_model.py

@@ -29,14 +29,14 @@
 
 # Try to get the security-patched XML functions from defusedxml
 try:
-  from defusedxml import minidom as xml
+    from defusedxml import minidom as xml
 except ImportError:
-  from xml.dom import minidom as xml
+    from xml.dom import minidom as xml
 
 from PyQt5.QtCore import Qt, QSize
-from PyQt5.QtGui import *
-from PyQt5.QtWidgets import QMessageBox
-import openshot  # Python module for libopenshot (required video editing module installed separately)
+from PyQt5.QtGui import QIcon, QPixmap, QStandardItem, QStandardItemModel
+
+import openshot
 
 from classes import info
 from classes.logger import log
@@ -46,11 +46,8 @@
 class BlenderModel():
     def update_model(self, clear=True):
         log.info("updating effects model.")
-        app = get_app()
 
-        # Get window to check filters
-        win = app.window
-        _ = app._tr
+        _ = self.app._tr
 
         # Clear all items
         if clear:
@@ -60,25 +57,24 @@ def update_model(self, clear=True):
         # Add Headers
         self.model.setHorizontalHeaderLabels([_("Thumb"), _("Name")])
 
-        # get a list of files in the OpenShot /effects directory
-        effects_dir = os.path.join(info.PATH, "blender")
-        icons_dir = os.path.join(effects_dir, "icons")
-
-        for file in sorted(os.listdir(effects_dir)):
-            if os.path.isfile(os.path.join(effects_dir, file)) and ".xml" in file:
-                # Split path
-                path = os.path.join(effects_dir, file)
+        # get a list of files in the application blender directory
+        blender_dir = os.path.join(info.PATH, "blender")
+        icons_dir = os.path.join(blender_dir, "icons")
 
+        for file in sorted(os.listdir(blender_dir)):
+            path = os.path.join(blender_dir, file)
+            if path in self.model_paths:
+                continue
+            if os.path.isfile(path) and ".xml" in file:
                 # load xml effect file
                 xmldoc = xml.parse(path)
 
-                # Get all attributes
+                # Get column data for model
                 title = xmldoc.getElementsByTagName("title")[0].childNodes[0].data
-                description = xmldoc.getElementsByTagName("description")[0].childNodes[0].data
                 icon_name = xmldoc.getElementsByTagName("icon")[0].childNodes[0].data
                 icon_path = os.path.join(icons_dir, icon_name)
-                category = xmldoc.getElementsByTagName("category")[0].childNodes[0].data
                 service = xmldoc.getElementsByTagName("service")[0].childNodes[0].data
+                xmldoc.unlink()
 
                 # Check for thumbnail path (in build-in cache)
                 thumb_path = os.path.join(info.IMAGES_PATH, "cache",  "blender_{}".format(icon_name))
@@ -95,66 +91,51 @@ def update_model(self, clear=True):
                         # Reload this reader
                         clip = openshot.Clip(icon_path)
                         reader = clip.Reader()
-
-                        # Open reader
                         reader.Open()
 
-                        # Determine scale of thumbnail
-                        scale = 95.0 / reader.info.width
-
                         # Save thumbnail
-                        reader.GetFrame(0).Thumbnail(thumb_path, 98, 64, "", "",
-                                     "#000", False, "png", 85, 0.0)
+                        reader.GetFrame(0).Thumbnail(
+                            thumb_path, 98, 64, "", "",
+                            "#000", False, "png", 85, 0.0)
                         reader.Close()
-
-                    except:
-                        # Handle exception
-                        log.info('Invalid blender image file: %s' % icon_path)
-                        msg = QMessageBox()
-                        msg.setText(_("{} is not a valid image file.".format(icon_path)))
-                        msg.exec_()
+                    except Exception:
+                        log.info('Invalid blender image file: %s', icon_path)
                         continue
 
                 row = []
-
+                flags = Qt.ItemIsSelectable | Qt.ItemIsEnabled | Qt.ItemIsUserCheckable
                 # Append thumbnail
-                col = QStandardItem()
-                icon_pixmap = QPixmap(thumb_path)
-                scaled_pixmap = icon_pixmap.scaled(QSize(93, 62), Qt.IgnoreAspectRatio, Qt.SmoothTransformation)
-                col.setIcon(QIcon(scaled_pixmap))
-                col.setText(self.app._tr(title))
+                col = QStandardItem(self.app._tr(title))
+                icon_pixmap = QPixmap(thumb_path).scaled(
+                    QSize(93, 62), Qt.IgnoreAspectRatio, Qt.SmoothTransformation)
+                col.setIcon(QIcon(icon_pixmap))
                 col.setToolTip(self.app._tr(title))
-                col.setFlags(Qt.ItemIsSelectable | Qt.ItemIsEnabled | Qt.ItemIsUserCheckable)
+                col.setFlags(flags)
                 row.append(col)
 
                 # Append Name
-                col = QStandardItem("Name")
+                col = QStandardItem(self.app._tr(title))
                 col.setData(self.app._tr(title), Qt.DisplayRole)
-                col.setText(self.app._tr(title))
-                col.setFlags(Qt.ItemIsSelectable | Qt.ItemIsEnabled | Qt.ItemIsUserCheckable)
+                col.setFlags(flags)
                 row.append(col)
 
                 # Append Path
-                col = QStandardItem("Path")
+                col = QStandardItem(path)
                 col.setData(path, Qt.DisplayRole)
-                col.setText(path)
-                col.setFlags(Qt.ItemIsSelectable | Qt.ItemIsEnabled | Qt.ItemIsUserCheckable)
+                col.setFlags(flags)
                 row.append(col)
 
                 # Append Service
-                col = QStandardItem("Service")
+                col = QStandardItem(service)
                 col.setData(service, Qt.DisplayRole)
-                col.setText(service)
-                col.setFlags(Qt.ItemIsSelectable | Qt.ItemIsEnabled | Qt.ItemIsUserCheckable)
+                col.setFlags(flags)
                 row.append(col)
 
-                # Append ROW to MODEL (if does not already exist in model)
-                if path not in self.model_paths:
-                    self.model.appendRow(row)
-                    self.model_paths[path] = path
+                self.model.appendRow(row)
+                self.model_paths[path] = path
 
                 # Process events in QT (to keep the interface responsive)
-                app.processEvents()
+                self.app.processEvents()
 
     def __init__(self, *args):
 

src/windows/views/blender_listview.py

@@ -31,6 +31,7 @@
 import sys
 import re
 import functools
+import shlex
 
 # Try to get the security-patched XML functions from defusedxml
 try:
@@ -66,10 +67,7 @@ def currentChanged(self, selected, deselected):
         # Get translation object
         _ = self.app._tr
 
-        # Clear existing settings
         self.win.clear_effect_controls()
-
-        # Get animation details
         animation = self.get_animation_details()
         self.selected_template = animation.get("service")
 
@@ -83,17 +81,15 @@ def currentChanged(self, selected, deselected):
 
         # Loop through params
         for param in animation.get("params", []):
-            log.info('Using parameter %s: %s' % (param["name"], param["title"]))
+            log.debug('Using parameter %s: %s' % (param["name"], param["title"]))
 
             # Is Hidden Param?
-            if param["name"] == "start_frame" or param["name"] == "end_frame":
+            if param["name"] in ["start_frame", "end_frame"]:
                 # add value to dictionary
                 self.params[param["name"]] = int(param["default"])
-
-                # skip to next param without rendering the controls
+                # skip to next param without rendering a control
                 continue
 
-            # Create Label
             widget = None
             label = QLabel()
             label.setText(_(param["title"]))
@@ -162,15 +158,13 @@ def currentChanged(self, selected, deselected):
                         )
 
                 # Add normal values
-                box_index = 0
-                for k, v in sorted(param["values"].items()):
+                for i, (k, v) in enumerate(sorted(param["values"].items())):
                     # add dropdown item
                     widget.addItem(_(k), v)
 
                     # select dropdown (if default)
                     if v == param["default"]:
-                        widget.setCurrentIndex(box_index)
-                    box_index = box_index + 1
+                        widget.setCurrentIndex(i)
 
                 if not param["values"]:
                     widget.addItem(_("No Files Found"), "")
@@ -193,10 +187,7 @@ def currentChanged(self, selected, deselected):
             elif (label):
                 self.win.settingsContainer.layout().addRow(label)
 
-        # Enable interface
         self.enable_interface()
-
-        # Init slider values
         self.init_slider_values()
 
     def spinner_value_changed(self, param, value):
@@ -393,7 +384,7 @@ def get_animation_details(self):
                     )
                 ])
             except (TypeError, AttributeError) as ex:
-                log.warn("XML parser: {}".format(ex))
+                log.warn("XML parser: %s", ex)
                 pass
 
             # Append param object to list
@@ -439,8 +430,10 @@ def get_project_params(self, is_preview=True):
         project_params["alpha_mode"] = 1
         project_params["horizon_color"] = (0.57, 0.57, 0.57)
         project_params["animation"] = True
-        project_params["output_path"] = os.path.join(info.BLENDER_PATH, self.unique_folder_name,
-                                                     self.params["file_name"])
+        project_params["output_path"] = os.path.join(
+            info.BLENDER_PATH,
+            self.unique_folder_name,
+            self.params["file_name"])
 
         # return the dictionary
         return project_params
@@ -487,17 +480,13 @@ def inject_params(self, path, frame=None):
 
         # prepare string to inject
         user_params = "\n#BEGIN INJECTING PARAMS\n"
-        for k, v in self.params.items():
-            if type(v) == int or type(v) == float or type(v) == list or type(v) == bool:
-                user_params += "params['{}'] = {}\n".format(k, v)
-            if type(v) == str:
-                user_params += "params['{}'] = u'{}'\n".format(k, v.replace("'", r"\'"))
-
-        for k, v in self.get_project_params(is_preview).items():
-            if type(v) == int or type(v) == float or type(v) == list or type(v) == bool:
+        param_data = self.params.items()
+        param_data.update(self.get_project_params(is_preview))
+        for k, v in param_data.items():
+            if isinstance(v, (int, float, list, bool)):
                 user_params += "params['{}'] = {}\n".format(k, v)
-            if type(v) == str:
-                user_params += "params['{}'] = u'{}'\n".format(k, v.replace("'", r"\'").replace("\\", "\\\\"))
+            if isinstance(v, str):
+                user_params += "params['{}'] = '{}'\n".format(k, v.replace("'", r"\'").replace("\\", "\\\\"))
         user_params += "#END INJECTING PARAMS\n"
 
         # Insert the single frame number to render for preview
@@ -577,13 +566,12 @@ def Render(self, frame=None):
             Q_ARG(int, int(frame or 0))
         )
 
-    def __init__(self, *args):
-        # Invoke parent init
+    def __init__(self, parent, *args):
+        # Invoke base class init
         super().__init__(*args)
 
-        # Get a reference to the window object
+        self.win = parent
         self.app = get_app()
-        self.win = args[0]
 
         # Get Model data
         self.blender_model = BlenderModel()

src/windows/views/files_treeview.py

@@ -225,7 +225,6 @@ def __init__(self, model, *args):
         self.setSelectionBehavior(QAbstractItemView.SelectRows)
         self.setSelectionModel(self.files_model.selection_model)
 
-        # Keep track of mouse press start position to determine when to start drag
         self.setAcceptDrops(True)
         self.setDragEnabled(True)
         self.setDropIndicatorShown(True)