Cosmetic UI tweaks for new scripts/preprocessors, also remove _state_ prefix from preprocessor symtable state value (#172)

Author: smartin015

continuousprint/data/data_test.py

@@ -147,24 +147,29 @@ def test_from_idle(self, pp):
         self.assertEqual(
             pp(
                 dict(
-                    current=dict(state="_state_clearing"),
+                    current=dict(state="clearing"),
                 )
             )[0],
             False,
         )
         self.assertEqual(
             pp(
                 dict(
-                    current=dict(state="_state_inactive"),
+                    current=dict(state="inactive"),
                 )
             )[0],
             True,
         )
         self.assertEqual(
             pp(
                 dict(
-                    current=dict(state="_state_idle"),
+                    current=dict(state="idle"),
                 )
             )[0],
             True,
         )
+
+    @test_preprocessor("If externally set variable is True")
+    def test_extern(self, pp):
+        self.assertEqual(pp(dict(external=dict(testval=True)))[0], True)
+        self.assertEqual(pp(dict(external=dict(testval=False)))[0], False)

continuousprint/data/preprocessors.yaml

@@ -29,4 +29,9 @@ Preprocessors:
   - name: "If starting from idle (first run, or ran finished script)"
     body: |
       # Both current and previous printer state are checked here to ensure printer is properly idle
-      current["state"] in ("_state_inactive", "_state_idle")
+      current["state"] in ("inactive", "idle")
+  - name: "If externally set variable is True"
+    body: |
+      # Set external values via web request, e.g.
+      # curl -X POST -d '{"testval": true}' http://printer:5000/plugin/continuousprint/automation/external
+      external["testval"] == True

continuousprint/driver.py

@@ -113,7 +113,7 @@ def action(
                     path=self._cur_path,
                     materials=self._cur_materials,
                     bed_temp=self._bed_temp,
-                    state=self.state.__name__,
+                    state=self.state.__name__.strip("_state_"),
                 )
             )
 

continuousprint/static/js/continuousprint_job.js

@@ -177,7 +177,7 @@ function CPJob(obj, peers, api, profile, materials) {
 
   self.totals = ko.computed(function() {
     let r = [
-      {legend: 'Total items printed', title: ""},
+      {legend: 'Total items', title: null},
       {legend: 'Total time', title: "Uses Octoprint's file analysis estimate; may be inaccurate"},
       {legend: 'Total mass', title: "Mass is calculated using active spool(s) in SpoolManager"},
     ];

continuousprint/static/js/continuousprint_job.test.js

@@ -61,8 +61,8 @@ test('totals', () => {
     remaining: "2", // 2 left in this run, one from each set
     total: "2", // 2 pending
     error: "",
-    legend: "Total items printed",
-    title: expect.anything(),
+    legend: "Total items",
+    title: null,
   });
 
   // Values are as above, but x100 and converted to minutes

continuousprint/static/js/continuousprint_settings.js

@@ -107,7 +107,11 @@ function CPSettingsViewModel(parameters, profiles=CP_PRINTER_PROFILES, default_s
           let result = [];
           for (let e of self.events()) {
             for (let a of e.actions()) {
-              if (a.script.name() == nn || a.preprocessor() == nn) {
+              let ppname = a.preprocessor();
+              if (ppname !== null && ppname.name) {
+                ppname = ppname.name();
+              }
+              if (a.script.name() === nn || ppname === nn) {
                 result.push(e.display);
               }
             }

continuousprint/templates/continuousprint_settings.jinja2

@@ -144,7 +144,7 @@
             <div style="flex: 1">
               <div data-bind="hidden: expanded">
                 <div data-bind="text: name"></div>
-                <div class="subheader" data-bind="visible: registrations().length > 0">Runs on <span data-bind="text: registrations"></span></div>
+                <div class="subheader" data-bind="visible: registrations().length > 0">Fires on <span data-bind="text: registrations().join(', ')"></span></div>
               </div>
               <div data-bind="visible: expanded">
                 <input type="text" placeholder="Script Name" data-bind="value: name"></input>
@@ -205,7 +205,7 @@
             <div style="flex: 1">
               <div data-bind="hidden: expanded">
                 <div data-bind="text: name"></div>
-                <div class="subheader" data-bind="visible: registrations().length > 0">Runs on <span data-bind="text: registrations"></span></div>
+                <div class="subheader" data-bind="visible: registrations().length > 0">Fires on <span data-bind="text: registrations().join(', ')"></span></div>
               </div>
               <div data-bind="visible: expanded">
                 <input placeholder="Preprocessor name" type="text" data-bind="value: name"></input>

continuousprint/templates/continuousprint_tab.jinja2

@@ -277,7 +277,7 @@
                 </div>
                 <div data-bind="foreach: totals, visible: draft">
                   <div class="job-stats">
-                    <div style="flex: 1;" data-bind="attr: {title: title}"><span data-bind="text: legend"></span><sup data-bind="display: title">?</sup></div>
+                    <div style="flex: 1;" data-bind="attr: {title: title}"><span data-bind="text: legend"></span><sup data-bind="visible: title">?</sup></div>
                     <div class="completed" data-bind="text: completed"></div>
                     <div class="count" data-bind="text: count"></div>
                     <div class="remaining" data-bind="text: remaining"></div>