[Pymoul-svn] SF.net SVN: pymoul: [287] pymoul/trunk/src/moul

[<ti...@us...>]

Revision: 287
          http://pymoul.svn.sourceforge.net/pymoul/?rev=287&view=rev
Author:   tiran
Date:     2007-04-28 06:25:46 -0700 (Sat, 28 Apr 2007)

Log Message:
-----------
Propset and minor tweaks for crypt

Modified Paths:
--------------
    pymoul/trunk/src/moul/crypt/stream.py
    pymoul/trunk/src/moul/file/pak.py
    pymoul/trunk/src/moul/file/sdl.py
    pymoul/trunk/src/moul/file/tests/test_sdl.py

Property Changed:
----------------
    pymoul/trunk/src/moul/crypt/stream.py
    pymoul/trunk/src/moul/file/pak.py
    pymoul/trunk/src/moul/file/sdl.py
    pymoul/trunk/src/moul/file/tests/test_sdl.py

Modified: pymoul/trunk/src/moul/crypt/stream.py
===================================================================
--- pymoul/trunk/src/moul/crypt/stream.py	2007-04-19 00:33:11 UTC (rev 286)
+++ pymoul/trunk/src/moul/crypt/stream.py	2007-04-28 13:25:46 UTC (rev 287)
@@ -18,8 +18,8 @@
 """Encrypted file stream
 """
 __author__ = "Christian Heimes"
-__version__ = "$Id: elf.py 275 2007-03-21 12:39:25Z tiran $"
-__revision__ = "$Revision: 275 $"
+__version__ = "$Id$"
+__revision__ = "$Revision$"
 
 import os
 
@@ -35,27 +35,43 @@
     blockSize = 1024
 
     def __init__(self, fdname, cipher):
+        self._cipher = cipher
+        
         if isinstance(fdname, basestring):
             fd = BinaryFile(fdname)
         elif isinstance(fdname, BinaryFile):
             fd = fdname
         else:
             raise TypeError(fdname)
+        self._fd = fd
+        
         header = fd.read(12)
         if header != self.magic:
             HeaderError(header)
         self._size = fd.read32()
-        fd.seek(0, 2)
-        fsize = fd.tell()
-        fd.seek(16)
-        if fsize-16 < self._size:
+        
+        self.seek(0, 2)
+        fsize = self.tell()
+        self.seek(0)
+        if fsize < self._size:
             raise ValueError("Size mismatch %i/%i" % (fsize, self._size))
-        self._cipher = cipher
-        self._fd = fd
 
+    def seek(self, offset, whence=0):
+        if whence == 0:
+            offset += 16
+        self._fd.seek(offset, whence)
+
+    def tell(self):
+        return self._fd.tell()-16
+
+    def flush(self):
+        return self._fd.flush()
+
+    def close(self):
+        return self._fd.close()
+
     def read(self):
         fd = self._fd
-        fd.seek(16)
         remain = self._size
         bs = self.blockSize
         decrypt = self._cipher.decrypt
@@ -69,4 +85,5 @@
                 data = data[:remain]
             buf.append(data)
             remain -= bs
+            remain -= bs
         return ''.join(buf)


Property changes on: pymoul/trunk/src/moul/crypt/stream.py
___________________________________________________________________
Name: svn:keywords
   - 'Id Revision'
   + Id Revision

Modified: pymoul/trunk/src/moul/file/pak.py
===================================================================
--- pymoul/trunk/src/moul/file/pak.py	2007-04-19 00:33:11 UTC (rev 286)
+++ pymoul/trunk/src/moul/file/pak.py	2007-04-28 13:25:46 UTC (rev 287)
@@ -18,8 +18,8 @@
 """Python PAK reader (for TPOS)
 """
 __author__ = "Christian Heimes"
-__version__ = "$Id: utils.py 187 2007-02-23 16:41:50Z tiran $"
-__revision__ = "$Revision: 187 $"
+__version__ = "$Id$"
+__revision__ = "$Revision$"
 
 import os
 from hashlib import md5


Property changes on: pymoul/trunk/src/moul/file/pak.py
___________________________________________________________________
Name: svn:keywords
   - 'Id Revision'
   + Id Revision

Modified: pymoul/trunk/src/moul/file/sdl.py
===================================================================
--- pymoul/trunk/src/moul/file/sdl.py	2007-04-19 00:33:11 UTC (rev 286)
+++ pymoul/trunk/src/moul/file/sdl.py	2007-04-28 13:25:46 UTC (rev 287)
@@ -18,8 +18,8 @@
 """SDL files (for TPOS)
 """
 __author__ = "Christian Heimes"
-__version__ = "$Id: utils.py 187 2007-02-23 16:41:50Z tiran $"
-__revision__ = "$Revision: 187 $"
+__version__ = "$Id$"
+__revision__ = "$Revision$"
 
 import os
 import re


Property changes on: pymoul/trunk/src/moul/file/sdl.py
___________________________________________________________________
Name: svn:keywords
   - 'Id Revision'
   + Id Revision

Modified: pymoul/trunk/src/moul/file/tests/test_sdl.py
===================================================================
--- pymoul/trunk/src/moul/file/tests/test_sdl.py	2007-04-19 00:33:11 UTC (rev 286)
+++ pymoul/trunk/src/moul/file/tests/test_sdl.py	2007-04-28 13:25:46 UTC (rev 287)
@@ -18,8 +18,8 @@
 """moul.file.sdl unit tests
 """
 __author__ = "Christian Heimes"
-__version__ = "$Id: test_plasmalog.py 140 2007-02-05 14:51:30Z tiran $"
-__revision__ = "$Revision: 140 $"
+__version__ = "$Id$"
+__revision__ = "$Revision$"
 
 import os
 import unittest


Property changes on: pymoul/trunk/src/moul/file/tests/test_sdl.py
___________________________________________________________________
Name: svn:keywords
   - 'Id Revision'
   + Id Revision


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.