From d6e4649477f30b7070ee7e95864b5b23da1a8d87 Mon Sep 17 00:00:00 2001 From: Martin Schanzenbach Date: Sat, 24 Mar 2012 12:35:30 +0000 Subject: [PATCH] -add zkey shortening --- src/gns/proxy/proxy.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/gns/proxy/proxy.py b/src/gns/proxy/proxy.py index e2c0a5baf..2807fafee 100644 --- a/src/gns/proxy/proxy.py +++ b/src/gns/proxy/proxy.py @@ -82,6 +82,9 @@ class ProxyHandler (BaseHTTPServer.BaseHTTPRequestHandler): soc.close() self.connection.close() + def shorten_zkey(self): + return lambda mo: 'a href="http://'+os.popen("gnunet-gns -s"+string.replace(mo.group(1), 'a href="http://', "")).readlines()[0].split(" ")[-1].rstrip() + def replace_and_shorten(self, to_repl): return lambda mo: 'a href="http://'+os.popen("gnunet-gns -s "+string.replace(mo.group(1)+to_repl, 'a href="http://', "")).readlines()[0].split(" ")[-1].rstrip() #full = string.replace(mo.group(1)+to_repl, 'a href="http://', "") @@ -135,11 +138,13 @@ class ProxyHandler (BaseHTTPServer.BaseHTTPRequestHandler): out = soc data = i.recv(8192) if data: - if (re.match("(\w+\.)*gnunet", self.host_port[0]) or 1): + if (re.match("(\w+\.)*gnunet", self.host_port[0])): arr = self.host_port[0].split('.') arr.pop(0) data = re.sub('(a href="http://(\w+\.)*)(\+)', self.replace_and_shorten(to_repl), data) + data = re.sub('(a href="http://(\w+\.)*zkey)', + self.shorten_zkey(), data) #print data out.send(data) count = 0 -- 2.25.1