#5 - Handle port mismatches

Author: i96751414

lib/service.py

@@ -3,14 +3,24 @@
 import threading
 from xml.etree import ElementTree  # nosec
 
+try:
+    import urlparse
+except ImportError:
+    import urllib.parse as urlparse
+
 import xbmc
 
 from lib.entries import ENTRIES_PATH
 from lib.httpserver import threaded_http_server
-from lib.kodi import ADDON_PATH, get_repository_port, set_logger
+from lib.kodi import ADDON_PATH, get_repository_port, set_logger, notification, translate
 from lib.repository import Repository
 from lib.routes import add_repository_routes
 
+REPO_DIR_XPATH = "extension[@point='xbmc.addon.repository']/dir"
+REPO_INFO_XPATH = "info"
+REPO_CHECKSUM_XPATH = "checksum"
+REPO_DATADIR_XPATH = "datadir"
+
 set_logger()
 add_repository_routes(Repository(
     files=(os.path.join(ADDON_PATH, "resources", "repository.json"), ENTRIES_PATH)))
@@ -19,12 +29,20 @@
 def update_repository_port(port, xml_path=os.path.join(ADDON_PATH, "addon.xml")):
     base_url = "http://127.0.0.1:{}/".format(port)
     tree = ElementTree.parse(xml_path)
-    tree.find("extension[@point='xbmc.addon.repository']/dir/info").text = base_url + "addons.xml"
-    tree.find("extension[@point='xbmc.addon.repository']/dir/checksum").text = base_url + "addons.xml.md5"
-    tree.find("extension[@point='xbmc.addon.repository']/dir/datadir").text = base_url
+    dir_element = tree.find(REPO_DIR_XPATH)
+    dir_element.find(REPO_INFO_XPATH).text = base_url + "addons.xml"
+    dir_element.find(REPO_CHECKSUM_XPATH).text = base_url + "addons.xml.md5"
+    dir_element.find(REPO_DATADIR_XPATH).text = base_url
     tree.write(xml_path, encoding="UTF-8", xml_declaration=True)
 
 
+def validate_repository_port(port, xml_path=os.path.join(ADDON_PATH, "addon.xml")):
+    dir_element = ElementTree.parse(xml_path).find(REPO_DIR_XPATH)
+    ports = (urlparse.urlparse(dir_element.find(m).text).port for m in
+             (REPO_DATADIR_XPATH, REPO_INFO_XPATH, REPO_CHECKSUM_XPATH))
+    return all(port == p for p in ports)
+
+
 class ServiceMonitor(xbmc.Monitor):
     def __init__(self, port):
         super(ServiceMonitor, self).__init__()
@@ -33,6 +51,7 @@ def __init__(self, port):
     def onSettingsChanged(self):
         port = get_repository_port()
         if port != self._port:
+            notification(translate(30021))
             update_repository_port(port)
             self._port = port
 
@@ -68,5 +87,8 @@ def __exit__(self, exc_type, exc_val, exc_tb):
 
 def run():
     port = get_repository_port()
+    if not validate_repository_port(port):
+        notification(translate(30020))
+        update_repository_port(port)
     with HTTPServerRunner(port):
         ServiceMonitor(port).waitForAbort()

resources/language/resource.language.en_gb/strings.po

@@ -46,6 +46,7 @@ msgctxt "#30006"
 msgid "About"
 msgstr ""
 
+# Entries
 msgctxt "#30010"
 msgid "No entries to delete"
 msgstr ""
@@ -64,4 +65,13 @@ msgstr ""
 
 msgctxt "#30014"
 msgid "Failed updating repository"
-msgstr ""
+msgstr ""
+
+# Service
+msgctxt "#30020"
+msgid "Detected repository port mismatches. Applying a fix - please restart Kodi so changes take effect."
+msgstr ""
+
+msgctxt "#30021"
+msgid "Please restart Kodi so the updated port takes effect."
+msgstr ""

resources/language/resource.language.es_es/strings.po

@@ -46,6 +46,7 @@ msgctxt "#30006"
 msgid "About"
 msgstr "Sobre"
 
+# Entries
 msgctxt "#30010"
 msgid "No entries to delete"
 msgstr "No hay entradas que eliminar"
@@ -65,3 +66,12 @@ msgstr "Repositorio actualizado"
 msgctxt "#30014"
 msgid "Failed updating repository"
 msgstr "Error al actualizar el repositorio"
+
+# Service
+msgctxt "#30020"
+msgid "Detected repository port mismatches. Applying a fix - please restart Kodi so changes take effect."
+msgstr "Se detectaron incompatibilidades en los puertos del repositorio. Se está aplicando una solución - reinicie Kodi para que los cambios surtan efecto."
+
+msgctxt "#30021"
+msgid "Please restart Kodi so the updated port takes effect."
+msgstr "Reinicie Kodi para que el puerto actualizado surta efecto."

resources/language/resource.language.pt_br/strings.po

@@ -46,6 +46,7 @@ msgctxt "#30006"
 msgid "About"
 msgstr "Sobre"
 
+# Entries
 msgctxt "#30010"
 msgid "No entries to delete"
 msgstr "Sem entradas para apagar"
@@ -65,3 +66,12 @@ msgstr "Repositório atualizado"
 msgctxt "#30014"
 msgid "Failed updating repository"
 msgstr "Erro a atualizar repositório"
+
+# Service
+msgctxt "#30020"
+msgid "Detected repository port mismatches. Applying a fix - please restart Kodi so changes take effect."
+msgstr "Detetadas incompatibilidades no porto do repositório. A corrigir - por favor reinicie o Kodi para que as alterações surtam efeito"
+
+msgctxt "#30021"
+msgid "Please restart Kodi so the updated port takes effect."
+msgstr "Por favor reinicie o Kodi para que o porto atualizado surta efeito"

resources/language/resource.language.pt_pt/strings.po

@@ -46,6 +46,7 @@ msgctxt "#30006"
 msgid "About"
 msgstr "Sobre"
 
+# Entries
 msgctxt "#30010"
 msgid "No entries to delete"
 msgstr "Sem entradas para apagar"
@@ -65,3 +66,12 @@ msgstr "Repositório atualizado"
 msgctxt "#30014"
 msgid "Failed updating repository"
 msgstr "Erro a atualizar repositório"
+
+# Service
+msgctxt "#30020"
+msgid "Detected repository port mismatches. Applying a fix - please restart Kodi so changes take effect."
+msgstr "Detetadas incompatibilidades no porto do repositório. A corrigir - por favor reinicie o Kodi para que as alterações surtam efeito"
+
+msgctxt "#30021"
+msgid "Please restart Kodi so the updated port takes effect."
+msgstr "Por favor reinicie o Kodi para que o porto atualizado surta efeito"