Merge pull request #34 from da4id/Beta

Beta

.idea/workspace.xml

@@ -3,7 +3,6 @@
   <component name="ChangeListManager">
     <list default="true" id="7e2e0eec-b22e-4d48-8f24-196d1ed9b51a" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/octoprint_mystromswitch/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/octoprint_mystromswitch/__init__.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -48,6 +47,20 @@
       <option name="presentableId" value="Default" />
       <updated>1574193087583</updated>
     </task>
+    <task id="LOCAL-00056" summary="#17 Logging zur Fehleranalyse eingebaut">
+      <created>1578941071143</created>
+      <option name="number" value="00056" />
+      <option name="presentableId" value="LOCAL-00056" />
+      <option name="project" value="LOCAL" />
+      <updated>1578941071143</updated>
+    </task>
+    <task id="LOCAL-00057" summary="#17 Logging zur Fehleranalyse eingebaut">
+      <created>1579188503178</created>
+      <option name="number" value="00057" />
+      <option name="presentableId" value="LOCAL-00057" />
+      <option name="project" value="LOCAL" />
+      <updated>1579188503178</updated>
+    </task>
     <task id="LOCAL-00058" summary="#17 Logging zur Fehleranalyse eingebaut">
       <created>1579190155814</created>
       <option name="number" value="00058" />
@@ -377,21 +390,7 @@
       <option name="project" value="LOCAL" />
       <updated>1593633696895</updated>
     </task>
-    <task id="LOCAL-00105" summary="#25 Python 3 Compatibility">
-      <created>1595688504296</created>
-      <option name="number" value="00105" />
-      <option name="presentableId" value="LOCAL-00105" />
-      <option name="project" value="LOCAL" />
-      <updated>1595688504296</updated>
-    </task>
-    <task id="LOCAL-00106" summary="#25 Python 3 Compatibility">
-      <created>1595688536404</created>
-      <option name="number" value="00106" />
-      <option name="presentableId" value="LOCAL-00106" />
-      <option name="project" value="LOCAL" />
-      <updated>1595688536404</updated>
-    </task>
-    <option name="localTasksCounter" value="107" />
+    <option name="localTasksCounter" value="105" />
     <servers />
   </component>
   <component name="UnknownFeatures">

octoprint_mystromswitch/__init__.py

@@ -162,10 +162,6 @@ class MyStromSwitchPlugin(octoprint.plugin.SettingsPlugin,
             self._status_timer.start()
 
     def _shutdown_system(self):
-        if not self._settings.global_get(["server", "commands", "systemShutdownCommand"]):
-            self._logger.warning("systemShutdownCommand is not defined. Aborting shutdown...")
-            return
-
         self._logger.info("Shutdown Relais and System")
         self._powerCycleRelais(False, self.powerOffDelay)
         shutdown_command = self._settings.global_get(["server", "commands", "systemShutdownCommand"])
@@ -394,6 +390,10 @@ class MyStromSwitchPlugin(octoprint.plugin.SettingsPlugin,
         if not self.shutdownAfterPrintFinished and not self.powerOffAfterPrintFinished:
             return
 
+        if not self._settings.global_get(["server", "commands", "systemShutdownCommand"]):
+            self._logger.warning("systemShutdownCommand is not defined. Aborting shutdown...")
+            return
+
         if event not in [Events.PRINT_DONE, Events.PRINT_FAILED]:
             return
 

setup.py

@@ -14,7 +14,7 @@ plugin_package = "octoprint_mystromswitch"
 plugin_name = "OctoPrint-MyStromSwitch"
 
 # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
-plugin_version = "1.2.1"
+plugin_version = "1.2.0"
 
 # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
 # module