Merge pull request #17 from CDRV/dev

Main merge for 1.2.1 release

Globals.py

@@ -2,4 +2,4 @@
 
 config_man = ConfigManager()
 
-version_string = '1.2.0'
+version_string = '1.2.1'

libs/servers/WatchServerOpenTera.py

@@ -237,7 +237,11 @@ def initiate_opentera_transfer(self, device_name: str):
 
                 # Create session events
                 session_events = self.watch_logs_to_events(logs_data)
-                for event in session_events:
+                for index, event in enumerate(session_events):
+                    if index >= 100:
+                        logging.warning('OpenTera: More than 100 session events for session ' + session_name +
+                                        ' - ignoring the rest...')
+                        break
                     event['id_session'] = id_session
                     event['id_session_event'] = 0
                     response = device_com.do_post(DeviceAPI.ENDPOINT_DEVICE_SESSION_EVENTS, {'session_event': event})

libs/servers/handlers/BaseAppleWatchRequestHandler.py

@@ -111,7 +111,7 @@ def do_POST(self):
                     return
 
                 if text_format:
-                    fh.write(data.decode())
+                    fh.write(data.decode(errors="ignore"))  # Ignore unknown characters and errors
                 else:
                     fh.write(data)
                 content_size_remaining -= buffer_size