Add some of the common functions

cgarwood · Apr 23, 2020 · b2e9ab9 · b2e9ab9
1 parent 1ba9c24
commit b2e9ab9
Showing 1 changed file with 32 additions and 14 deletions.
diff --git a/fullykiosk/__init__.py b/fullykiosk/__init__.py
@@ -2,46 +2,64 @@
 import logging
 import requests
 
-class FullyKiosk():
+
+class FullyKiosk:
     def __init__(self, host, port, password):
         self.host = host
         self.port = port
         self.password = password
 
-        self.getDeviceInfo()
+        self._deviceInfo = None
 
     def sendCommand(self, cmd, **kwargs):
         url = f"http://{self.host}:{self.port}/?cmd={cmd}&password={self.password}&type=json"
         for key, value in kwargs.items():
             url = url + f"&{key}={value}"
 
-        result = json.loads(requests.get(url).content)
-        print("{}".format(result))
+        try:
+            result = json.loads(requests.get(url, timeout=10).content)
+        except requests.exceptions.Timeout:
+            print("Timeout error")
+
+        return result
 
     def getDeviceInfo(self):
-        result = self.sendCommand('deviceInfo')
-        self.deviceInfo = result
-        return self.deviceInfo
+        result = self.sendCommand("deviceInfo")
+        self._deviceInfo = result
+        return self._deviceInfo
 
+    @property
+    def deviceInfo(self):
+        return self._deviceInfo
 
     def startScreensaver(self):
-        return self.sendCommand('startScreensaver')
+        return self.sendCommand("startScreensaver")
 
     def stopScreensaver(self):
-        return self.sendCommand('stopScreensaver')
+        return self.sendCommand("stopScreensaver")
 
     def screenOn(self):
-        return self.sendCommand('screenOn')
+        return self.sendCommand("screenOn")
 
     def screenOff(self):
-        return self.sendCommand('screenOff')
+        return self.sendCommand("screenOff")
+
+    def setScreenBrightness(self, brightness):
+        return self.sendCommand(
+            "setStringSetting", key="screenBrightness", value=brightness
+        )
 
     def restartApp(self):
-        return self.sendCommand('restartApp')
+        return self.sendCommand("restartApp")
 
     def loadStartUrl(self):
-        return self.sendCommand('loadStartUrl')
+        return self.sendCommand("loadStartUrl")
 
     def loadUrl(self, url):
-        return self.sendCommand('loadUrl', url=url)
+        return self.sendCommand("loadUrl", url=url)
+
+    def playSound(self, url):
+        return self.sendCommand("playSound", url=url)
 
+    def stopSound(self)
+        return self.sendCommand("stopSound")