Fix in gettiong devicelist.

Author: iCarrot0605

README.md

@@ -38,9 +38,9 @@ create `settings.json` file, and fill token and secret.
 Run example script.
 
 ```python
-from switchbot_utility.switchbot import Switchbot
+import switchbot_utility.switchbot as sbu
 
-switchbot = Switchbot()
+switchbot = sbu.Switchbot()
 switchbot.devicelist()
 ```
 
@@ -51,18 +51,18 @@ Scripts makes `deviceList.txt`. You can manipulate device using diviceId in this
 ### Get temperature from SwitchbotMeter
 
 ```python
-from switchbot_utility.switchbot_meter import SwitchbotMeter
+import switchbot_utility as sbu
 
-meter = SwitchbotMeter("meterDeviceId")
+meter = sbu.SwitchbotMeter("meterDeviceId")
 print(meter.get_temperature())
 ```
 
 ### Unlock SwitchbotLock
 
 ```python
-from switchbot_utility.switchbot_lock import SwitchbotLock
+import switchbot_utility as sbu
 
-lock = SwitchbotLock("lockDeviceId")
+lock = sbu.SwitchbotLock("lockDeviceId")
 lock.unlock()
 ```
 

src/switchbot_utility/battery_mixin.py

@@ -1,4 +1,5 @@
 class BatteryMixin:
+    """Switchbot battery mixin"""
     def get_battery(self):
         """Returns battery level"""
         status = self.get_status()

src/switchbot_utility/command_mixin.py

@@ -1,6 +1,8 @@
 import json
+import sys
 
 import requests
+from requests.exceptions import Timeout
 
 
 class CommandMixin:
@@ -11,8 +13,12 @@ def command(self, deviceId: str, body: dict):
         """Send command"""
 
         header = self.gen_sign()
-        return requests.post(
-            self._baseurl + deviceId + "/commands",
-            headers=header,
-            data=json.dumps(body),
-        )
+        try:
+            return requests.post(
+                self._baseurl + deviceId + "/commands",
+                headers=header,
+                data=json.dumps(body),
+                timeout=(3.0, 7.5)
+            )
+        except Timeout:
+            sys.exit("Timeout")

src/switchbot_utility/switchbot.py

@@ -7,19 +7,19 @@
 import uuid
 
 import requests
+from requests.exceptions import Timeout
 
 
 class Switchbot:
     """Switchbot Utility class"""
 
     def __init__(self):
         """Constructor"""
-        pass
 
     def read_token(self) -> tuple:
         """Import access token and secret from settings.json"""
         try:
-            with open("settings.json", "r") as f:
+            with open("settings.json", "r", encoding="utf8") as f:
                 settings = json.load(f)
             token = settings["token"]
             secret = settings["secret"]
@@ -61,33 +61,64 @@ def gen_sign(self) -> dict:
     def devicelist(self) -> None:
         """Create all Switchbot device list as deviceList.txt"""
         header = self.gen_sign()
-        response = requests.get(
-            "https://api.switch-bot.com/v1.1/devices", headers=header
-        )
+        try:
+            response = requests.get(
+                "https://api.switch-bot.com/v1.1/devices", headers=header,
+                timeout=(3.0, 7.5)
+            )
+        except Timeout:
+            sys.exit("Timeout")
+
         devices = json.loads(response.text)
 
         with open("deviceList.txt", "w", encoding="utf-8", newline="\n") as f:
-            try:
-                for device in devices["body"]["deviceList"]:
+            for device in devices["body"]["deviceList"]:
+                try:
                     f.write(device["deviceId"] + ", ")
+                except KeyError:
+                    f.write(", ")
+                try:
                     f.write(device["deviceName"] + ", ")
+                except KeyError:
+                    f.write(", ")
+                try:
                     f.write(device["deviceType"] + ", ")
+                except KeyError:
+                    f.write(", ")
+                try:
                     f.write(device["hubDeviceId"] + "\n")
+                except KeyError:
+                    f.write("\n")
 
-                for device in devices["body"]["infraredRemoteList"]:
+            for device in devices["body"]["infraredRemoteList"]:
+                try:
                     f.write(device["deviceId"] + ", ")
+                except KeyError:
+                    f.write(", ")
+                try:
                     f.write(device["deviceName"] + ", ")
+                except KeyError:
+                    f.write(", ")
+                try:
                     f.write(device["remoteType"] + ", ")
+                except KeyError:
+                    f.write(", ")
+                try:
                     f.write(device["hubDeviceId"] + "\n")
-            except KeyError:
-                sys.exit("Something wrong")
+                except KeyError:
+                    f.write("\n")
 
     def get_scene_list(self) -> None:
         """Get scene List as sceneList.txt"""
         header = self.gen_sign()
-        response = requests.get(
-            "https://api.switch-bot.com/v1.1/scenes", headers=header
-        )
+        try:
+            response = requests.get(
+                "https://api.switch-bot.com/v1.1/scenes", headers=header,
+                timeout=(3.0, 7.5),
+            )
+        except Timeout:
+            sys.exit("Timeout")
+
         scenes = json.loads(response.text)
 
         if scenes["message"] != "success":
@@ -104,5 +135,10 @@ def scene_execute(self, sceneId: str) -> str:
         """Execute scene"""
         header = self.gen_sign()
         url = "https://api.switch-bot.com/v1.1/scenes/" + sceneId + "/execute"
-        response = requests.post(url=url, headers=header)
+        try:
+            response = requests.post(url=url, headers=header,
+                                     timeout=(3.0, 7.5))
+        except Timeout:
+            sys.exit("Timeout")
+
         return response.text

src/switchbot_utility/switchbot_blind_tilt.py

@@ -5,10 +5,6 @@
 class SwitchbotBlindTilt(SwitchbotDevice, OnOffMixin):
     """Switchbot Blind Tilt class"""
 
-    def __init(self, deviceId):
-        """Constructor"""
-        super().__init__(deviceId)
-
     def set_position(self, direction: str, position: int) -> str:
         """Set blind position.
 

src/switchbot_utility/switchbot_bot.py

@@ -6,10 +6,6 @@
 class SwitchbotBot(SwitchbotDevice, OnOffMixin, BatteryMixin):
     """Switchbot bot class"""
 
-    def __init__(self, deviceId):
-        """Constructor"""
-        super().__init__(deviceId)
-
     def get_power(self) -> dict:
         """Returns ON/OFF state"""
         status = self.get_status()

src/switchbot_utility/switchbot_ceiling_light.py

@@ -4,13 +4,8 @@
 class SwitchbotCeilingLight(SwitchbotColorBulb):
     """Switchbot Ceiling Light class"""
 
-    def __init__(self, deviceId):
-        """Constructor"""
-        super().__init__(deviceId)
-
     def set_color(self, r, g, b):
         """Do nothing"""
-        pass
 
     def get_power(self):
         """Returns ON/OFF state"""

src/switchbot_utility/switchbot_ceiling_light_pro.py

@@ -3,7 +3,3 @@
 
 class SwithbotCeilingLightPro(SwitchbotCeilingLight):
     """Switchbot Ceiling Light class"""
-
-    def __init__(self, deviceId):
-        """Constructor"""
-        super().__init__(deviceId)

src/switchbot_utility/switchbot_color_bulb.py

@@ -2,10 +2,7 @@
 
 
 class SwitchbotColorBulb(SwitchbotStripLight):
-    """Constructor"""
-
-    def __init__(self, deviceId):
-        super().__init__(deviceId)
+    """Switchbot Color Bulb class"""
 
     def set_color_temperature(self, temperature: int) -> str:
         """Set color temperature"""

src/switchbot_utility/switchbot_contact_sensor.py

@@ -4,10 +4,6 @@
 class SwitchbotContactSensor(SwitchbotMotionSensor):
     """Switchbot Contact Sensor class"""
 
-    def __init__(self, deviceId):
-        """Constructor"""
-        super().__init__(deviceId)
-
     def get_open_state(self) -> dict:
         """Returns the open state of the sensor"""
         status = self.get_status()