From 2c0eed266ceadeb3cd9e263d2170b9e118ce726a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Fri, 11 Sep 2015 11:48:38 +0200 Subject: [PATCH] Fixed some wrong indentation that somehow made it through editorconfig --- src/octoprint/plugin/types.py | 2 +- .../plugins/virtual_printer/__init__.py | 50 +++++++++++-------- 2 files changed, 31 insertions(+), 21 deletions(-) diff --git a/src/octoprint/plugin/types.py b/src/octoprint/plugin/types.py index 66c8bcff..c7acb288 100644 --- a/src/octoprint/plugin/types.py +++ b/src/octoprint/plugin/types.py @@ -80,7 +80,7 @@ class OctoPrintPlugin(Plugin): and if not creating it before returning it. Injected by the plugin core system upon initialization of the implementation. - .. automethod:: get_plugin_data_folder + .. automethod:: get_plugin_data_folder """ def get_plugin_data_folder(self): diff --git a/src/octoprint/plugins/virtual_printer/__init__.py b/src/octoprint/plugins/virtual_printer/__init__.py index ab66badd..e915aa00 100644 --- a/src/octoprint/plugins/virtual_printer/__init__.py +++ b/src/octoprint/plugins/virtual_printer/__init__.py @@ -7,25 +7,34 @@ __copyright__ = "Copyright (C) 2015 The OctoPrint Project - Released under terms import octoprint.plugin + class VirtualPrinterPlugin(octoprint.plugin.SettingsPlugin): + def virtual_printer_factory(self, comm_instance, port, baudrate, + read_timeout): + if not port == "VIRTUAL": + return None - def virtual_printer_factory(self, comm_instance, port, baudrate, read_timeout): - if not port == "VIRTUAL": - return None + if not self._settings.global_get_boolean( + ["devel", "virtualPrinter", "enabled"]): + return None - if not self._settings.global_get_boolean(["devel", "virtualPrinter", "enabled"]): - return None + import logging + import logging.handlers - import logging - import logging.handlers + seriallog_handler = logging.handlers.RotatingFileHandler( + self._settings.get_plugin_logfile_path(postfix="serial"), + maxBytes=2 * 1024 * 1024) + seriallog_handler.setFormatter( + logging.Formatter("%(asctime)s %(message)s")) + seriallog_handler.setLevel(logging.DEBUG) - seriallog_handler = logging.handlers.RotatingFileHandler(self._settings.get_plugin_logfile_path(postfix="serial"), maxBytes=2*1024*1024) - seriallog_handler.setFormatter(logging.Formatter("%(asctime)s %(message)s")) - seriallog_handler.setLevel(logging.DEBUG) + from . import virtual + + serial_obj = virtual.VirtualPrinter( + seriallog_handler=seriallog_handler, + read_timeout=float(read_timeout)) + return serial_obj - from . import virtual - serial_obj = virtual.VirtualPrinter(seriallog_handler=seriallog_handler, read_timeout=float(read_timeout)) - return serial_obj __plugin_name__ = "Virtual Printer" __plugin_author__ = "Gina Häußge, based on work by Daid Braam" @@ -33,13 +42,14 @@ __plugin_homepage__ = "https://github.com/foosel/OctoPrint/wiki/Plugin:-Virtual- __plugin_license__ = "AGPLv3" __plugin_description__ = "Provides a virtual printer via a virtual serial port for development and testing purposes" + def __plugin_load__(): - plugin = VirtualPrinterPlugin() + plugin = VirtualPrinterPlugin() - global __plugin_implementation__ - __plugin_implementation__ = plugin + global __plugin_implementation__ + __plugin_implementation__ = plugin - global __plugin_hooks__ - __plugin_hooks__ = { - "octoprint.comm.transport.serial.factory": plugin.virtual_printer_factory - } + global __plugin_hooks__ + __plugin_hooks__ = { + "octoprint.comm.transport.serial.factory": plugin.virtual_printer_factory + }