From 5ac1c57346a4e9ede1afb8bd074953228159cc06 Mon Sep 17 00:00:00 2001
From: jvandenbroek <jvandenbroek@gmail.com>
Date: Sat, 6 Feb 2016 11:30:33 +0100
Subject: [PATCH] Settings reloaded on change, fixed progress floating point
decimal
---
service.mqtt/service.py | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/service.mqtt/service.py b/service.mqtt/service.py
index d3593da..5b6d3d1 100644
--- a/service.mqtt/service.py
+++ b/service.mqtt/service.py
@@ -14,11 +14,14 @@ __version__ = __addon__.getAddonInfo('version')
def getSetting(setting):
return __addon__.getSetting(setting).strip()
-mqttretry = int(getSetting("mqttretry"))
-mqttprogress = getSetting('mqttprogress').lower() == "true"
-mqttinterval = int(getSetting('mqttinterval'))
-mqttdetails = getSetting('mqttdetails').lower() == "true"
-mqttignore = getSetting('mqttignore').lower().split(',')
+def load_settings():
+ global mqttretry,mqttprogress,mqttinterval,mqttdetails,mqttignore
+ mqttretry = int(getSetting("mqttretry"))
+ mqttprogress = getSetting('mqttprogress').lower() == "true"
+ mqttinterval = int(getSetting('mqttinterval'))
+ mqttdetails = getSetting('mqttdetails').lower() == "true"
+ mqttignore = getSetting('mqttignore').lower().split(',')
+
activeplayerid=-1
activeplayertype=""
lasttitle=""
@@ -95,7 +98,7 @@ def publishprogress():
else:
progress=0
state={"kodi_time":convtime(pt),"kodi_totaltime":convtime(tt)}
- publish("progress",round(progress,1),state)
+ publish("progress","%.1f" % progress,state)
#
# Publish more details about the currently playing item
@@ -127,6 +130,7 @@ class MQTTMonitor(xbmc.Monitor):
global mqc
mqttlogging("MQTT: Settings changed, reconnecting broker")
mqc.loop_stop(True)
+ load_settings()
startmqtt()
class MQTTPlayer(xbmc.Player):
@@ -260,6 +264,7 @@ def startmqtt():
if (__name__ == "__main__"):
global monitor,player
xbmc.log('MQTT: MQTT Adapter Version %s started' % __version__)
+ load_settings()
monitor=MQTTMonitor()
player=MQTTPlayer()
for attempt in range(mqttretry):
--
GitLab