Merge branch 'staging/bugfix'

OctoPrint · Jun 26, 2023 · 1d519a2 · 1d519a2
2 parents da3ab33 + 584483a
commit 1d519a2
Show file tree

Hide file tree

Showing 15 changed files with 127 additions and 90 deletions.
diff --git a/.versioneer-lookup b/.versioneer-lookup
@@ -24,10 +24,10 @@ maintenance 1.9.0 fa2c4680cca0d1d6b46e6c1ed68ceea4d9b79afb pep440-dev
 fix/.* 1.9.0 fa2c4680cca0d1d6b46e6c1ed68ceea4d9b79afb pep440-dev
 improve/.* 1.9.0 fa2c4680cca0d1d6b46e6c1ed68ceea4d9b79afb pep440-dev
 
-# staging/bugfix is the branch for preparation of the 1.8.7 bugfix release
+# staging/bugfix is the branch for preparation of the 1.9.x bugfix releases
 # so are any bug/... branches
-staging/bugfix 1.8.8 8e4c1f5246c4245b839ccdcdabf2beee671b08d7 pep440-dev
-bug/.* 1.8.8 8e4c1f5246c4245b839ccdcdabf2beee671b08d7 pep440-dev
+staging/bugfix 1.9.1 93e495f921ea445d69ef51a1415f304b85ad3577 pep440-dev
+bug/.* 1.9.1 93e495f921ea445d69ef51a1415f304b85ad3577 pep440-dev
 
 # staging/maintenance is currently the branch for preparation of 1.9.0rc6
 # so is regressionfix/...

diff --git a/SUPPORTERS.md b/SUPPORTERS.md
@@ -61,10 +61,9 @@ thanks to everyone who contributed!
   * Richard Stocks
   * Robert Gusek
   * SimplyPrint
-  * Songyin Zheng
   * Stefan Krister
   * Steve Dougherty
   * Steve Thompson
   * Ulrich Kempken
 
-and 2002 more wonderful people pledging on the [Patreon campaign](https://patreon.com/foosel) or via [GitHub Sponsors](https://github.com/users/foosel/sponsorship)!
+and 1979 more wonderful people pledging on the [Patreon campaign](https://patreon.com/foosel) or via [GitHub Sponsors](https://github.com/users/foosel/sponsorship)!
diff --git a/setup.py b/setup.py
@@ -36,7 +36,7 @@
 bundled_plugins = [
     "OctoPrint-FileCheck>=2021.2.23",
     "OctoPrint-FirmwareCheck>=2021.10.11",
-    "OctoPrint-PiSupport>=2022.6.13",
+    "OctoPrint-PiSupport>=2023.5.24",
 ]
 core_deps = [
     "argon2_cffi>=21.3.0,<22",

diff --git a/src/octoprint/plugin/core.py b/src/octoprint/plugin/core.py
@@ -577,7 +577,9 @@ def version(self):
             self._version
             if self._version is not None
             else self._get_instance_attribute(
-                ControlProperties.attr_version, default=self._version, incl_metadata=True
+                ControlProperties.attr_version,
+                default=self._version,
+                incl_metadata=True,
             )
         )
 
@@ -959,7 +961,9 @@ def _find_plugins(self, existing=None, ignore_uninstalled=True):
         if self.plugin_folders:
             try:
                 added, found = self._find_plugins_from_folders(
-                    self.plugin_folders, existing, ignored_uninstalled=ignore_uninstalled
+                    self.plugin_folders,
+                    existing,
+                    ignored_uninstalled=ignore_uninstalled,
                 )
                 result_added.update(added)
                 result_found += found
@@ -1791,7 +1795,10 @@ def has_any_of_hooks(plugin, *hooks):
         plugin_hooks = plugin.hooks.keys()
 
         return any(
-            map(lambda hook: PluginManager.hook_matches_hooks(hook, *hooks), plugin_hooks)
+            map(
+                lambda hook: PluginManager.hook_matches_hooks(hook, *hooks),
+                plugin_hooks,
+            )
         )
 
     @staticmethod
@@ -2168,7 +2175,7 @@ def sort_func(impl):
 
             plugin_info = self.get_plugin_info(impl[0], require_enabled=False)
             return (
-                sv(sorting_value),
+                sv(sorting_value, default_value=self.default_order),
                 not plugin_info.bundled if plugin_info else True,
                 sv(impl[0]),
             )

diff --git a/src/octoprint/plugins/errortracking/__init__.py b/src/octoprint/plugins/errortracking/__init__.py
@@ -18,10 +18,10 @@
 )
 
 SENTRY_URL_SERVER = (
-    "https://21dc312545ad43599cec6447a22b1199@o118517.ingest.sentry.io/1373987"
+    "https://2887d6b262504b589a67632ab6ff6953@o118517.ingest.sentry.io/1373987"
 )
 SENTRY_URL_COREUI = (
-    "https://2e072e9c589742e18ba5e26f22395779@o118517.ingest.sentry.io/1374096"
+    "https://b6be6ca750ff4f8aabb07119fc6a7f31@o118517.ingest.sentry.io/1374096"
 )
 
 SETTINGS_DEFAULTS = {

diff --git a/src/octoprint/plugins/gcodeviewer/static/js/gcodeviewer.js b/src/octoprint/plugins/gcodeviewer/static/js/gcodeviewer.js
@@ -505,14 +505,15 @@ $(function () {
             });
         };
 
-        self.loadFile = function (path, date, size) {
+        self.loadFile = function (path, date, size, force) {
             self.enableReload(false);
             self.needsLoad = false;
             if (
                 self.status === "idle" &&
-                self.cachedPath !== path &&
-                self.cachedDate !== date &&
-                self.cachedSize !== size
+                (force ||
+                    (self.cachedPath !== path &&
+                        self.cachedDate !== date &&
+                        self.cachedSize !== size))
             ) {
                 self.status = "request";
 
@@ -549,7 +550,12 @@ $(function () {
 
         self.reload = function () {
             if (!self.enableReload()) return;
-            self.loadFile(self.loadedFilepath, self.loadedFileDate, self.loadedFileSize);
+            self.loadFile(
+                self.loadedFilepath,
+                self.loadedFileDate,
+                self.loadedFileSize,
+                true
+            );
         };
 
         self.fromHistoryData = function (data) {
@@ -891,8 +897,11 @@ $(function () {
         self.onTabChange = function (current, previous) {
             self.tabActive = current === "#gcode";
             if (self.tabActive && self.needsLoad) {
-                self.loadFile(self.selectedFile.path(), self.selectedFile.date()),
-                    self.selectedFile.size();
+                self.loadFile(
+                    self.selectedFile.path(),
+                    self.selectedFile.date(),
+                    self.selectedFile.size()
+                );
             }
         };
 

diff --git a/src/octoprint/plugins/gcodeviewer/static/js/viewer/worker.js b/src/octoprint/plugins/gcodeviewer/static/js/viewer/worker.js
@@ -4,10 +4,18 @@
  * Time: 12:18 PM
  */
 
+// base url to use for API calls; it's the worker location minus the worker.js path
+var baseUrl = self.location.href.substring(
+    0,
+    self.location.href.length - "/plugin/gcodeviewer/static/js/viewer/worker.js".length
+);
+
 // raw path suitable for fetch()
 var url;
+
 // path relative to Local
 var path;
+
 var firstReport;
 var toolOffsets = [{x: 0, y: 0}];
 var g90InfluencesExtruder = false;
@@ -455,7 +463,9 @@ var doParse = async function () {
     // if skipUntil is set, get skipUntilPresent
     skipUntilPresent = false;
     if (skipUntil !== undefined && skipUntil !== "") {
-        result = await fetch("/plugin/gcodeviewer/skipuntilcheck/local/" + path);
+        result = await fetch(
+            baseUrl + "/plugin/gcodeviewer/skipuntilcheck/local/" + path
+        );
         if (result.ok) {
             response = await result.json();
             skipUntilPresent = response.present;
@@ -904,6 +914,8 @@ var runAnalyze = function (message) {
     layerCnt = 0;
     speeds = {extrude: [], retract: [], move: []};
     speedsByLayer = {extrude: {}, retract: {}, move: {}};
+    emptyLayers = [];
+    percentageByLayer = [];
 };
 
 var setOption = function (options) {

diff --git a/src/octoprint/schema/config/serial.py b/src/octoprint/schema/config/serial.py
@@ -182,7 +182,7 @@ class SerialConfig(BaseModel):
     waitForStartOnConnect: bool = False
     """Whether OctoPrint should wait for the `start` response from the printer before trying to send commands during connect."""
 
-    waitToLoadSdFileList: bool = False
+    waitToLoadSdFileList: bool = True
     """Specifies whether OctoPrint should wait to load the SD card file list until the first firmware capability report is processed."""
 
     alwaysSendChecksum: bool = False

diff --git a/src/octoprint/static/js/app/viewmodels/control.js b/src/octoprint/static/js/app/viewmodels/control.js
@@ -57,19 +57,20 @@ $(function () {
         self._visibleWebcam = undefined;
 
         self._dispatchWebcamVisibilityChange = function (target, visible) {
+            log.debug(`Webcam visibility of #${target.id} changed to ${visible}`);
             var vm = ko.dataFor(target.children[0]);
             if (vm === self) {
-                console.debug(
+                log.debug(
                     `VM for webcam #${target.id} is not bound, skipping visibility update`
                 );
             } else if (vm === undefined) {
-                console.debug(
+                log.debug(
                     `VM for webcam #${target.id} not found, skipping visibility update`
                 );
             } else if (typeof vm.onWebcamVisibilityChange === "function") {
                 vm.onWebcamVisibilityChange(visible);
             } else {
-                console.debug(
+                log.debug(
                     `VM for webcam #${target.id} does not declare 'onWebcamVisibilityChange(visible)', skipping visibility update (vm=${vm.constructor.name})`
                 );
             }
@@ -122,7 +123,7 @@ $(function () {
                     var options = {
                         root: document.querySelector("#webcam_plugins_container"),
                         rootMargin: "0px",
-                        threshold: 1.0
+                        threshold: 0.01
                     };
                     var callback = function (entries) {
                         var visible = entries[0].isIntersecting;

diff --git a/src/octoprint/templates/dialogs/settings/serialconnection.jinja2 b/src/octoprint/templates/dialogs/settings/serialconnection.jinja2
@@ -463,7 +463,7 @@
                     <div class="controls">
                         <label class="checkbox">
                             <input type="checkbox" data-bind="checked: serial_waitToLoadSdFileList" id="settings-serialWaitToLoadSdFileList"> {{ _('Wait to load the SD card file list until the firmware capability report is processed.') }}
-                            <span class="help-block">{{ _('Try checking this if the SD card file list loads improperly after connecting to the printer.') }}</span>
+                            <span class="help-block">{{ _('Try unchecking this if the SD card file list never gets loaded after connecting to the printer, due to your firmware not providing a capability report.') }}</span>
                         </label>
                     </div>
                 </div>

diff --git a/src/octoprint/translations/de/LC_MESSAGES/messages.mo b/src/octoprint/translations/de/LC_MESSAGES/messages.mo
diff --git a/src/octoprint/translations/de/LC_MESSAGES/messages.po b/src/octoprint/translations/de/LC_MESSAGES/messages.po
@@ -3,10 +3,10 @@
 # This file is distributed under the same license as the OctoPrint project.
 msgid ""
 msgstr ""
-"Project-Id-Version: OctoPrint 1.9.0\n"
+"Project-Id-Version: OctoPrint 1.9.1\n"
 "Report-Msgid-Bugs-To: i18n@octoprint.org\n"
-"POT-Creation-Date: 2023-04-13 13:14+0200\n"
-"PO-Revision-Date: 2023-04-13 13:14+0200\n"
+"POT-Creation-Date: 2023-06-26 15:06+0200\n"
+"PO-Revision-Date: 2023-06-26 15:06+0200\n"
 "Last-Translator: Gina Häußge <gina@octoprint.org>\n"
 "Language: de\n"
 "Language-Team: de <LL@li.org>\n"
@@ -1863,16 +1863,16 @@ msgstr ""
 " noreferer\">Privacy Policy</a> an.\n"
 "</p>\n"
 
-#: src/octoprint/plugins/eventmanager/__init__.py:39
-#: src/octoprint/plugins/eventmanager/__init__.py:57
+#: src/octoprint/plugins/eventmanager/__init__.py:42
+#: src/octoprint/plugins/eventmanager/__init__.py:60
 msgid "Event Manager"
 msgstr "Eventmanager"
 
-#: src/octoprint/plugins/eventmanager/__init__.py:48
+#: src/octoprint/plugins/eventmanager/__init__.py:51
 msgid "Allows for the management of event subscriptions."
 msgstr "Ermöglicht das Verwalten von Eventsubscriptions."
 
-#: src/octoprint/plugins/eventmanager/__init__.py:61
+#: src/octoprint/plugins/eventmanager/__init__.py:64
 msgid "Plugin to configure event subscriptions available in config.yaml."
 msgstr "Plugin, um Eventsubscriptions in config.yaml zu konfigurieren."
 
@@ -1964,48 +1964,48 @@ msgstr "Analysiere..."
 msgid "Ready!"
 msgstr "Fertig!"
 
-#: src/octoprint/plugins/gcodeviewer/static/js/gcodeviewer.js:694
+#: src/octoprint/plugins/gcodeviewer/static/js/gcodeviewer.js:700
 #: src/octoprint/static/js/app/viewmodels/files.js:1066
 msgid "Model size"
 msgstr "Modelgröße"
 
-#: src/octoprint/plugins/gcodeviewer/static/js/gcodeviewer.js:704
+#: src/octoprint/plugins/gcodeviewer/static/js/gcodeviewer.js:710
 msgid "Estimated layer height"
 msgstr "Geschätzte Schichthöhe"
 
-#: src/octoprint/plugins/gcodeviewer/static/js/gcodeviewer.js:707
+#: src/octoprint/plugins/gcodeviewer/static/js/gcodeviewer.js:713
 #: src/octoprint/templates/tabs/timelapse.jinja2:69
 msgid "mm"
 msgstr "mm"
 
-#: src/octoprint/plugins/gcodeviewer/static/js/gcodeviewer.js:710
+#: src/octoprint/plugins/gcodeviewer/static/js/gcodeviewer.js:716
 msgid "Estimated total print time"
 msgstr "Geschätzte Gesamtdauer"
 
-#: src/octoprint/plugins/gcodeviewer/static/js/gcodeviewer.js:715
+#: src/octoprint/plugins/gcodeviewer/static/js/gcodeviewer.js:721
 msgid "Layers with extrusion"
 msgstr "Layer mit Extrusion"
 
-#: src/octoprint/plugins/gcodeviewer/static/js/gcodeviewer.js:748
+#: src/octoprint/plugins/gcodeviewer/static/js/gcodeviewer.js:754
 msgid "Layer number"
 msgstr "Schichtnummer"
 
-#: src/octoprint/plugins/gcodeviewer/static/js/gcodeviewer.js:749
+#: src/octoprint/plugins/gcodeviewer/static/js/gcodeviewer.js:755
 msgid "Layer height"
 msgstr "Schichthöhe"
 
-#: src/octoprint/plugins/gcodeviewer/static/js/gcodeviewer.js:750
+#: src/octoprint/plugins/gcodeviewer/static/js/gcodeviewer.js:756
 msgid "GCODE commands"
 msgstr "GCODE Befehle"
 
-#: src/octoprint/plugins/gcodeviewer/static/js/gcodeviewer.js:754
-#: src/octoprint/plugins/gcodeviewer/static/js/gcodeviewer.js:763
+#: src/octoprint/plugins/gcodeviewer/static/js/gcodeviewer.js:760
+#: src/octoprint/plugins/gcodeviewer/static/js/gcodeviewer.js:769
 #: src/octoprint/static/js/app/viewmodels/files.js:1081
 #: src/octoprint/static/js/app/viewmodels/files.js:1097
 msgid "Filament"
 msgstr "Filament"
 
-#: src/octoprint/plugins/gcodeviewer/static/js/gcodeviewer.js:765
+#: src/octoprint/plugins/gcodeviewer/static/js/gcodeviewer.js:771
 #: src/octoprint/static/js/app/viewmodels/control.js:177
 #: src/octoprint/static/js/app/viewmodels/files.js:1099
 #: src/octoprint/static/js/app/viewmodels/printerstate.js:357
@@ -2015,7 +2015,7 @@ msgstr "Filament"
 msgid "Tool"
 msgstr "Tool"
 
-#: src/octoprint/plugins/gcodeviewer/static/js/gcodeviewer.js:777
+#: src/octoprint/plugins/gcodeviewer/static/js/gcodeviewer.js:783
 #: src/octoprint/static/js/app/viewmodels/files.js:1109
 msgid "Estimated print time"
 msgstr "Geschätzte Dauer"
@@ -7867,9 +7867,13 @@ msgstr ""
 
 #: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:466
 msgid ""
-"Try checking this if the SD card file list loads improperly after "
-"connecting to the printer."
-msgstr "Deaktiviere das, falls die SD-Karten Dateiliste fehlerhaft geladen wird."
+"Try unchecking this if the SD card file list never gets loaded after "
+"connecting to the printer, due to your firmware not providing a "
+"capability report."
+msgstr ""
+"Deaktiviere das, falls die SD-Karten Dateiliste nach Verbindung zum "
+"Drucker nicht geladen wird, weil deine Firmware keinen Capability Report "
+"bereit stellt."
 
 #: src/octoprint/templates/dialogs/settings/serialconnection.jinja2:471
 msgid "Blocked commands"

diff --git a/translations/de/LC_MESSAGES/messages.mo b/translations/de/LC_MESSAGES/messages.mo