Merge pull request #23 from fayvel/config_int

Avoid loading invalid numeric config entries

Author: gen2brain

src/m64py/frontend/mainwindow.py

@@ -78,8 +78,7 @@ def __init__(self, optparse):
         self.settings = Settings(self)
         self.worker = Worker(self)
 
-        self.vidext = bool(
-            int(self.settings.qset.value("enable_vidext", 1)))
+        self.vidext = bool(self.settings.get_int_safe("enable_vidext", 1))
 
         self.create_state_slots()
         self.create_widgets()
@@ -111,7 +110,7 @@ def resizeEvent(self, event):
 
     def showEvent(self, event):
         if not self.widgets_height:
-            width, height = self.settings.qset.value("size", SIZE_1X)
+            width, height = self.settings.get_size_safe()
             menubar_height = self.menubar.size().height()
             statusbar_height = self.statusbar.size().height()
             self.widgets_height = menubar_height + statusbar_height
@@ -126,7 +125,7 @@ def window_size_triggered(self, size):
             # event.ignore() doesn't work on windows
             if not sys.platform == "win32":
                 if not fullscreen and \
-                        bool(int(self.settings.qset.value("keep_aspect", 1))):
+                        bool(self.settings.get_int_safe("keep_aspect", 1)):
                     width, height = self.keep_aspect(size)
 
             self.worker.core.config.open_section("Video-General")

src/m64py/frontend/recentfiles.py

@@ -49,9 +49,18 @@ def create(self):
         self.action_clear_history.triggered.connect(self.clear)
         self.parent.menuRecent.addAction(self.action_clear_history)
 
+    def is_string(self, obj):
+        try:
+            return isinstance(obj, basestring)
+        except NameError:
+            return isinstance(obj, str)
+
     def update(self):
         """Updates list of recent files."""
         self.recent_files = self.parent.settings.qset.value("recent_files", [])
+        if not type(self.recent_files) == list:
+            self.recent_files = []
+        self.recent_files = list(filter(lambda x: self.is_string(x), self.recent_files))
         num_files = min(len(self.recent_files), self.max_recent)
         for i in range(num_files):
             text = QFileInfo(self.recent_files[i]).fileName()

src/m64py/frontend/settings.py

@@ -139,7 +139,7 @@ def browse_dialog(self, args):
                     self.core = self.parent.worker.core
                     self.set_core()
                     self.set_video()
-                    size = self.qset.value("size", SIZE_1X)
+                    size = self.get_size_safe()
                     self.parent.window_size_triggered(size)
                     self.parent.state_changed.emit((True, False, False, False))
         elif widget == self.pathPlugins:
@@ -195,6 +195,24 @@ def set_paths(self):
         self.pathPlugins.setText(path_plugins)
         self.pathData.setText(path_data)
 
+    def get_int_safe(self, key, default):
+        try:
+            return int(self.qset.value(key, default))
+        except ValueError:
+            return default
+
+    def get_size_safe(self):
+        size = self.qset.value("size", SIZE_1X)
+        if not type(size) == tuple:
+            size = SIZE_1X
+        if len(size) != 2:
+            size = SIZE_1X
+        if type(size[0]) != int or type(size[1]) != int:
+            size = SIZE_1X
+        if size[0] <= 0 or size[1] <= 0:
+            size = SIZE_1X
+        return size
+
     def set_video(self):
         self.comboResolution.clear()
         for mode in MODES:
@@ -212,7 +230,7 @@ def set_video(self):
         self.comboResolution.setCurrentIndex(index)
 
         self.checkEnableVidExt.setChecked(
-            bool(int(self.qset.value("enable_vidext", 1))))
+            bool(self.get_int_safe("enable_vidext", 1)))
 
         self.checkFullscreen.setChecked(
             bool(self.core.config.get_parameter("Fullscreen")))
@@ -222,10 +240,10 @@ def set_video(self):
             self.checkKeepAspect.setChecked(False)
             self.checkKeepAspect.setEnabled(False)
         else:
-            keep_aspect = bool(int(self.qset.value("keep_aspect", 1)))
+            keep_aspect = bool(self.get_int_safe("keep_aspect", 1))
             self.checkKeepAspect.setChecked(keep_aspect)
 
-        disable_screensaver = bool(int(self.qset.value("disable_screensaver", 1)))
+        disable_screensaver = bool(self.get_int_safe("disable_screensaver", 1))
         self.checkDisableScreenSaver.setChecked(disable_screensaver)
 
     def set_core(self):

src/m64py/frontend/worker.py

@@ -179,17 +179,17 @@ def rom_open(self):
             del romfile
             self.core.rom_get_header()
             self.core.rom_get_settings()
-            if bool(int(self.settings.qset.value(
-                    "disable_screensaver", 1))):
+            if bool(self.settings.get_int_safe(
+                    "disable_screensaver", 1)):
                 screensaver.disable()
             self.parent.rom_opened.emit()
             self.parent.recent_files.add(self.filepath)
 
     def rom_close(self):
         """Closes ROM."""
         self.core.rom_close()
-        if bool(int(self.settings.qset.value(
-                "disable_screensaver", 1))):
+        if bool(self.settings.get_int_safe(
+                "disable_screensaver", 1)):
             screensaver.enable()
         self.parent.rom_closed.emit()
 
@@ -306,13 +306,11 @@ def toggle_pause(self):
         """Toggles pause."""
         if self.state == M64EMU_RUNNING:
             self.core.pause()
-            if bool(int(self.settings.qset.value(
-                    "disable_screensaver", 1))):
+            if bool(self.settings.get_int_safe("disable_screensaver", 1)):
                 screensaver.enable()
         elif self.state == M64EMU_PAUSED:
             self.core.resume()
-            if bool(int(self.settings.qset.value(
-                    "disable_screensaver", 1))):
+            if bool(self.settings.get_int_safe("disable_screensaver", 1)):
                 screensaver.disable()
         self.toggle_actions()