Kodi 19 support

Author: Lord-Grey

.gitignore

@@ -7,3 +7,4 @@ Desktop.ini
 
 # python
 *.pyo
+__pycache__

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 hyperion-project
+Copyright (c) 2021 hyperion-project
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

LICENSE.txt

@@ -1,6 +1,6 @@
-# Hyperion Control [![Total alerts](https://img.shields.io/lgtm/alerts/g/hyperion-project/hyperion.control.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/hyperion-project/hyperion.control/alerts/)
+# Hyperion Control fork for Kodi 19 (Matrix)
 
-Hyperion Control is an addon for Kodi Mediacenter that observes Kodi events (playing state, screensaver, ...). Based on these events you can control Hyperion components to enable or disable accordingly.
+This is a KodiMatrix ONLY fork of Hyperion Control which is an addon for Kodi Mediacenter that observes Kodi events (playing state, screensaver, ...). Based on these events you can control Hyperion components to enable or disable accordingly.
 
 For example playing a video should enable screen capture, if you pause the video or you are at the Kodi menu the screen capture should be disabled to show a background effect as mood light
 
@@ -14,20 +14,8 @@ For example playing a video should enable screen capture, if you pause the video
 
 ### Installation
 - Download .zip from release page and use "Install from zip file" dialog at the Kodi addons section.
-- Download from the official Kodi Addon repository (NOT PUBLISHED)
-
-### Possible Features
-- Track ip/port changes on startup and update accordingly (this works just if server detection was used to configure ip/port)
-
-### Feedback
-- Please open a github issue with (detailed) feedback
-
-### Contributing  
-Contributions are welcome! Feel free to join us! We are looking always for people who wants to participate.  
-[![Contributors](https://img.shields.io/github/contributors/hyperion-project/hyperion.control.svg)](https://github.com/hyperion-project/hyperion.control/graphs/contributors)
-
-For an example, you can participate in the translation.  
-[![Join Translation](https://img.shields.io/badge/POEditor-translate-green.svg)](https://poeditor.com/join/project/WauIsJeEx4)
 
 ### Credits
 - Dan Krause for the SSDP client
+- Paulchen-Panther for service development
+- brindosch for service development

README.md

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="script.service.hyperion-control" name="Hyperion Control" version="1.0.1" provider-name="hyperion-project, brindosch">
+<addon id="script.service.hyperion-control" name="Hyperion Control" version="19.0.1" provider-name="hyperion-project">
   <requires>
 	<import addon="xbmc.addon"  version="17.0.0"/>
-    <import addon="xbmc.python" version="2.25.0"/>
+    <import addon="xbmc.python" version="3.0.0"/>
 	<import addon="script.module.simplejson" version="3.3.0"/>
 	<import addon="script.module.httplib2" version="0.8.0"/>
   </requires>
@@ -18,11 +18,15 @@
     <language></language>
     <platform>all</platform>
     <license>MIT</license>
-    <forum>https://forum.hyperion-project.org</forum>
+    <forum>https://hyperion-project.org/forum</forum>
     <website>https://www.hyperion-project.org</website>
     <email></email>
-    <source>https://github.com/hyperion-project</source>
+    <source>https://github.com/hyperion-project/hyperion.control</source>
     <news>
+      19.0.1
+      - Kodi 19 support
+      - minor cleanups and corrections
+
       1.0.1
       - Fixed a crash with 3d mode @b-jesch
 
@@ -33,8 +37,8 @@
     </news>
 	<assets>
 		<icon>resources/media/icon.png</icon>
-		<fanart>resources/media/fanart.jpg</fanart>
-		<screenshot>resources/media/fanart.jpg</screenshot>
+		<fanart>resources/media/fanart.png</fanart>
+		<screenshot>resources/media/screenshot-01.png</screenshot>
 	</assets>
   </extension>
 </addon>

addon.xml

@@ -1,5 +1,7 @@
-from utils import log
+from lib.utils import log, bytesDecodeUtf8
+from lib.gui import notifyUser
 import httplib2
+import simplejson as json
 
 class Connection:
     def __init__(self):
@@ -20,8 +22,14 @@ def updateURL(self, ip, port):
         self.__url = "http://"+ip+":"+str(port)+"/json-rpc"
 
     def send(self, body):
+        log("Send to: "+self.__url+" payload: "+body)
         try:
             response, content = self.__http.request(self.__url, 'POST', headers=self.__headers, body=body)
+            jsonContent = json.loads(bytesDecodeUtf8(content))
+            if not jsonContent["success"]:
+                if jsonContent["error"] == "No Authorization":
+                    notifyUser("Error: No Authorization, API Token required")
+                log("Error: "+jsonContent["error"])
         except:
             pass
 

resources/lib/connection.py renamed to lib/connection.py

@@ -1,11 +1,13 @@
-from utils import log
-import xbmc, xbmcaddon, time
+from lib.utils import log
 import websocket
 
 class Connection:
     def __init__(self):
-        self.__url = "ws://192.168.0.12:19444"
+        # self.__url = "ws://192.168.0.11:19446"
+        # self.__url = "ws://192.168.0.12:19444"
+        self.__url = "ws://192.168.0.13:19444"
         self.__ip = "127.0.0.1"
+        # self.__port = "19446"
         self.__port = "19444"
         self.__connected = False
         self.__ws = websocket.WebSocketApp(url=self.__url , on_message = self.on_message, on_error = self.on_error, on_close = self.on_close, on_open = self.on_open)

resources/lib/connection_ws.py renamed to lib/connection_ws.py

@@ -1,6 +1,6 @@
 import xbmcgui
-import ssdp
-from utils import log, openSettings, getLS, getSetting, setSetting, getAddonVersion, getAddonChangelog, updateSavedAddonVersion
+import lib.ssdp as ssdp
+from lib.utils import openSettings, getLS, getSetting, setSetting, getAddonVersion, getAddonChangelog
 
 def notifyUser(message,time=3000, icon=xbmcgui.NOTIFICATION_INFO):
     xbmcgui.Dialog().notification('Hyperion Control', message.encode('utf-8'), icon, time)
@@ -37,7 +37,7 @@ def doSSDPDiscovery():
         if len(filteredResponse) > 1:
             selectedServer = xbmcgui.Dialog().select(getLS(32102), buildSelectList(ipPortUsnList))
         else:
-            xbmcgui.Dialog().ok('Hyperion Control', getLS(32103), '-> '+ipPortUsnList[0]["ip"]+':'+str(ipPortUsnList[0]["port"]))
+            xbmcgui.Dialog().ok('Hyperion Control', getLS(32103) + '[CR]' + ipPortUsnList[0]["ip"]+':'+str(ipPortUsnList[0]["port"]))
             selectedServer = 0
 
         #check user input and push settings if valid
@@ -51,12 +51,12 @@ def doSSDPDiscovery():
     return
 
 def doInitialWizard():
-    if xbmcgui.Dialog().yesno('Hyperion Control',getLS(32100),getLS(32101)):
+    if xbmcgui.Dialog().yesno('Hyperion Control',getLS(32100) + "[CR]" + getLS(32101)):
         doSSDPDiscovery()
         openSettings()
     return
 
 def doChangelogDisplay():
     if getSetting('currAddonVersion') != getAddonVersion():
-        updateSavedAddonVersion()
+        # updateSavedAddonVersion()
         xbmcgui.Dialog().textviewer('Hyperion Control - Changelog', getAddonChangelog())

resources/lib/gui.py renamed to lib/gui.py

@@ -17,15 +17,18 @@
 #
 
 import socket
-import httplib
-import StringIO
+from .utils import log, bytesEncodeUtf8
+
+import http.client
+
+from io import BytesIO
 
 class SSDPResponse(object):
-    class _FakeSocket(StringIO.StringIO):
+    class _FakeSocket(BytesIO):
         def makefile(self, *args, **kw):
             return self
     def __init__(self, response):
-        r = httplib.HTTPResponse(self._FakeSocket(response))
+        r = http.client.HTTPResponse(self._FakeSocket(response))
         r.begin()
         self.location = r.getheader("location")
         self.usn = r.getheader("usn")
@@ -47,11 +50,11 @@ def discover(service, timeout=3, retries=1, mx=2):
         sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM, socket.IPPROTO_UDP)
         sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
         sock.setsockopt(socket.IPPROTO_IP, socket.IP_MULTICAST_TTL, 2)
-        sock.sendto(message.format(*group, st=service, mx=mx), group)
+        sock.sendto(bytesEncodeUtf8(message.format(*group, st=service, mx=mx)), group)
         while True:
             try:
                 response = SSDPResponse(sock.recv(1024))
                 responses[response.location] = response
             except socket.timeout:
                 break
-    return responses.values()
+    return list(responses.values())

resources/lib/ssdp.py renamed to lib/ssdp.py

@@ -1,10 +1,11 @@
 import xbmc, xbmcaddon
 import simplejson as json
+import sys
 
 ADDON = xbmcaddon.Addon()
 ADDONNAME = ADDON.getAddonInfo('id')
 
-def log(message, level=xbmc.LOGNOTICE):
+def log(message, level=xbmc.LOGINFO):
     xbmc.log('[%s] %s' % (ADDONNAME, message.encode('utf-8')), level)
 
 def getSetting(opt):
@@ -34,20 +35,36 @@ def validateAuthToken(authToken):
 
 def updateSavedAddonVersion():
     setSetting('currAddonVersion', getAddonVersion())
-    
+
 def intToCompString(comp):
     switch = {
-        0: "COMP_GRABBER",
-        1: "COMP_V4L",
-        2: "COMP_LEDDEVICE",
-        3: "COMP_SMOOTHING",
-        4: "COMP_BLACKBORDER",
-        5: "COMP_FORWARDER",
-        6: "COMP_BOBLIGHTSERVER",
-        7: "COMP_ALL",
+        0: "GRABBER",
+        1: "V4L",
+        2: "LEDDEVICE",
+        3: "SMOOTHING",
+        4: "BLACKBORDER",
+        5: "FORWARDER",
+        6: "UDPLISTENER",
+        7: "BOBLIGHTSERVER",
+        8: "ALL",
     }
     return switch.get(comp, "NOT_FOUND")
 
+def isPy3():
+    return sys.version_info[0] == 3
+
+def bytesDecodeUtf8(data):
+    if isPy3():
+        return data.decode('utf-8')
+    else:
+        return data
+
+def bytesEncodeUtf8(data):
+    if isPy3():
+        return data.encode('utf-8')
+    else:
+        return data
+
 def modeTo3D(mode=None):
     switch = {
         "split_vertical": "3DSBS",
@@ -57,7 +74,7 @@ def modeTo3D(mode=None):
 
 def getStereoscopeMode():
     try:
-        response = json.loads(xbmc.executeJSONRPC('{"jsonrpc":"2.0","method":"GUI.GetProperties","params":{"properties":["stereoscopicmode"]},"id":669}'))
+        response = json.loads(bytesDecodeUtf8(xbmc.executeJSONRPC('{"jsonrpc":"2.0","method":"GUI.GetProperties","params":{"properties":["stereoscopicmode"]},"id":669}')))
         mode = response["result"]["stereoscopicmode"]["mode"]
         return modeTo3D(mode)