Fix more FabLab related merge issues

Author: DeviousFusion

src/octoprint/plugins/errortracking/static/js/errortracking.js

@@ -12,6 +12,9 @@ $(function () {
             // already enabled?
             if (self.settings.settings.plugins.errortracking.enabled()) return;
 
+            // Exit if bundled software update plugin is disabled
+            if (!self.settings.settings.plugins.softwareupdate) return;
+
             // RC release channel?
             var releaseChannel = self.settings.settings.plugins.softwareupdate.octoprint_release_channel();
             if (releaseChannel === "rc/maintenance" || releaseChannel === "rc/devel") {

src/octoprint/printer/standard.py

@@ -12,6 +12,7 @@
 import copy
 import logging
 import os
+import requests
 import threading
 import time
 
@@ -1687,6 +1688,8 @@ def log_print():
                 self._dict(text=self.get_state_string(), flags=self._getStateFlags())
             )
 
+        endtransaction()
+
     def on_comm_print_job_cancelling(self, firmware_error=None, user=None):
         payload = self._payload_for_print_job_event(action_user=user)
         if payload:
@@ -1742,6 +1745,8 @@ def finalize():
             thread.daemon = True
             thread.start()
 
+        endtransaction()
+
     def on_comm_print_job_paused(self, suppress_script=False, user=None):
         payload = self._payload_for_print_job_event(
             position=self._comm.pause_position.as_dict()

src/octoprint/server/api/offline.py

@@ -65,7 +65,7 @@ def tryFabAppOrGetLocal(filename):
     print(faPayload)
     try:
         r = requests.request("POST", faUrl + "api/" + filename + ".php",
-                             json=faPayload, headers=faHeaders, timeout=0.5)
+                             json=faPayload, headers=faHeaders, timeout=(3, 9))
         response = r.json()
         print("Connection to FabApp successful. Updating " + fname)
         if filename == "flud":
@@ -75,7 +75,7 @@ def tryFabAppOrGetLocal(filename):
 
         return jsonify(response)
 
-    except:
+    except Exception as e:
         print("ALERT -- Connection to FabApp failed. Using local cache from " + fname)
         print("DEBUG: \n" + str(e))
         if filename == "flud":

src/octoprint/settings.py

@@ -274,6 +274,7 @@ def settings(init=False, basedir=None, configfile=None):
     },
     "folder": {
         "uploads": None,
+        "FabAppData": None,
         "timelapse": None,
         "timelapse_tmp": None,
         "logs": None,

src/octoprint/templates/sidebar/state.jinja2

@@ -2,13 +2,12 @@
 <span data-bind="visible: isOperational"><span title="{{ _('Count of resend requests, transmitted lines and resend ratio')|edq }}">{{ _('Resend ratio') }}</span>: <strong data-bind="css: {'text-error': resendRatioCritical}"><span title="{{ _('resend requests') | edq }}" data-bind="text: formatHuman(resendCount())"></span> / <span title="{{ _('transmitted lines') | edq }}" data-bind="text: formatHuman(resendTotalTransmitted())"></span> (<span title="{{ _('resend ratio') }}" data-bind="text: resendRatio"></span>%) <a href="https://faq.octoprint.org/communication-errors" target="_blank" class="text-error" data-bind="visible: resendRatioCritical"><i class="fas fa-question-circle"></i></a></strong><br></span>
 <hr>
 <span title="{{ _('Name of file currently selected for printing')|edq }}">{{ _('File') }}</span>: <strong data-bind="text: filedisplay, attr: {title: filepath}"></strong>&nbsp;<strong data-bind="visible: sd">(SD)</strong><br>
-<span title="{{ _('Upload date of the file currently selected or printing')|edq }}">{{ _('Uploaded') }}</span>: <strong data-bind="text: dateString"></strong><br>
-<span title="{{ _('Current Transaction ID')|edq }}">{{ _('Transaction ID') }}</span>: <strong data-bind="text: transIdString "></strong><br>
 <!-- ko foreach: filament -->
 <span data-bind="text: 'Filament (' + name() + '): ', title: 'Filament usage for ' + name()"></span><strong data-bind="text: formatFilament(data())"></strong><br>
 <!-- /ko -->
 <span title="{{ _('Estimated total print time based on analysis of the file or past prints')|edq }}">{{ _('Approx. Total Print Time') }}</span>: <strong data-bind="text: estimatedPrintTimeString, attr: {title: estimatedPrintTimeExactString}"></strong><br>
 <hr>
+<span title="{{ _('Current Transaction ID')|edq }}">{{ _('Transaction ID') }}</span>: <strong data-bind="text: transIdString "></strong><br>
 <span title="{{ _('Total print time so far')|edq }}">{{ _('Elapsed Time') }}</span>: <strong data-bind="text: printTimeString"></strong><br>
 <span title="{{ _('Estimated time until the print job is done. This is only an estimate and accuracy depends heavily on various factors!')|edq }}">{{ _('Print Time Left') }}</span>: <strong data-bind="text: printTimeLeftString, attr: {title: printTimeLeftExactString}"></strong> <span id="state_printtimeleft_popover" style="display: none" data-bind="visible: printTimeLeftOrigin, attr: {title: printTimeLeftOriginString}, css: printTimeLeftOriginClass">&#9679;</span><br>
 <span title="{{ _('Bytes printed vs total bytes of file')|edq }}">{{ _('Printed') }}</span>: <strong data-bind="text: byteString"></strong><br>