From cca0dbb46b5feaf06a84eef50794944fc5a8cd73 Mon Sep 17 00:00:00 2001
From: Eric Coissac <eric.coissac@metabarcoding.org>
Date: Sat, 21 May 2016 12:24:48 +0200
Subject: [PATCH] Close issue #54 by adding a read1 method to the MagicKeyFile
 class

---
 python/obitools3/files/uncompress.pxd |  1 +
 python/obitools3/files/uncompress.pyx | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/python/obitools3/files/uncompress.pxd b/python/obitools3/files/uncompress.pxd
index 80c5b5d..e5064a3 100644
--- a/python/obitools3/files/uncompress.pxd
+++ b/python/obitools3/files/uncompress.pxd
@@ -9,6 +9,7 @@ cdef class MagicKeyFile:
     cdef int    pos
     
     cpdef bytes read(self,int size=?)
+    cpdef bytes read1(self,int size=?)
     cpdef int tell(self)
 
     
diff --git a/python/obitools3/files/uncompress.pyx b/python/obitools3/files/uncompress.pyx
index ecd5d77..4a6a578 100644
--- a/python/obitools3/files/uncompress.pyx
+++ b/python/obitools3/files/uncompress.pyx
@@ -39,6 +39,9 @@ cdef class MagicKeyFile:
     cpdef bytes read(self,int size=-1):
         cdef bytes r
         
+        print(self.keylength)
+        print(size)
+        
         if self.pos < self.keylength:
             if size > (self.keylength - self.pos):
                 size = size - self.keylength + self.pos
@@ -54,14 +57,17 @@ cdef class MagicKeyFile:
             r = self.binary.read(size)
             
         return r
-    
+
+    cpdef bytes read1(self,int size=-1):
+        return self.read(size)
+
     cpdef int tell(self):
         cdef int p
         
         if self.pos < self.keylength:
             p = self.pos 
         else:
-            p = self.tell()
+            p = self.binary.tell()
         
         return p