X-Git-Url: http://gitweb.pimeys.fr/?a=blobdiff_plain;f=client.py;h=65b9d4163e917dcfb76523fec402fac2dc605ffc;hb=6c63501246793b99eb7f632b23bdc217bd497dff;hp=de8c71cfc4ceaf487874736f5629c30f7359d6f3;hpb=d621c5224a44dc20bc2aaf661954fd1df65dd147;p=NK2015_Client_Python_Alpha.git

diff --git a/client.py b/client.py
index de8c71c..65b9d41 100755
--- a/client.py
+++ b/client.py
@@ -45,36 +45,36 @@ def checkidentity(a):
 
 def hello(socket,version):
     socket.send('hello "%s"'%(version))
-    return json.loads(a.read())
+    return lit(a)
 
 def login(socket,user,mdp="",typ="bdd"):
     if user in ["20-100","moibdd"]:
-        a.write('login ["20-100","mdp","bdd"]')
+        a.write('login ["20-100","plop","bdd",[["all"],["all"],true]]')
     elif user in ["vincent","moi"]:
-        a.write('login ["vincent","mdp","special"]')
+        a.write('login ["vincent","plop","special",["all"]]')
+    elif user in ["toto"]:
+        a.write('login ["toto","plop","bdd",[["all"],["all"],true]]')
     else:
         a.write('login ["%s","%s","%s"]'%(user,mdp,typ))
-    return json.loads(a.read())
+    return lit(a)
     
 def search(socket,term):
     a.write("search %s"%(term))
     return json.loads(a.read())
 
-def lit(socket,noprint=False):
+def lit(socket):
     try:
-        t=a.read()
-        if noprint:
-            return json.loads(t)
+        t=a.read(4096)
+        obj=json.loads(t)
+        if obj["retcode"]==0:
+          return obj['msg']
         else:
-            obj=json.loads(t)
-            if type(obj)==unicode:
-              print obj
-            else:
-              pprint(obj)
+          print obj["errmsg"]
+          return obj["msg"]
     except ssl.SSLError:
-        print "Rien à lire"
+        return "Rien à lire"
     except ValueError:
-        print "Serveur mort ?"
+        return "Serveur mort ?"
 
 def challenge(a):
     _,pub=monRSA.litcles(None,client_config.server_rsa_pub_key)
@@ -93,11 +93,13 @@ def challenge(a):
         print "Imposteur !"
     
 if __name__=="__main__":
+    where=raw_input("quel serveur ?")
     #port=int(raw_input("port ? "))
     a=socket.socket()
-    a=connect(a,"cerebro")
+    a=connect(a,where)
     a.settimeout(2)
     #checkidentity(a)
     print hello(a,"Python Client alpha")
-    print login(a,"20-100","mdp")
+    print login(a,"20-100","plop")
     print "Socket créée dans la variable \"a\""
+