Merge pull request #73 from tchellomello/dev

version 1.1.9

Author: tchellomello

Diff for: configure.ac

@@ -10,7 +10,7 @@
 # GNU General Public License for more details.
 define([VERSION_MAJOR], [1])
 define([VERSION_MINOR], [1])
-define([VERSION_FIX], [8])
+define([VERSION_FIX], [9])
 define([VERSION_NUMBER], VERSION_MAJOR[.]VERSION_MINOR[.]VERSION_FIX)
 define([VERSION_SUFFIX], [_master])
 

Diff for: python-amcrest.spec.in

@@ -165,8 +165,12 @@ make check-local
 %{_sysconfdir}/profile.d/amcrest-cli-autocomplete.sh
 
 %changelog
+* Sun Apr 16 2017 Marcelo Moreira de Mello <[email protected]> 1.1-9
+- Added support to new Amcrest firmware V2.400.AC01.15.R.20170328 <[email protected]>
+- Added support to new Amcrest firmware V2.420.AC00.17.R.20170322 <[email protected]>
+
 * Sat Apr 08 2017 Marcelo Moreira de Mello <[email protected]> 1.1-8
-* Added storage_used_percent function
+- Added storage_used_percent function
 
 * Tue Mar 28 2017  Marcelo Moreira de Mello <[email protected]> 1.1-5
 - Introduced unittests

Diff for: src/amcrest/event.py

@@ -142,8 +142,7 @@ def is_motion_detected(self):
         event = self.event_channels_happened('VideoMotion')
         if 'channels' not in event:
             return False
-        else:
-            return True
+        return True
 
     @property
     def event_management(self):

Diff for: src/amcrest/http.py

@@ -62,7 +62,17 @@ def __init__(self, host, port, user,
         else:
             self._retries_conn = retries_connection
 
-        self._set_name()
+        try:
+            self._set_name()
+        except requests.exceptions.HTTPError as error:
+            # newer firmware requires digest auth
+            # let's try that if we are still unauthorized
+            if error.response.status_code == 401:
+                self._token = requests.auth.HTTPDigestAuth(self._user,
+                                                           self._password)
+                self._set_name()
+            else:
+                raise
 
     def _set_name(self):
         """Set device name."""

Diff for: src/amcrest/storage.py

@@ -32,6 +32,8 @@ def storage_device_names(self):
     @property
     def storage_used(self, dev='/dev/mmc0', unit='GB'):
         ret = self.storage_device_info
+
+        # pylint: disable=fixme
         # TODO
         # Use regex to enhance the filter
         status = [s for s in ret.split() if '.UsedBytes=' in s][0]
@@ -40,6 +42,8 @@ def storage_used(self, dev='/dev/mmc0', unit='GB'):
     @property
     def storage_total(self, dev='/dev/mmc0', unit='GB'):
         ret = self.storage_device_info
+
+        # pylint: disable=fixme
         # TODO
         # Use regex to enhance the filter
         status = [s for s in ret.split() if '.TotalBytes=' in s][0]

Diff for: src/amcrest/system.py

@@ -66,7 +66,11 @@ def software_information(self):
         ret = self.command(
             'magicBox.cgi?action=getSoftwareVersion'
         )
-        version, build_date = ret.content.decode('utf-8').split()
+        swinfo = ret.content.decode('utf-8')
+        if ',' in swinfo:
+            version, build_date = swinfo.split(',')
+        else:
+            version, build_date = swinfo.split()
         return (version, build_date)
 
     @property