changeset 28:e1e015e0a805

Update testclient
author Lewin Bormann <lbo@spheniscida.de>
date Sat, 02 Mar 2019 14:26:23 +0100
parents fb8d786920ef
children 879ae3f7a4d9
files client/testclient.py server/server.py
diffstat 2 files changed, 8 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/client/testclient.py	Fri Mar 01 22:08:01 2019 +0000
+++ b/client/testclient.py	Sat Mar 02 14:26:23 2019 +0100
@@ -2,44 +2,29 @@
 
 import zmq
 
-from matplotlib import figure
-from matplotlib.backends import backend_cairo
-
 ctx = zmq.Context()
 sock = ctx.socket(zmq.SUB)
 sock.setsockopt(zmq.IPV6, 1)
-sock.connect('tcp://[::1]:9988')
+sock.connect('tcp://borgac.net:8080')
 sock.setsockopt_string(zmq.SUBSCRIBE, '')
 
 history = {}
 i = 0
 
-
-def draw_symbols():
-    for sym, hist in history.items():
-        fig = figure.Figure()
-        ax = fig.add_subplot(111)
-        ax.grid(True)
-        ax.set_xlim(0, len(hist))
-        ax.set_ybound(0, 100)
-        ax.plot([i for i in range(0, len(hist))], hist)
-        backend_cairo.FigureCanvas(fig).print_png('{}.png'.format(sym))
-
 while True:
     i += 1
     msg = sock.recv_json()
     msg.pop('_stockdata')
     for sym, val in sorted(msg.items()):
-        print(' {}: {:.2f}'.format(sym, val / 100.))
+        if 'price' not in val:
+            print('invalid item: ', val)
+        price = val['price']
+        print(' {}: {:.2f}'.format(sym, price / 100.))
         if sym in history:
-            history[sym].append(val/100.)
+            history[sym].append(price/100.)
             if len(history[sym]) > 500:
                 history[sym] = history[sym][1:]
         else:
-            history[sym] = [val/100.]
+            history[sym] = [price/100.]
     print('')
 
-    if i > 25:
-        draw_symbols()
-        i = 0
-
--- a/server/server.py	Fri Mar 01 22:08:01 2019 +0000
+++ b/server/server.py	Sat Mar 02 14:26:23 2019 +0100
@@ -195,6 +195,7 @@
 
                     custom_msg = msg.get('msg', '')
                     groupinfo = {'cash': custom_msg.get('cash', -1), 'value': custom_msg.get('value', -1)}
+
                     _groups.update(msg.get('group', None), msg.get('user', None), groupinfo)
                     resp = {'_stockresp': True, 'ok': True, 'groupinfo': _groups.get(msg.get('group'))}
                     sock.send_multipart([msgs[0], msgs[1], bytes(json.dumps(resp), 'utf-8')])