Further cleanup

gtsystem · gtsystem · commit 0f3df2a659b0 · 2018-04-28T12:17:09.000+02:00
diff --git a/README.md b/README.md
@@ -137,4 +137,8 @@ How many requests will this module perform to download a member?
 
 * If the full archive content is smaller than **initial\_buffer\_size**, only one request will be needed.
 * Normally two requests are needed, one to download the central directory and one to download the archive member.
-* If the central directory is bigger than **initial\_buffer\_size**, a third request will be required.
+* If the central directory is bigger than **initial\_buffer\_size**, a third request will be required.
+
+## Alternative modules
+
+There is a similar module available for python [pyremotezip](https://github.com/fcvarela/pyremotezip).
diff --git a/remotezip.py b/remotezip.py
@@ -3,6 +3,8 @@
 
 import requests
 
+__all__ = ['RemoteIOError', 'RemoteZip']
+
 
 class OutOfBound(Exception):
     pass
@@ -18,7 +20,6 @@ def __init__(self, buffer, offset, size, stream):
         self.offset = offset
         self.size = size
         self.position = offset
-        self.position_oob = False
         self.stream = stream
 
     def __repr__(self):
@@ -49,14 +50,11 @@ def seek(self, offset, whence):
         relative_position = self.position - self.offset
 
         if relative_position < 0 or relative_position >= self.size:
-            self.position_oob = True
             raise OutOfBound("Position out of buffer bound")
 
-        self.position_oob = False
         if self.stream:
             buff_pos = self.buffer.tell()
             if relative_position < buff_pos:
-                self.position_oob = True
                 raise OutOfBound("Negative seek not supported")
 
             skip_bytes = relative_position - buff_pos
@@ -76,6 +74,7 @@ def __init__(self, fetch_fun, initial_buffer_size=64*1024):
         self.buffer = None
         self.file_size = None
         self.position = None
+        self._seek_succeeded = False
         self.member_pos2size = None
 
     def set_pos2size(self, pos2size):
@@ -85,16 +84,15 @@ def read(self, size=0):
         if size == 0:
             size = self.file_size - self.buffer.position
 
-        if self.buffer.position_oob:
+        if not self._seek_succeeded:
             if self.member_pos2size is None:
                 fetch_size = size
                 stream = False
             else:
                 fetch_size = self.member_pos2size[self.buffer.position]
-                if fetch_size is None:
-                    fetch_size = self.file_size - self.buffer.position
                 stream = True
 
+            self._seek_succeeded = True
             self.buffer.close()
             self.buffer = self.fetch_fun((self.buffer.position, self.buffer.position + fetch_size -1), stream=stream)
 
@@ -107,8 +105,11 @@ def seek(self, offset, whence=0):
             self.file_size = self.buffer.size + self.buffer.position
 
         try:
-            return self.buffer.seek(offset, whence)
+            pos = self.buffer.seek(offset, whence)
+            self._seek_succeeded = True
+            return pos
         except OutOfBound:
+            self._seek_succeeded = False
             return self.buffer.position   # we ignore the issue here, we will check if buffer is fine during read
 
     def tell(self):
@@ -134,7 +135,7 @@ def get_position2size(self):
         if len(ilist) == 0:
             return {}
 
-        position2size = {ilist[-1].header_offset: None}
+        position2size = {ilist[-1].header_offset: self.start_dir - ilist[-1].header_offset}
         for i in range(len(ilist) - 1):
             m1, m2 = ilist[i: i+2]
             position2size[m1.header_offset] = m2.header_offset - m1.header_offset
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name='remotezip',
-    version='0.2',
+    version='0.9',
     author='Giuseppe Tribulato',
     author_email='gtsystem@gmail.com',
     py_modules=['remotezip'],
diff --git a/test_remotezip.py b/test_remotezip.py
@@ -137,7 +137,7 @@ def test_file_access(self):
         rio.seek(0, 2)  # eof
         curr_buffer = rio.buffer
         # we have two file, one at pos 156879 with size 30k and the last at pos
-        rio.set_pos2size({15687: 30*1024, 50354: None})
+        rio.set_pos2size({15687: 30*1024, 50354: 63000})
         rio.seek(15687, 0)
         self.assertEqual(rio.tell(), 15687)
         self.assertEqual(rio.read(5), b'sssss')
@@ -154,7 +154,7 @@ def test_file_access(self):
         # move to next file
         rio.seek(50354, 0)
         self.assertEqual(rio.read(4), b'ssss')
-        self.assertEqual(rio.buffer.size, 154446)
+        self.assertEqual(rio.buffer.size, 63000)
         self.assertIsNot(rio.buffer, curr_buffer)  # buffer changed
 
         rio.close()
