Merge pull request #3419 from ferdnyc/xml-dom-unlink

Free xml.dom.mindom parsers when finished

Author: jonoomph

src/classes/exporters/final_cut_pro.py

@@ -57,7 +57,7 @@ def createEffect(xmldoc, name, node, points, scale):
             first_value = None
             for keyframeTime in sorted(keyframes.keys()):
                 keyframeValue = keyframes.get(keyframeTime)
-                if first_value == None:
+                if first_value is None:
                     first_value = keyframeValue
 
                 # Create keyframe element for each point
@@ -230,4 +230,6 @@ def export_xml():
         file.close()
     except IOError as inst:
         log.error("Error writing XML export: {}".format(str(inst)))
-
+    finally:
+        # Free up DOM memory
+        xmldoc.unlink()

src/classes/importers/final_cut_pro.py

@@ -201,3 +201,6 @@ def import_xml():
             # Update the preview and reselect current frame in properties
             app.window.refreshFrameSignal.emit()
             app.window.propertyTableView.select_frame(app.window.preview_thread.player.Position())
+
+    # Free up DOM memory
+    xmldoc.unlink()

src/windows/export.py

@@ -30,24 +30,31 @@
 import time
 import tempfile
 
+import openshot
+
 # Try to get the security-patched XML functions from defusedxml
 try:
   from defusedxml import minidom as xml
 except ImportError:
   from xml.dom import minidom as xml
 
-from PyQt5.QtCore import *
-from PyQt5.QtWidgets import *
-from PyQt5.QtGui import QIcon
+from PyQt5.QtCore import Qt, QCoreApplication, QTimer
+from PyQt5.QtWidgets import (
+    QMessageBox, QDialog, QFileDialog, QDialogButtonBox, QPushButton
+)
+from PyQt5.QtGui import QSize, QIcon
 
 from classes import info
 from classes import ui_util
+from classes import settings
+from classes.logger import log
 from classes.app import get_app
-from classes.metrics import *
+from classes.metrics import track_metric_screen, track_metric_error
 from classes.query import File
 
 import json
 
+
 class Export(QDialog):
     """ Export Dialog """
 
@@ -233,9 +240,11 @@ def __init__(self):
         presets = []
         for preset_path in [info.EXPORT_PRESETS_PATH, info.USER_PRESETS_PATH]:
             for file in os.listdir(preset_path):
-                xmldoc = xml.parse(os.path.join(preset_path, file))
-                type = xmldoc.getElementsByTagName("type")
-                presets.append(_(type[0].childNodes[0].data))
+                # Use context manager to automatically unlink xmldoc objects
+                with xml.parse(os.path.join(preset_path, file)) as xmldoc:
+                    type = xmldoc.getElementsByTagName("type")
+                    presets.append(_(type[0].childNodes[0].data))
+
 
         # Exclude duplicates
         type_index = 0
@@ -399,6 +408,9 @@ def cboSimpleProjectType_index_changed(self, widget, index):
                         elif openshot.FFmpegWriter.IsValidCodec(codec_text):
                             acceleration_types[_(title.childNodes[0].data)] = QIcon(":/hw/hw-accel-none.svg")
 
+                # Free up DOM memory
+                xmldoc.unlink()
+
         # Add all targets for selected project type
         preset_index = 0
         selected_preset = 0
@@ -543,6 +555,9 @@ def cboSimpleTarget_index_changed(self, widget, index):
                                 break
                             layout_index += 1
 
+                    # Free up DOM memory
+                    xmldoc.unlink()
+
             # init the profiles combo
             for item in sorted(profiles_list):
                 self.cboSimpleVideoProfile.addItem(self.getProfileName(self.getProfilePath(item)), self.getProfilePath(item))

src/windows/file_properties.py

@@ -37,15 +37,16 @@
   from xml.dom import minidom as xml
 
 from PyQt5.QtCore import *
-from PyQt5.QtWidgets import *
+from PyQt5.QtWidgets import QDialog, QFileDialog, QDialogButtonBox, QPushButton
 
 # Python module for libopenshot (required video editing module installed separately)
 import openshot
 
 from classes import info, ui_util, settings
 from classes.app import get_app
 from classes.logger import log
-from classes.metrics import *
+from classes.metrics import track_metric_screen
+
 
 
 class FileProperties(QDialog):
@@ -190,7 +191,7 @@ def accept(self):
         self.file.data["name"] = self.txtFileName.text()
         self.file.data["tags"] = self.txtTags.text()
 
-        #experimental: update file path
+        # experimental: update file path
         self.file.data["path"] = self.txtFilePath.text()
 
         # Update Framerate

src/windows/title_editor.py

@@ -26,7 +26,6 @@
  along with OpenShot Library.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-import sys
 import os
 import re
 import shutil
@@ -35,17 +34,20 @@
 import tempfile
 from xml.dom import minidom
 
-from PyQt5.QtCore import *
-from PyQt5.QtGui import QIcon, QStandardItemModel, QStandardItem, QFont
-from PyQt5.QtWidgets import *
-from PyQt5 import uic, QtSvg, QtGui
+from PyQt5.QtCore import Qt, QTimer
+from PyQt5 import QtGui
+from PyQt5.QtWidgets import (
+    QGraphicsScene, QMessageBox, QDialog, QColorDialog, QFontDialog,
+    QPushButton, QTextEdit, QLabel
+)
+
 import openshot
 
-from classes import info, ui_util, settings, qt_types, updates
+from classes import info, ui_util, settings
 from classes.logger import log
 from classes.app import get_app
 from classes.query import File
-from classes.metrics import *
+from classes.metrics import track_metric_screen
 from windows.views.titles_listview import TitlesListView
 
 import json
@@ -102,7 +104,7 @@ def __init__(self, edit_file_path=None, duplicate=False):
         self.font_family = "Bitstream Vera Sans"
         self.tspan_node = None
 
-        self.qfont = QFont(self.font_family)
+        self.qfont = QtGui.QFont(self.font_family)
 
         # Add titles list view
         self.titlesTreeView = TitlesListView(self)
@@ -202,7 +204,7 @@ def load_svg_template(self):
         self.font_family = "Bitstream Vera Sans"
         if self.qfont:
             del self.qfont
-        self.qfont = QFont(self.font_family)
+        self.qfont = QtGui.QFont(self.font_family)
 
         # Loop through child widgets (and remove them)
         for child in self.settingsContainer.children():
@@ -276,7 +278,6 @@ def load_svg_template(self):
                 widget.textChanged.connect(functools.partial(self.txtLine_changed, widget))
                 self.settingsContainer.layout().addRow(label, widget)
 
-
         # Add Font button
         label = QLabel()
         label.setText(_("Font:"))
@@ -340,7 +341,7 @@ def writeToFile(self, xmldoc):
             file.write(bytes(xmldoc.toxml(), 'UTF-8'))
             file.close()
         except IOError as inst:
-            log.error("Error writing SVG title")
+            log.error("Error writing SVG title: {}".format(inst))
 
     def btnFontColor_clicked(self):
         app = get_app()
@@ -624,7 +625,6 @@ def set_font_color_elements(self, color, alpha):
             t = ";"
             text_child.setAttribute("style", t.join(ar))
 
-
             # Loop through each TSPAN
             for tspan_child in self.tspan_node:
 
@@ -660,8 +660,11 @@ def accept(self):
             if self.txtFileName.toPlainText().strip():
                 # Do we have unsaved changes?
                 if os.path.exists(file_path) and not self.edit_file_path:
-                    ret = QMessageBox.question(self, _("Title Editor"), _("%s already exists.\nDo you want to replace it?") % file_name,
-                                               QMessageBox.No | QMessageBox.Yes)
+                    ret = QMessageBox.question(
+                        self, _("Title Editor"),
+                        _("%s already exists.\nDo you want to replace it?") % file_name,
+                        QMessageBox.No | QMessageBox.Yes
+                    )
                     if ret == QMessageBox.No:
                         # Do nothing
                         return
@@ -682,7 +685,6 @@ def add_file(self, filepath):
         filename = os.path.basename(filepath)
 
         # Add file into project
-        app = get_app()
         _ = get_app()._tr
 
         # Check for this path in our existing project data