Skip to content

Commit

Permalink
Fixed some wrong indentation that somehow made it through editorconfig
Browse files Browse the repository at this point in the history
  • Loading branch information
foosel committed Sep 11, 2015
1 parent e4ae150 commit 2c0eed2
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 21 deletions.
2 changes: 1 addition & 1 deletion src/octoprint/plugin/types.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
50 changes: 30 additions & 20 deletions src/octoprint/plugins/virtual_printer/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,39 +7,49 @@

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

if not self._settings.global_get_boolean(
["devel", "virtualPrinter", "enabled"]):
return None

def virtual_printer_factory(self, comm_instance, port, baudrate, read_timeout):
if not port == "VIRTUAL":
return None
import logging
import logging.handlers

if not self._settings.global_get_boolean(["devel", "virtualPrinter", "enabled"]):
return None
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)

import logging
import logging.handlers
from . import virtual

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)
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"
__plugin_homepage__ = "https://github.com/foosel/OctoPrint/wiki/Plugin:-Virtual-Printer"
__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
}

0 comments on commit 2c0eed2

Please sign in to comment.