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

[jr at conuropsis.org]

Author: jr
Date: 2005-05-04 12:14:18 +0200 (Wed, 04 May 2005)
New Revision: 228

Modified:
   trunk/nym3/Client/Account.py
Log:
Client.Account.mbox is a hash + _load_* is lazy


Modified: trunk/nym3/Client/Account.py
===================================================================
--- trunk/nym3/Client/Account.py	2005-05-03 14:28:54 UTC (rev 227)
+++ trunk/nym3/Client/Account.py	2005-05-04 10:14:18 UTC (rev 228)
@@ -173,7 +173,7 @@
 	    self.data_status = 'dirty'
 	    self.journal = {}
 	    self.journal_status = 'dirty'
-	    self.mbox = []
+	    self.mbox = {}
 	    self.mbox_status = 'dirty'
 	    self.synbox = []
 	    self.synbox_status = 'dirty'
@@ -360,7 +360,7 @@
 	    self.mbox = pickle.load(f)
 	    f.close()
 	except IOError:
-	    self.mbox = {} # ?
+	    self.mbox = {}
 	self.mbox_status = 'ok'
 
     def _load_data(self):
@@ -410,15 +410,14 @@
 	return copy.deepcopy(self.mbox)
 
     def add_synset(self, midlist, bf, synset):
-	if self.synbox_status == 'unloaded': self._load_synbox()
+	self._load_synbox()
 	t = (midlist, bf, synset)
 	self.synbox.append(t)
 	self.synbox_status = "dirty"
 
     def add_msg(self, mid, msg):
-	if self.mbox_status == 'unloaded': self._load_mbox()
-	t = (mid, msg)
-	self.mbox.append(t)
+	self._load_mbox()
+	self.mbox[mid] = msg
 	self.mbox_status = "dirty"
 
     def add_enckey(self, key):