[Nym3-commit] r242 - trunk/nym3/Server

[laurent at conuropsis.org]

Author: laurent
Date: 2005-05-06 16:48:34 +0200 (Fri, 06 May 2005)
New Revision: 242

Modified:
   trunk/nym3/Server/User.py
Log:
Identation, bugfix in blobify and getSyn.


Modified: trunk/nym3/Server/User.py
===================================================================
--- trunk/nym3/Server/User.py	2005-05-06 14:30:29 UTC (rev 241)
+++ trunk/nym3/Server/User.py	2005-05-06 14:48:34 UTC (rev 242)
@@ -139,8 +139,6 @@
             self._abort = True
 
     def timecmp(self, a, b):
-	"""
-        """
 	return cmp(self.index[a]['time'], self.index[b]['time'])
 
     def quota(self):
@@ -178,12 +176,16 @@
 
     def blobify(self, l):
         """encrypts a set of synopses
-        l is a list of pair (mid,synopsis) """
+        l is a list of tuples (mid, status, synopsis) """
         s = ""
         m = []
-        for mid, syn in l:
-            m.append(mid)
-            s = s + mid + intToStrBE(len(syn), 2) + syn
+	print str(l)
+        for mid, status, syn in l:
+	    assert status == "clear"
+	    assert len(mid) == 1
+	    m = m + mid
+	    #print "mid = %s, status = %s, syn = %s\n" % (str(mid), str(status), str(syn))
+            s = s + mid[0] + intToStrBE(len(syn), 2) + syn
         return (m, 'encrypted', Crypto.nym_encrypt(s, self.encKey()))
 
     def getSyn(self, mid):
@@ -209,11 +211,11 @@
         the elements of the output are ordered by ascending
         order of arrival time"""
 	self.load_index()
-	midtime = self.index[mid]['time']
 
 	ret = []
-	if mid == oldestMid: ret = self.index.keys()
+	if mid == Mail.oldestMid: ret = self.index.keys()
 	else:
+	    midtime = self.index[mid]['time']
 	    for msg in self.index.keys():
 		if self.index[msg]['time'] >= midtime: ret.append(msg)
 	ret.sort(self.timecmp)
@@ -490,7 +492,7 @@
         by an encrypted blob. Initially the syn have to be in clear
         raise an error if it is not the case"""
         self.load_synbox()
-        self.syn[i:j] = [self.blobify(syn[i:j])]
+        self.syn[i:j] = [self.blobify(self.syn[i:j])]
 
     def encOldSyn(self):
 	"""Encrypt synopsis we had in clear for too long"""
@@ -527,13 +529,13 @@
             if (self.index[e]['status'] < mark):
                 self.index[e]['status'] = mark
         
-    def hasMail(self,mid):
+    def hasMail(self, mid):
 	"""Checks whether the server holds a mail for a given mid"""
-        self.load_index()
-        try:
-            return self.index[mid]['status'] != lifeCycle['deleted']
-        except:
-            return False
+	self.load_index()
+	try:
+	    return self.index[mid]['status'] != lifeCycle['deleted']
+	except:
+	    return False
         
     def sendList(self, num, after):
         """Returns a list of (ml, bf, synblob)