#51 Fixed saving and opening dpp sessions.

Enhanced PluginBuilder. Previously the list of config option classes (e.g. String, Integer, ...) needed to managed here as well. Now they are loaded dynamically.

Author: bytebutcher

dpp/core/plugin/builder.py

@@ -19,7 +19,6 @@
 import dpp
 from dpp.core import plugin
 from dpp.core.plugin import AbstractPlugin, NullPlugin
-from dpp.core.plugin.config.options import Integer, String, Boolean, Group
 
 
 class PluginBuilder:
@@ -38,20 +37,15 @@ def _build_config(self, config):
                 clazz = value.pop("clazz")
                 value["label"] = plugin.config.Label(value["label"]["key"], value["label"]["name"])
                 value.pop("is_initialized")
-                result[name] = {
-                    "String": String,
-                    "Integer": Integer,
-                    "Boolean": Boolean,
-                    "Group": Group
-                }.get(clazz)(**value)
+                mod = __import__('dpp.core.plugins.config.options', fromlist=[clazz])
+                result[name] = getattr(mod, clazz)(**value)
             except:
                 raise Exception("Error while loading plugin configuration!")
 
         return result
 
     def build(self, config) -> AbstractPlugin:
         """ Returns a plugin as specified within configuration item. Returns a NullPlugin on error. """
-        config = config["config"]
         try:
             plugin = self._context.getPluginByName(config["name"], config["type"])
             plugin.setup(self._build_config(config['config']))

dpp/ui/view/classic/classic_main_window_widget.py

@@ -17,7 +17,7 @@
 #
 import json
 
-from qtpy.QtWidgets import QWidget
+from qtpy.QtWidgets import QFileDialog, QWidget
 
 from dpp.core.plugin import PluginType
 from dpp.ui.view.classic import CodecTab
@@ -129,41 +129,47 @@ def _focus_input_text(self, callback):
     # Connector functions
     #############################################
 
-    def _open_file_action(self) -> str:
-        filename = super()._open_file_action()
-        if filename:
-            try:
-                with open(filename) as f:
-                    save_file = json.loads(f.read())
-                    for tab_config in save_file:
-                        index, tab = self.newTab(title=tab_config["name"])
-                        frame_index = 0
-                        for frame_config in tab_config["frames"]:
-                            if frame_index == 0:
-                                # New tabs already contain one empty frame
-                                frame = tab.frames().getFrames()[0]
-                                frame.setInputText(frame_config["text"])
-                                frame.setStatus(frame_config["status"]["type"], frame_config["status"]["message"])
-                            else:
-                                frame = tab.frames().newFrame(frame_config["text"],
-                                                              frame_config["title"],
-                                                              frame_index,
-                                                              frame_config["status"]["type"],
-                                                              frame_config["status"]["message"])
-                            frame.fromDict(frame_config)
-                            frame_index = frame_index + 1
-                self._context.logger.info("Successfully loaded {}!".format(filename))
-            except Exception as e:
-                self._context.logger.error("Unexpected error loading file. {}".format(e))
-
-    def _save_as_file_action(self) -> str:
-        filename = super()._save_as_file()
-        if filename:
-            try:
-                self._context.saveAsFile(filename, str(json.dumps(self.toDict(), default=lambda x: x.__dict__)))
-                self._context.logger.info("Successfully saved session in {}!".format(filename))
-            except Exception as e:
-                self._context.logger.error("Unexpected error saving file. {}".format(e))
+    @menu.register_menu_item(id=MenuItem.OPEN_FILE, text="&Open File...", shortcut_key="Ctrl+O")
+    def _open_file_action(self):
+        filename, _ = QFileDialog.getOpenFileName(self, 'Open File')
+        if not filename:
+            return
+
+        try:
+            with open(filename) as f:
+                save_file = json.loads(f.read())
+                for tab_config in save_file:
+                    index, tab = self.newTab(title=tab_config["name"])
+                    frame_index = 0
+                    for frame_config in tab_config["frames"]:
+                        if frame_index == 0:
+                            # New tabs already contain one empty frame
+                            frame = tab.frames().getFrames()[0]
+                            frame.setInputText(frame_config["text"])
+                            frame.setStatus(frame_config["status"]["type"], frame_config["status"]["message"])
+                        else:
+                            frame = tab.frames().newFrame(frame_config["text"],
+                                                          frame_config["title"],
+                                                          frame_index,
+                                                          frame_config["status"]["type"],
+                                                          frame_config["status"]["message"])
+                        frame.fromDict(frame_config)
+                        frame_index = frame_index + 1
+            self._context.logger.info("Successfully loaded {}!".format(filename))
+        except Exception as e:
+            self._context.logger.error("Unexpected error loading file. {}".format(e))
+
+    @menu.register_menu_item(id=MenuItem.SAVE_AS_FILE, text="&Save As...", shortcut_key="Ctrl+S")
+    def _save_as_file_action(self):
+        filename, _ = QFileDialog.getSaveFileName(self, 'Save As File')
+        if not filename:
+            return
+
+        try:
+            self._context.saveAsFile(filename, str(json.dumps(self.toDict(), default=lambda x: x.__dict__)))
+            self._context.logger.info("Successfully saved session in {}!".format(filename))
+        except Exception as e:
+            self._context.logger.error("Unexpected error saving file. {}".format(e))
 
     #############################################
     # Public functions

dpp/ui/view/main_window_widget.py

@@ -44,28 +44,20 @@ def __init__(self, parent: QMainWindow, context: 'core.context.Context', input_t
         self._plugins = context.plugins()
         self._parent = parent
 
-        #############################################
-        #   Initialize docks
-        #############################################
+        # Initialize docks
         self._log_dock_widget = LogDock(self.docksWidget(), context.logger)
         self.docksWidget().registerDockWidget(Context.DockWidget.LOG_DOCK_WIDGET, self._log_dock_widget)
         self.docksWidget().registerDockWidget(Context.DockWidget.HEX_DOCK_WIDGET, HexDock(context, parent))
 
-        #############################################
-        #   Initialize status bar
-        #############################################
+        # Initialize status bar
         parent.statusBar().addWidget(self._log_dock_widget.logMessageWidget())
         parent.statusBar().addPermanentWidget(self._init_hidden_dialog())
 
-        #############################################
-        #   Initialize shortcuts
-        #############################################
+        # Initialize shortcuts
         self._menu_bar = MenuBar(self._parent.menuBar())
         self._init_menu_items()
 
-        #############################################
-        #   Initialize tabs
-        #############################################
+        # Initialize tabs
         self.tabsWidget().onTabAddButtonClick.connect(self.newTab)
         self.tabsWidget().onTabDuplicateButtonClick.connect(self.duplicateTab)
         self.newTab(input_text=input_text)
@@ -153,16 +145,6 @@ def _previous_tab_action(self):
     def _close_tab_action(self):
         self.tabsWidget().closeTab()
 
-    @menu.register_menu_item(id=MenuItem.OPEN_FILE, text="&Open File...", shortcut_key="Ctrl+O")
-    def _open_file_action(self):
-        filename, _ = QFileDialog.getOpenFileName(self, 'Open File')
-        return filename
-
-    @menu.register_menu_item(id=MenuItem.SAVE_AS_FILE, text="&Save As...", shortcut_key="Ctrl+S")
-    def _save_as_file_action(self):
-        filename, _ = QFileDialog.getSaveFileName(self, 'Save As File')
-        return filename
-
     @menu.register_menu_item(id=MenuItem.SHOW_PLUGINS, text="&Plugins...", shortcut_key="Ctrl+Shift+P")
     def _show_plugins_dialog_action(self):
         self._show_hidden_dialog("Plugins")