Merge branch 'master' into dev

Author: kennethjiang

Dockerfile.python2

@@ -1,23 +1,6 @@
 version: '3.7'
 
 services:
-  op_python2:
-    hostname: octoprint_python2
-    restart: unless-stopped
-    build:
-        context: .
-        dockerfile: Dockerfile.python2
-    ports:
-      - "${OP_PYTHON2_PORT-5002}:5000"
-    volumes:
-     - ./:/app
-    environment:
-        DEBUG: 'True'
-        JANUS_SERVER: 'janus'
-    depends_on:
-      - janus
-    command: bash -c "sleep 11111111111"
-
   op:
     hostname: octoprint
     restart: unless-stopped

docker-compose.yml

@@ -123,6 +123,7 @@ def streaming_jcfg_rtsp_section(stream_id, rtsp_url, dataport):
         videopt = 96
         videortpmap = "H264/90000"
         videofmtp = "profile-level-id=42e01f;packetization-mode=1"
+        videobufferkf = true
         data = true
         dataport = {dataport}
         datatype = "binary"
@@ -148,6 +149,7 @@ def streaming_jcfg_rtp_section(stream_id, videoport, videortcpport, dataport):
         videopt = 96
         videortpmap = "H264/90000"
         videofmtp = "profile-level-id=42e01f;packetization-mode=1"
+        videobufferkf = true
         data = true
         dataport = {dataport}
         datatype = "binary"

octoprint_obico/janus_config_builder.py

@@ -96,6 +96,13 @@ def status(self, plugin, status_only=False):
         data['status']['_ts'] = int(time.time())
         data['status']['currentLayerHeight'] = self.current_layer_height # use camel-case to be consistent with the existing convention
 
+        # Backfill progress.filamentUsed from job.filament.tool0.length for new OctoPrint versions
+        progress = (data.get('status') or {}).get('progress') or {}
+        if progress and 'filamentUsed' not in progress:
+            filament_length = ((((data.get('status') or {}).get('job') or {}).get('filament') or {}).get('tool0') or {}).get('length')
+            if filament_length is not None:
+                progress['filamentUsed'] = filament_length
+
         if status_only:
             if self._file_metadata_cache:
                 data['status']['file_metadata'] = self._file_metadata_cache

octoprint_obico/print_job_tracker.py

@@ -539,7 +539,7 @@ def preconfigured_webcams(self):
             preconfigured = json.loads(os.getenv('PRECONFIGURED_WEBCAMS'))
 
             if preconfigured:
-                self.janus = JanusConn(self.plugin, preconfigured['janus_server'], JANUS_WS_PORT)
+                self.janus = JanusConn(self.plugin, preconfigured['janus_server'])
                 self.janus.start_janus_ws()
 
         return preconfigured

octoprint_obico/webcam_stream.py

@@ -14,7 +14,7 @@
 plugin_name = "OctoPrint-Obico"
 
 # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
-plugin_version = "2.5.2"
+plugin_version = "2.5.5"
 
 # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
 # module