obitools/obitools3
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 66 Wiki Activity

Close issue #54 by adding a read1 method to the MagicKeyFile class

Browse Source
This commit is contained in:
Eric Coissac
2016-05-21 12:24:48 +02:00
parent 5a78157112
commit cca0dbb46b
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
python/obitools3/files/uncompress.pxd
View File

@ -9,6 +9,7 @@ cdef class MagicKeyFile:
cdef int pos cdef int pos
cpdef bytes read(self,int size=?) cpdef bytes read(self,int size=?)
cpdef bytes read1(self,int size=?)
cpdef int tell(self) cpdef int tell(self)

8
python/obitools3/files/uncompress.pyx
View File

@ -39,6 +39,9 @@ cdef class MagicKeyFile:
cpdef bytes read(self,int size=-1): cpdef bytes read(self,int size=-1):
cdef bytes r cdef bytes r
print(self.keylength)
print(size)
if self.pos < self.keylength: if self.pos < self.keylength:
if size > (self.keylength - self.pos): if size > (self.keylength - self.pos):
size = size - self.keylength + self.pos size = size - self.keylength + self.pos
@ -55,13 +58,16 @@ cdef class MagicKeyFile:
return r return r
cpdef bytes read1(self,int size=-1):
return self.read(size)
cpdef int tell(self): cpdef int tell(self):
cdef int p cdef int p
if self.pos < self.keylength: if self.pos < self.keylength:
p = self.pos p = self.pos
else: else:
p = self.tell() p = self.binary.tell()
return p return p