Merge pull request #17 from fwestenberg/v0013

Version fix and stream values

Author: fwestenberg

reolink/camera_api.py

@@ -18,10 +18,20 @@
 _LOGGER = logging.getLogger(__name__)
 
 
-class Api: #pylint: disable=too-many-instance-attributes disable=too-many-public-methods
+class Api:  # pylint: disable=too-many-instance-attributes disable=too-many-public-methods
     """Reolink API class."""
 
-    def __init__(self, host, port, username, password, channel=DEFAULT_CHANNEL, timeout=DEFAULT_TIMEOUT):
+    def __init__(
+        self,
+        host,
+        port,
+        username,
+        password,
+        channel=DEFAULT_CHANNEL,
+        protocol=DEFAULT_PROTOCOL,
+        stream=DEFAULT_STREAM,
+        timeout=DEFAULT_TIMEOUT,
+    ):
         """Initialize the API class."""
         self._url = f"http://{host}:{port}/cgi-bin/api.cgi"
         self._host = host
@@ -115,7 +125,7 @@ def model(self):
     def manufacturer(self):
         """Return the manufacturer name (Reolink)."""
         return MANUFACTURER
-    
+
     @property
     def channels(self):
         """Return the number of channels."""
@@ -294,7 +304,9 @@ async def get_states(self, cmd_list=None):
             await self.map_json_response(json_data)
             return True
         except (TypeError, json.JSONDecodeError):
-            _LOGGER.debug("Host: %s: Error translating Reolink state response", self._host)
+            _LOGGER.debug(
+                "Host: %s: Error translating Reolink state response", self._host
+            )
             await self.clear_token()
             return False
 
@@ -322,7 +334,9 @@ async def get_settings(self):
             await self.map_json_response(json_data)
             return True
         except (TypeError, json.JSONDecodeError):
-            _LOGGER.debug("Host %s: Error translating Reolink settings response", self._host)
+            _LOGGER.debug(
+                "Host %s: Error translating Reolink settings response", self._host
+            )
             await self.clear_token()
             return False
 
@@ -339,8 +353,7 @@ async def get_motion_state(self):
 
             if json_data is None:
                 _LOGGER.error(
-                    "Unable to get Motion detection state at IP %s",
-                    self._host
+                    "Unable to get Motion detection state at IP %s", self._host
                 )
                 self._motion_state = False
                 return self._motion_state
@@ -357,7 +370,7 @@ async def get_still_image(self):
         param = {"cmd": "Snap", "channel": self._channel}
 
         response = await self.send(None, param)
-        if response is None or response == b'':
+        if response is None or response == b"":
             return
 
         return response
@@ -375,12 +388,12 @@ async def get_stream_source(self):
             stream_source = f"rtmp://{self._host}:{self._rtmp_port}/bcs/channel{self._channel}_{self._stream}.bcs?channel={self._channel}&stream=0&token={self._token}"
         else:
             password = parse.quote(self._password)
-            channel = "{:02d}".format(self._channel+1)
-            stream_source = f"rtsp://{self._username}{password}@{self._host}:{self._rtsp_port}/h264Preview_{channel}_{self._stream}"
+            channel = "{:02d}".format(self._channel + 1)
+            stream_source = f"rtsp://{self._username}:{password}@{self._host}:{self._rtsp_port}/h264Preview_{channel}_{self._stream}"
 
         return stream_source
 
-    async def map_json_response(self, json_data): #pylint: disable=too-many-branches
+    async def map_json_response(self, json_data):  # pylint: disable=too-many-branches
         """Map the JSON objects to internal objects and store for later use."""
         for data in json_data:
             try:
@@ -462,7 +475,7 @@ async def map_json_response(self, json_data): #pylint: disable=too-many-branches
                 elif data["cmd"] == "GetAbility":
                     for ability in data["value"]["Ability"]["abilityChn"]:
                         self._ptz_support = ability["ptzCtrl"]["permit"] != 0
-            except: #pylint: disable=bare-except
+            except:  # pylint: disable=bare-except
                 continue
 
     async def login(self):
@@ -472,15 +485,20 @@ async def login(self):
 
         _LOGGER.debug(
             "Reolink camera with host %s:%s trying to login with user %s",
-            self._host, self._port, self._username
+            self._host,
+            self._port,
+            self._username,
         )
 
         body = [
             {
                 "cmd": "Login",
                 "action": 0,
                 "param": {
-                    "User": {"userName": self._username, "password": self._password[:31]}
+                    "User": {
+                        "userName": self._username,
+                        "password": self._password[:31],
+                    }
                 },
             }
         ]
@@ -494,7 +512,9 @@ async def login(self):
             json_data = json.loads(response)
             _LOGGER.debug("Get response from %s: %s", self._host, json_data)
         except (TypeError, json.JSONDecodeError):
-            _LOGGER.debug("Host %s: Error translating login response to json", self._host)
+            _LOGGER.debug(
+                "Host %s: Error translating login response to json", self._host
+            )
             return False
 
         if json_data is not None:
@@ -505,7 +525,9 @@ async def login(self):
 
                 _LOGGER.debug(
                     "Reolink camera logged in at IP %s. Leasetime %s, token %s",
-                    self._host, self._lease_time.strftime('%d-%m-%Y %H:%M'), self._token
+                    self._host,
+                    self._lease_time.strftime("%d-%m-%Y %H:%M"),
+                    self._token,
                 )
                 return True
 
@@ -519,13 +541,15 @@ async def is_admin(self):
                 if user["level"] == "admin":
                     _LOGGER.debug(
                         "User %s has authorisation level %s",
-                        self._username, user['level']
+                        self._username,
+                        user["level"],
                     )
                 else:
                     _LOGGER.warning(
                         """User %s has authorisation level %s. Only admin users can change
                         camera settings! Switches will not work.""",
-                        self._username, user['level']
+                        self._username,
+                        user["level"],
                     )
 
     async def logout(self):
@@ -691,15 +715,13 @@ async def set_sensitivity(self, value: int, preset=None):
             {
                 "cmd": "SetAlarm",
                 "action": 1,
-                "param": {	
+                "param": {
                     "Alarm": {
                         "channel": 0,
                         "type": "md",
-                        "sens": 
-                            self._alarm_settings["value"]["Alarm"]["sens"],
-                        
+                        "sens": self._alarm_settings["value"]["Alarm"]["sens"],
                     }
-                }
+                },
             }
         ]
         for setting in body[0]["param"]["Alarm"]["sens"]:
@@ -709,7 +731,7 @@ async def set_sensitivity(self, value: int, preset=None):
         return await self.send_setting(body)
 
     async def set_ptz_command(self, command, preset=None, speed=None):
-        '''Send PTZ command to the camera.
+        """Send PTZ command to the camera.
 
         List of possible commands
         --------------------------
@@ -730,7 +752,7 @@ async def set_ptz_command(self, command, preset=None, speed=None):
         ToPos       X       X
         Auto
         Stop
-        '''
+        """
 
         body = [
             {
@@ -750,8 +772,7 @@ async def send_setting(self, body):
         """Send a setting."""
         command = body[0]["cmd"]
         _LOGGER.debug(
-            "Sending command: %s to: %s with body: %s",
-            command, self._host, body
+            "Sending command: %s to: %s with body: %s", command, self._host, body
         )
         response = await self.send(body, {"cmd": command})
         if response is None:
@@ -768,10 +789,16 @@ async def send_setting(self, body):
 
             return False
         except (TypeError, json.JSONDecodeError):
-            _LOGGER.debug("Host %s: Error translating %s response to json", self._host, command)
+            _LOGGER.debug(
+                "Host %s: Error translating %s response to json", self._host, command
+            )
             return False
         except KeyError:
-            _LOGGER.debug("Host %s: Received an unexpected response while sending command: %s", self._host, command)
+            _LOGGER.debug(
+                "Host %s: Received an unexpected response while sending command: %s",
+                self._host,
+                command,
+            )
             return False
 
     async def send(self, body, param=None):
@@ -781,7 +808,7 @@ async def send(self, body, param=None):
                 return False
 
         if not param:
-            param={}
+            param = {}
         if self._token is not None:
             param["token"] = self._token
 
@@ -799,9 +826,12 @@ async def send(self, body, param=None):
                         return json_data
 
         except aiohttp.ClientConnectorError as conn_err:
-            _LOGGER.debug('Host %s: Connection error %s', self._host, str(conn_err))
+            _LOGGER.debug("Host %s: Connection error %s", self._host, str(conn_err))
         except asyncio.TimeoutError:
-            _LOGGER.debug('Host %s: connection timeout exception. Please check the connection to this camera.', self._host)
-        except: #pylint: disable=bare-except
-            _LOGGER.debug('Host %s: Unknown exception occurred.', self._host)
+            _LOGGER.debug(
+                "Host %s: connection timeout exception. Please check the connection to this camera.",
+                self._host,
+            )
+        except:  # pylint: disable=bare-except
+            _LOGGER.debug("Host %s: Unknown exception occurred.", self._host)
         return

setup.py

@@ -2,13 +2,13 @@
 setup(
   name = 'reolink',
   packages = ['reolink'],
-  version = '0.0.12',
+  version = '0.0.13',
   license='MIT',
   description = 'Reolink camera package',
   author = 'fwestenberg',
   author_email = '',
   url = 'https://github.com/fwestenberg/reolink',
-  download_url = 'https://github.com/fwestenberg/reolink/archive/v_011.tar.gz',
+  download_url = 'https://github.com/fwestenberg/reolink/archive/v_013.tar.gz',
   keywords = ['Reolink', 'Home-Assistant'],
   install_requires=[
           'ffmpeg',