fix(server): make sure printer name is generated properly if OP name …

…is blank
OctoFarm · Aug 7, 2022 · 235f07c · 235f07c
1 parent 90e8456
commit 235f07c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/server/services/octoprint/constants/octoprint-api-config.constants.js b/server/services/octoprint/constants/octoprint-api-config.constants.js
@@ -75,15 +75,22 @@ const settingsRetrievalFunction = (data, captureKeys, printer, database) => {
     data["plugins"]
   );
 
-  if (printer.printerName.length === 0 && oldAppearance.name === "Grabbing from OctoPrint...") {
-    printer.settingsAppearance.name = PrinterClean.grabOctoPrintName(
-      data["appearance"],
-      printer.printerURL
-    );
-    printer.printerName = printer.settingsAppearance.name;
-  } else if (printer.printerName.length === 0 && oldAppearance.name.length > 0) {
-    printer.settingsAppearance.name = oldAppearance.name;
-    printer.printerName = printer.settingsAppearance.name;
+  console.log(oldAppearance);
+
+  if (oldAppearance.name.length !== 0) {
+    printer.printerName = PrinterClean.grabOctoPrintName(oldAppearance, printer.printerURL);
+  }
+
+  if (!printer?.printerName || printer.printerName.length === 0) {
+    printer.printerName = PrinterClean.grabOctoPrintName(data["appearance"], printer.printerURL);
+  }
+
+  if (printer.printerName.length === 0) {
+    printer.printerName = PrinterClean.grabOctoPrintName(oldAppearance, printer.printerURL);
+  }
+
+  if (printer.printerName === "Grabbing from OctoPrint...") {
+    printer.printerName = PrinterClean.grabOctoPrintName(data["appearance"], printer.printerURL);
   }
 
   if (printer.settingsAppearance.color !== data["appearance"].color) {

diff --git a/server/services/printer-manager.service.js b/server/services/printer-manager.service.js
@@ -105,7 +105,7 @@ class PrinterManagerService {
     }, this.#printerEnableTimer);
   }
 
-  async handlePrinterEnableQueue(batchSize = 20) {
+  async handlePrinterEnableQueue(batchSize = 10) {
     const enablePrinterQueueBatch = async () => {
       const queueLength = this.#enablePrintersQueue.length;
       for (let i = 0; i < queueLength; i += batchSize) {