Merge branch 'master' of github.com:uroni/urbackup-server-python-web-api-wrapper

test/urbackup_api_test.py

@@ -16,6 +16,10 @@ for line in computernames:
         
 
 clients = server.get_status()
+usage = server.get_usage()
+
+if len(clients) != len(usage):
+    print("Failed to retreive usage or status information. Length of both lists is different.")
 
 # Uncomment to format time differently
 # locale.setlocale(locale.LC_TIME, "german")
@@ -40,6 +44,9 @@ for client in clients:
 #    print("Failed to start file backup")
     
 
+if not server.get_livelog():
+    print("Failed to get livelog contents"
+
 settings = server.get_client_settings("Johnwin7test-PC2")
 
 for key in settings:
@@ -62,4 +69,4 @@ for key in settings:
 if server.set_global_setting("max_image_incr", "40"):
     print("Changed global setting successfully")
 else:
-    print("Failed to change global setting")
+    print("Failed to change global setting")

urbackup_api/__init__.py

@@ -28,6 +28,8 @@ class urbackup_server:
     _session=""
     
     _logged_in = False
+
+    _lastlogid = 0
     
     def _get_response(self, action, params, method="POST"):
                 
@@ -339,6 +341,36 @@ class urbackup_server:
         
         return status["status"]
     
+    def get_livelog(self, clientid = 0):
+        if not self.login():
+            return None
+
+        log = self._get_json("livelog", {"clientid": clientid, "lastid": self._lastlogid})
+
+        if not log:
+            return None
+
+        if not "logdata" in log:
+            return None
+
+        self._lastlogid = log["logdata"][-1]['id']
+
+        return log["logdata"]
+      
+    def get_usage(self):
+        if not self.login():
+            return None
+
+        usage = self._get_json("usage")
+
+        if not usage:
+            return None
+
+        if not "usage" in usage:
+            return None
+
+        return usage["usage"]
+
     def get_extra_clients(self):
         if not self.login():
             return None