From 2384ad4c95ca76d4503ac1f87efe57a21a250ee5 Mon Sep 17 00:00:00 2001
From: jvandenbroek <jvandenbroek@gmail.com>
Date: Thu, 4 Feb 2016 11:46:29 +0100
Subject: [PATCH] Publish progress configurable
---
service.mqtt/addon.xml | 2 +-
.../resources/language/English/strings.po | 16 ++++++++++------
service.mqtt/resources/settings.xml | 5 +++--
service.mqtt/service.py | 3 ++-
4 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/service.mqtt/addon.xml b/service.mqtt/addon.xml
index 88a8a1d..dd697b8 100644
--- a/service.mqtt/addon.xml
+++ b/service.mqtt/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="service.mqtt" name="MQTT Adapter" version="0.91" provider-name="owagner">
+<addon id="service.mqtt" name="MQTT Adapter" version="0.9" provider-name="owagner">
<requires>
<import addon="xbmc.python" version="2.19.0"/>
</requires>
diff --git a/service.mqtt/resources/language/English/strings.po b/service.mqtt/resources/language/English/strings.po
index 3dc40dc..660dcdd 100644
--- a/service.mqtt/resources/language/English/strings.po
+++ b/service.mqtt/resources/language/English/strings.po
@@ -21,27 +21,31 @@ msgid "General"
msgstr ""
msgctxt "#30011"
-msgid "MQTT Broker IP"
+msgid "Broker IP"
msgstr ""
msgctxt "#30012"
-msgid "MQTT Broker Port"
+msgid "Broker Port"
msgstr ""
msgctxt "#30013"
-msgid "MQTT Topic Prefix"
+msgid "Topic Prefix"
msgstr ""
msgctxt "#30014"
-msgid "MQTT Reconnect Retries"
+msgid "Reconnect Retries"
msgstr ""
msgctxt "#30015"
-msgid "Ignore details for these words (comma separated)"
+msgid "Publish progress"
msgstr ""
msgctxt "#30016"
-msgid "Progress interval (in seconds)"
+msgid "Interval (in seconds)"
+msgstr ""
+
+msgctxt "#30017"
+msgid "Ignore details for these words (comma separated)"
msgstr ""
msgctxt "#30100"
diff --git a/service.mqtt/resources/settings.xml b/service.mqtt/resources/settings.xml
index 83e6801..329e4b7 100644
--- a/service.mqtt/resources/settings.xml
+++ b/service.mqtt/resources/settings.xml
@@ -5,8 +5,9 @@
<setting label="30012" type="number" id="mqttport" default="1883"/>
<setting label="30013" type="text" id="mqtttopic" default="kodi/"/>
<setting label="30014" type="number" id="mqttretry" default="5"/>
- <setting label="30015" type="text" id="mqttignore" default=""/>
- <setting label="30016" type="text" id="mqttinterval" default="20"/>
+ <setting label="30015" type="bool" id="mqttprogress" default="true"/>
+ <setting label="30016" type="text" id="mqttprogressinterval" default="20" visible="eq(-1,true)"/>
+ <setting label="30017" type="text" id="mqttignore" default=""/>
</category>
<category label="30100">
<setting label="30101" type="bool" id="mqttanonymousconnection" default="true" />
diff --git a/service.mqtt/service.py b/service.mqtt/service.py
index 2cf8057..85c8854 100644
--- a/service.mqtt/service.py
+++ b/service.mqtt/service.py
@@ -243,5 +243,6 @@ if (__name__ == "__main__"):
xbmc.log("MQTT: No connection possible, giving up.")
mqc.loop_stop(True)
while not monitor.waitForAbort(mqttinterval):
- publishdetails()
+ if __addon__.getSetting('mqttprogress').lower() == "true":
+ publishdetails()
mqc.loop_stop(True)
--
GitLab