[Nym3-commit] r230 - trunk/nym3/Client

[jr at conuropsis.org]

Author: jr
Date: 2005-05-04 12:47:41 +0200 (Wed, 04 May 2005)
New Revision: 230

Modified:
   trunk/nym3/Client/Main.py
Log:
complete list-syn : availability of the associated message


Modified: trunk/nym3/Client/Main.py
===================================================================
--- trunk/nym3/Client/Main.py	2005-05-04 10:32:51 UTC (rev 229)
+++ trunk/nym3/Client/Main.py	2005-05-04 10:47:41 UTC (rev 230)
@@ -351,6 +351,7 @@
     secring = decode_secring(config, ui)
     index = 1
     for (midlist, bf, enc_synset) in synbox:
+	bflist = Mail.bf2list(bf)
 	synset = decipher_string(enc_synset, secring, account['encKeys'])
 	if synset == None:
 	    ui.display("unable to decipher a synopses blob, lost keys?")
@@ -358,12 +359,16 @@
 	    #TODO if yes remove the following line
 	    index += len(midlist)
 	else:
-	    for mid in midlist:
+	    for i, mid in enumerate(midlist):
 		synlen = Message.strToIntBE(synset[20: 22])
 		syn = synset[22: 22 + synlen]
 		synset = synset[22 + synlen:]
-		#TODO determine the availability of the message (mbox or server)
-		avail = ""
+		if mbox.has_key(mid):
+		    avail = "email available"
+		else if i in bflist:
+		    avail = "email available on server"
+		else:
+		    avail = "email not available"
 		ui.display("%d %s %s" % (index, binascii.hexlify(mid), avail))
 		ui.display(Mail.syn_summary(syn))
 		index += 1