From e9744a1b6a08e5ce5b2f2eae84211b67eadfd2fe Mon Sep 17 00:00:00 2001
From: Scott Martin <smartin015@gmail.com>
Date: Sat, 27 Apr 2024 12:54:52 -0400
Subject: [PATCH] Fix release error due to later loading of extruder settings
 (#252)

* Fix release error due to later loading of extruder settings

* Linting attempt

* rm black linter
---
 .github/ISSUE_TEMPLATE/bug_report.md                 |  4 ++--
 .github/workflows/lint.yml                           |  6 +++---
 .pre-commit-config.yaml                              |  2 +-
 .../static/js/continuousprint_viewmodel.js           | 12 +++++++++++-
 continuousprint/templates/continuousprint_tab.jinja2 |  2 +-
 5 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 88cc534..d8d2ef1 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,7 +7,7 @@ assignees: ''
 
 ---
 
-<!-- 
+<!--
    ;;;;;
    ;;;;;
    ;;;;;
@@ -19,7 +19,7 @@ assignees: ''
 
 If you are reporting an issue, you **must** attach a System Info bundle to the issue so I can troubleshoot it.
 
-If you create an issue without one, then I'll ask you to submit one and will wait until you do. 
+If you create an issue without one, then I'll ask you to submit one and will wait until you do.
 
 Please save us both time, and do this first. You can find instructions here:
 
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 91de8c9..17d92b1 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -28,12 +28,12 @@ jobs:
           python-version: 3.8
 
       - name: Install Python dependencies
-        run: pip install black flake8
+        run: pip install flake8
 
       - name: Run linters
         uses: wearerequired/lint-action@v1
         with:
-          black: true
+          # black: true
           flake8: true
           # These must match .pre-commit-config.yaml
-          flake8_args: "--max-line-length=88 --ignore=E203,E266,E501,W503,F403,F401,E402,F821"
+          flake8_args: "--max-line-length=88 --ignore=E203,E266,E501,W503,F403,F401,E402,F821,E721"
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 4da8b63..9daf316 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -20,4 +20,4 @@ repos:
         # these are errors that will be ignored by flake8
         # check out their meaning here
         # https://flake8.pycqa.org/en/latest/user/error-codes.html
-        - "--ignore=E203,E266,E501,W503,F403,F401,E402,F821"
+        - "--ignore=E203,E266,E501,W503,F403,F401,E402,F821,E721"
diff --git a/continuousprint/static/js/continuousprint_viewmodel.js b/continuousprint/static/js/continuousprint_viewmodel.js
index ab32a9e..9037770 100644
--- a/continuousprint/static/js/continuousprint_viewmodel.js
+++ b/continuousprint/static/js/continuousprint_viewmodel.js
@@ -32,7 +32,14 @@ function CPViewModel(parameters) {
     self.printerProfiles = parameters[3];
     self.settings = parameters[4];
     self.cpPrinterProfiles = CP_PRINTER_PROFILES;
-    self.extruders = ko.computed(function() { return self.printerProfiles.currentProfileData().extruder.count(); });
+    self.extruders = ko.computed(function() {
+        let cpd = self.printerProfiles.currentProfileData();
+        if (cpd) {
+            return cpd.extruder.count();
+        } else {
+            return 1;
+        }
+    });
     self.status = ko.observable("Initializing...");
     self.statusType = ko.observable("INIT");
     self.active = ko.observable(false);
@@ -358,6 +365,9 @@ function CPViewModel(parameters) {
       self.badMaterialCount(nbad);
       self.hasSpoolManager(true);
     }, function(statusCode, errText) {
+      if (statusCode !== 404) {
+        console.error(statusCode, errText);
+      }
       self.hasSpoolManager(statusCode !== 404);
     });
 
diff --git a/continuousprint/templates/continuousprint_tab.jinja2 b/continuousprint/templates/continuousprint_tab.jinja2
index b892855..e27dd72 100644
--- a/continuousprint/templates/continuousprint_tab.jinja2
+++ b/continuousprint/templates/continuousprint_tab.jinja2
@@ -264,7 +264,7 @@
                           Hint: Install the <a href="https://plugins.octoprint.org/plugins/SpoolManager/" target="_blank">SpoolManager</a> plugin to enable <a href="https://smartin015.github.io/continuousprint/material-selection/" target="_blank">material selection</a>.
                           </div>
                           <div class="hint" data-bind="visible: $root.hasSpoolManager() && $root.materials().length == 0">
-                          Hint: Add spools, then reload to enable <a href="https://smartin015.github.io/continuousprint/material-selection/" target="_blank">material selection</a>.
+                          Hint: Add spools with materials, then reload to enable <a href="https://smartin015.github.io/continuousprint/material-selection/" target="_blank">material selection</a>.
                           </div>
                           <button class="btn pull-right" data-bind="click: remove" title="delete set">
                             <i style="cursor: pointer" class="far fa-trash-alt"></i> Delete