Merge 6a766f7882 into e590f668e6

kiauh/core/instance_manager/base_instance.py

@@ -16,9 +16,8 @@ from typing import List
 
 from utils.fs_utils import get_data_dir
 
-# suffixes that are not allowed to be used for instances
+SUFFIX_BLACKLIST: List[str] = ["None", "mcu", "obico", "bambu", "companion"]
-# because they would cause conflicts with other components or are reserved
+
-SUFFIX_BLACKLIST: List[str] = ["None", "mcu", "obico", "bambu", "companion", "hmi"]
 
 @dataclass(repr=True)
 class BaseInstance:

kiauh/extensions/extensions_menu.py

@@ -150,9 +150,9 @@ class ExtensionSubmenu(BaseMenu):
         if website or repo:
             links_lines: List[str] = ["Links:"]
             if website:
-                links_lines.append(f"● {website}")
+                links_lines.append(f"- Website: {website}")
             if repo:
-                links_lines.append(f"● {repo}")
+                links_lines.append(f"- GitHub: {repo}")
 
             links_text = Logger.format_content(
                 links_lines,

kiauh/extensions/gcode_shell_cmd/metadata.json

@@ -4,7 +4,6 @@
     "module": "gcode_shell_cmd_extension",
     "maintained_by": "dw-0",
     "display_name": "G-Code Shell Command",
-    "description": ["Run a shell commands from gcode."],
+    "description": ["Run a shell commands from gcode."]
-    "updates": false
   }
 }

kiauh/extensions/klipper_backup/metadata.json

@@ -5,8 +5,6 @@
     "maintained_by": "Staubgeborener",
     "display_name": "Klipper-Backup",
     "description": ["Backup all your Klipper files to GitHub"],
-    "website": "https://klipperbackup.xyz",
-    "repo": "https://github.com/Staubgeborener/klipper-backup",
     "updates": true
   }
 }

kiauh/extensions/mainsail_theme_installer/metadata.json

@@ -4,8 +4,6 @@
     "module": "mainsail_theme_installer_extension",
     "maintained_by": "dw-0",
     "display_name": "Mainsail Theme Installer",
-    "description": ["Install Mainsail Themes maintained by the Mainsail community."],
+    "description": ["Install Mainsail Themes maintained by the Mainsail community."]
-    "website": "https://docs.mainsail.xyz/theming/themes",
-    "updates": false
   }
 }

kiauh/extensions/mobileraker/metadata.json

@@ -7,7 +7,6 @@
         "description": [
             "Companion for Mobileraker, enabling push notification for Klipper using Moonraker."
         ],
-        "repo": "https://github.com/Clon1998/mobileraker_companion",
         "updates": true
     }
 }

kiauh/extensions/obico/metadata.json

@@ -11,8 +11,6 @@
         "- 25FPS High-Def Webcam Streaming",
         "- Free 4.9-Star Mobile App"
     ],
-    "website": "https://obico.io",
-    "repo": "github.com/TheSpaghettiDetective/moonraker-obico",
     "updates": true
   }
 }

kiauh/extensions/octoapp/metadata.json

@@ -12,7 +12,6 @@
             "- Live Gcode preview",
             "- And much much more!"
         ],
-        "repo": "https://github.com/crysxd/OctoApp-Plugin",
         "updates": true
     }
 }

kiauh/extensions/octoeverywhere/metadata.json

@@ -11,8 +11,6 @@
             "- Real-time Notifications",
             "- Live Streaming, and More!"
         ],
-        "website": "https://octoeverywhere.com",
-        "repo": "github.com/QuinnDamerell/OctoPrint-OctoEverywhere",
         "updates": true
     }
 }

kiauh/extensions/pretty_gcode/metadata.json

@@ -5,7 +5,6 @@
     "maintained_by": "Kragrathea",
     "display_name": "PrettyGCode for Klipper",
     "description": ["3D G-Code viewer for Klipper"],
-    "repo": "https://github.com/Kragrathea/pgcode",
     "updates": true
   }
 }

kiauh/extensions/simply_print/metadata.json

@@ -1,16 +1,13 @@
 {
-  "metadata": {
+    "metadata": {
-    "index": 10,
+        "index": 10,
-    "module": "simply_print_extension",
+        "module": "simply_print_extension",
-    "maintained_by": "dw-0",
+        "maintained_by": "dw-0",
-    "display_name": "SimplyPrint",
+        "display_name": "SimplyPrint",
-    "description": [
+        "description": [
-      "3D Printer Cloud Management Software.",
+            "3D Printer Cloud Management Software.",
-      "\n\n",
+            "\n\n",
-      "3D printing doesn't have to be a complicated, analog, SD card-filled experience; step into the future of modern 3D printing"
+            "3D printing doesn't have to be a complicated, analog, SD card-filled experience; step into the future of modern 3D printing"
-    ],
+        ]
-    "website": "https://simplyprint.io",
+    }
-    "repo": "https://github.com/SimplyPrint",
-    "updates": false
-  }
 }

kiauh/extensions/spoolman/metadata.json

@@ -13,7 +13,6 @@
       "\n\n",
       "Note: This extension installs Spoolman using Docker. Docker must be installed on your system before installing Spoolman."
     ],
-    "repo": "https://github.com/Donkie/Spoolman",
     "updates": true
   }
 }

kiauh/extensions/telegram_bot/metadata.json

@@ -5,7 +5,7 @@
     "maintained_by": "nlef",
     "display_name": "Moonraker Telegram Bot",
     "description": ["Control your printer with the Telegram messenger app."],
-    "repo": "https://github.com/nlef/moonraker-telegram-bot",
+    "project_url": "https://github.com/nlef/moonraker-telegram-bot",
     "updates": true
   }
 }

scripts/flash_klipper.sh

@@ -358,6 +358,7 @@ function get_usb_id() {
   unset mcu_list
   sleep 1
   mcus=$(find /dev/serial/by-id/* 2>/dev/null)
+  mcus+=" $(find /dev/serial/by-path/* 2>/dev/null)"
 
   for mcu in ${mcus}; do
     mcu_list+=("${mcu}")

scripts/moonraker.sh

@@ -27,7 +27,7 @@ function moonraker_systemd() {
   ###
   # any moonraker client that uses "moonraker" in its own name must be blacklisted using
   # this variable, otherwise they will be falsely recognized as moonraker instances
-  blacklist="obico|hmi|telegram-bot"
+  blacklist="obico"
 
   ignore="${SYSTEMD}/moonraker-(${blacklist}).service"
   match="${SYSTEMD}/moonraker(-[0-9a-zA-Z]+)?.service"