From ded6736e1b23f4d83b8c6d87d8ac6f90e321d100 Mon Sep 17 00:00:00 2001
From: merlink <merlink@gmx.de>
Date: Sun, 1 Sep 2013 22:34:20 +0200
Subject: [PATCH] Added more infos to ClientStatus

---
 src/class_api.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/class_api.py b/src/class_api.py
index 8137a1ea..d19a407b 100644
--- a/src/class_api.py
+++ b/src/class_api.py
@@ -411,7 +411,20 @@ def getAPI(workingdir=None,silent=False):
             return data
             
         def clientStatus(self):
-            return {"networkConnections" : len(bitmessagemain.shared.connectedHostsList)}
+            if len(bitmessagemain.shared.connectedHostsList) == 0:
+                networkStatus = 'notConnected'
+            elif len(bitmessagemain.shared.connectedHostsList) > 0 and not bitmessagemain.shared.clientHasReceivedIncomingConnections:
+                networkStatus = 'connectedButHaveNotReceivedIncomingConnections'
+            else:
+                networkStatus = 'connectedAndReceivingIncomingConnections'
+            
+            info = {}
+            info['networkConnections'] = len(bitmessagemain.shared.connectedHostsList)
+            info['numberOfMessagesProcessed'] = bitmessagemain.shared.numberOfMessagesProcessed
+            info['numberOfBroadcastsProcessed'] = bitmessagemain.shared.numberOfBroadcastsProcessed
+            info['numberOfPubkeysProcessed'] = bitmessagemain.shared.numberOfPubkeysProcessed
+            info['networkStatus'] = networkStatus
+            return info
 
         def listContacts(self):