[Nym3-commit] r53 - trunk

[nym3-devel@lists.noreply.org]

Author: jr
Date: 2004-08-02 15:23:18 +0200 (Mon, 02 Aug 2004)
New Revision: 53

Modified:
   trunk/Message.py
   trunk/User.py
Log:
Surbs processing :
- a correction in Surb.fromData, check the argument(Message.py)
- add User.addSurbs(User.py)
- clean_surbs updates the value of User.data['nSurbs']


Modified: trunk/Message.py
===================================================================
--- trunk/Message.py	2004-08-02 13:08:03 UTC (rev 52)
+++ trunk/Message.py	2004-08-02 13:23:18 UTC (rev 53)
@@ -327,9 +327,11 @@
 		return 2
 	def fromData(self,s):
 		"""Fill a Surb Object from a string containing Surbs"""
-		self.surbs=s
+		if(len(s) % surbLength != 0):
+			raise BadArgument("Surb.fromData : surbs have not a valid size")
 		if(len(s)>=pow(256,3)):
 			raise BadArgument("Surb.fromData : command body too long")
+		self.surbs=s
 	def fromStrReader(self,sr,cs):
 		"""Fill a Surb Object from a StrReader
 		raise ParseError if it is malformed"""

Modified: trunk/User.py
===================================================================
--- trunk/User.py	2004-08-02 13:08:03 UTC (rev 52)
+++ trunk/User.py	2004-08-02 13:23:18 UTC (rev 53)
@@ -77,10 +77,19 @@
 			   " |grep 'Used: no'")
 	    os.unlink(fname)
 	    if ec == 0: goods.append(surb)
+        self.data['nSurbs'] = 0
 	f = open(self.surbfile())
-	for surb in goods: f.write(surb)
+	for surb in goods:
+            f.write(surb)
+            self.data['nSurbs'] = self.data['nSurbs'] + 1
 	f.close()
 	
+    def addSurbs(self,surbs):
+        fname = self.surbfile()
+	f = open(fname, "a")
+        f.write(surbs)
+        f.close()
+        self.data['nSurbs'] = self.data['nSurbs'] + ( len(surbs) / surb_len)
 
     def store(self, msg):
 	"Store an incoming message"