[Nym3-commit] r74 - trunk

[nym3-devel@lists.noreply.org]

Author: laurent
Date: 2004-08-04 17:15:16 +0200 (Wed, 04 Aug 2004)
New Revision: 74

Modified:
   trunk/User.py
Log:
Correct User.usage()


Modified: trunk/User.py
===================================================================
--- trunk/User.py	2004-08-04 14:57:37 UTC (rev 73)
+++ trunk/User.py	2004-08-04 15:15:16 UTC (rev 74)
@@ -35,6 +35,12 @@
 	    f.close()
 	self.release()
 
+    def __getitem__(self, key):
+	return self.data[key]
+
+    def __setitem__(self, key, value):
+	self.data[key] = value
+
     def lock(self):
 	"""Lock the user. For well behaved functions."""
 	self.lock = mixminion.Common.Lockfile(Config.path + os.sep + 
@@ -48,7 +54,12 @@
 	return self.data['quota']
 
     def usage(self):
-	return self.data['usage']
+	sum = os.stat(self.surbfile())[6]
+	sum = sum + os.stat(self.indexfile[6])
+	sum = sum + os.stat(self.synboxfile[6])
+	sum = sum + os.stat(self.mboxfile[6])
+	self.data['quota'] = sum
+	return sum
 
     def idKey(self):
         return self.data['idKey']
@@ -150,7 +161,7 @@
 
     def load_mbox(self):
 	if self.__dict__.has_key('mbox'): return
-	mbox = Config.path + os.sep + self.data['username'] + '.mbox'
+	mbox = self.mboxfile()
 	self.lock()
 	try:
 	    f = open(mbox, 'r')
@@ -160,17 +171,26 @@
 	    self.mbox = {}
 	self.release()
 
+    def mboxfile(self):
+	return Config.path + os.sep + self.data['username'] + '.mbox'
+
     def save_mbox(self):
-	mbox = Config.path + os.sep + self.data['username'] + '.mbox'
+	mbox = self.mboxfile()
 	self.lock()
 	f = open(mbox, 'w')
 	pickle.dump(self.mbox, f)
 	f.close()
 	self.release()
+
+    def synboxfile(self):
+	return Config.path + os.sep + self.data['username'] + '.syn'
+
+    def indexfile(self):
+	return Config.path + os.sep + self.data['username'] + '.idx'
 	
     def load_synbox(self):
 	if self.__dict__.has_key('syn'): return
-	synbox = Config.path + os.sep + self.data['username'] + '.syn'
+	synbox = self.synboxfile()
 	self.lock()
 	try:
 	    f = open(synbox, 'r')
@@ -181,7 +201,7 @@
 	self.release()
 
     def save_synbox(self):
-	synbox = Config.path + os.sep + self.data['username'] + '.syn'
+	synbox = self.synboxfile()
 	self.lock()
 	f = open(synbox, 'w')
 	pickle.dump(self.syn, f)
@@ -190,7 +210,7 @@
     
     def load_index(self):
 	if self.__dict__.has_key('index'): return
-	index = Config.path + os.sep + self.data['username'] + '.idx'
+	index = self.indexfile()
 	self.lock()
 	try:
 	    f = open(index, 'r')
@@ -201,7 +221,7 @@
 	self.release()
     
     def save_index(self):
-	index = Config.path + os.sep + self.data['username'] + '.idx'
+	index = self.indexfile()
 	self.lock()
 	f = open(index, 'w')
 	pickle.dump(self.index, f)