Merge branch 'master' of github.com:/krebscode/cholerab

1 files changed, 34 insertions, 8 deletions

diff --git a/cholerab/cholerab-live/cholerab.py b/cholerab/cholerab-live/cholerab.py
index 4739d9cf..eb9e66df 100644..100755
--- a/cholerab/cholerab-live/cholerab.py
+++ b/cholerab/cholerab-live/cholerab.py
@@ -1,10 +1,36 @@
+#!/usr/bin/python2
+# -*- coding: utf-8 -*-
+import curses,time
 from view import CursesView
+from chol_net import CholerabMulicastNet
+import logging
+logging.basicConfig(filename='here.log',level=logging.DEBUG)
+log = logging.getLogger('main')
+class Cholerab:
+  def __init__(self):
+    self.view = CursesView(cholerab=self)
+    self.transport = CholerabMulicastNet(cholerab=self)
+  def send_char(self,x,y,char):
+    log.info("Sending %s at (%d,%d) to connected peers" %(char,x,y))
+    self.transport.send_char(x,y,char)
 
-a = CursesView()
-a.start()
-a.write_char(5,5,'p')
-a.write_char(6,5,'e')
-a.write_char(7,5,'n')
-a.write_char(8,5,'i')
-a.write_char(9,5,'s')
-a.join()
+  def write_char(self,x,y,char):
+    log.info("Writing %s at (%d,%d) to view" %(char,x,y))
+    self.view.write_char(x,y,char,user=2)
+  def stop(self):
+    self.view.stop()
+    self.transport.stop()
+  def main(self):
+    self.view.start()
+    self.transport.start()
+    self.view.join()
+    #after view dies, kill the transport as well
+    self.transport.stop() 
+    self.transport.join()
+def main():
+  log.debug('started main')
+  chol = Cholerab()
+  chol.main()
+
+if __name__ == "__main__":
+  main()