[Nym3-commit] r91 - trunk

[nym3-devel@lists.noreply.org]

Author: jr
Date: 2004-08-05 14:43:53 +0200 (Thu, 05 Aug 2004)
New Revision: 91

Modified:
   trunk/Main.py
   trunk/User.py
Log:
- add markMid(User.py)
- use markMid correctly(Main.py)


Modified: trunk/Main.py
===================================================================
--- trunk/Main.py	2004-08-05 12:30:31 UTC (rev 90)
+++ trunk/Main.py	2004-08-05 12:43:53 UTC (rev 91)
@@ -125,15 +125,18 @@
                         pass
                     elif (com.ct() == 5):
                         msgList = []
+                        sendList = []
                         for m in com.l:
                             if nymUser.hasMail(m):
                                 msgCom = Msg()
                                 msgCom.fromData(m,nymUser.getMail(m))
                                 msgList.append(msgCom)
+                                sendList.append(m)
                         ec = nymUser.sendMessage(Message.buildMessage(msgList))
                         if (ec == 0):
                             #TODO acquitte le message
-                            nymUser.markMid(com.l)
+                            nymUser.markMid(sendList,'sent-in-full')
+                            
                         else:
                             print "mixminion exited abnormally with error code %d" % ec
                             sys.exit(2)

Modified: trunk/User.py
===================================================================
--- trunk/User.py	2004-08-05 12:30:31 UTC (rev 90)
+++ trunk/User.py	2004-08-05 12:43:53 UTC (rev 91)
@@ -340,10 +340,16 @@
         self.load_synbox()
         self.syn[i:j] = [self.blobify(syn[i:j])]
 
+    def markMid(self,l,mark):
+        self.load_index()
+        for e in l:
+            self.index[e]['status'] = mark
+        
+
     def hasMail(self,mid):
         self.load_index()
         try:
-            return self.idx[mid]['status'] != 'deleted' 
+            return self.index[mid]['status'] != 'deleted' 
         except:
             return False