From bd0d6bfbccf5fffa03ed796f40e2208f2ddd7e02 Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@humbughq.com>
Date: Thu, 6 Sep 2012 16:10:48 -0400
Subject: [PATCH] Improve zephyr-mirror.py.

(imported from commit 555c145af844485289a85c664717dc609b9a5234)
---
 zephyr/zephyr-mirror.py | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/zephyr/zephyr-mirror.py b/zephyr/zephyr-mirror.py
index 32f6c098ef..35a152ca76 100644
--- a/zephyr/zephyr-mirror.py
+++ b/zephyr/zephyr-mirror.py
@@ -31,19 +31,27 @@ def browser_login(br):
 
 # example: send_zephyr("Verona", "Auto2", "test")
 def send_zephyr(sender, klass, instance, content):
-    br = mechanize.Browser()
-    hack_content = "Message from MIT Zephyr sender %s\n" % (sender,) + content
-    csrf = browser_login(br)
     br.addheaders.append(('X-CSRFToken', csrf))
-    zephyr_data = urllib.urlencode([('type', 'class'), ('class', klass),
-                                    ('instance', instance), ('new_zephyr', hack_content)])
-    br.open("https://app.humbughq.com/zephyr/", zephyr_data)
+    zephyr_data = urllib.urlencode([('type', 'class'), ('class', klass), ('sender', sender),
+                                    ('instance', instance), ('new_zephyr', content)])
+    br.open("https://app.humbughq.com/forge_zephyr/", zephyr_data)
+
+br = mechanize.Browser()
+csrf = browser_login(br)
 
 import zephyr
 subs = zephyr.Subscriptions()
-subs.add(('tabbott-test2', '*', '*'))
+subs_list = """\
+"""
 
+print subs_list
+for sub in subs_list.split():
+    subs.add((sub, '*', '*'))
+
+print "Starting receive loop"
 while True:
     notice = zephyr.receive(block=True)
     [zsig, body] = notice.message.split("\x00")
+    sys.stdout.write("received a message on %s from %s..." % (notice.cls, notice.sender))
     send_zephyr(notice.sender, notice.cls, notice.instance, body)
+    print "forwarded"