Supporting cascaded files (#30)

* Bump version to 0.3.5

* Supporting sif_version 65564 without confidence

* Removed unecessary option

* Supporting extra files

sif_parser/_sif_open.py

@@ -30,6 +30,16 @@ def _read_until(fp, terminator=' '):
         word += c
     return word
 
+def _skip_spaces(fp):
+    '''Read until something other than space or line end '''
+    while True:
+        offset = fp.tell()
+        c = _to_string(fp.read(1))
+        if c not in [' ', '\n']:
+            fp.seek(offset)
+            return fp
+    raise ValueError('Reached the end of the file')
+
 def _read_int(fp):
     return int(_read_until(fp, ' '))
 
@@ -199,10 +209,11 @@ def _open(fp):
     tile = []
     info['xbin'] = xbin
     info['ybin'] = ybin
-
+
+    fp = _skip_spaces(fp)
     for f in range(no_images):
         info['timestamp_of_{0:d}'.format(f)] = int(fp.readline())
-
+    
     offset = fp.tell()
     try: # remove extra 0 if it exits.
         flag = int(fp.readline())

testings/test_open.py

@@ -8,6 +8,7 @@
 # data directories that will be tested
 DATA_DIR = THIS_DIR + '/sif_parser_testdata/'
 PUBLIC_DATA_DIR = THIS_DIR + '/public_testdata/'
+EXTRA_DATA_DIR = THIS_DIR + '/extra_data/'
 
 import PIL.Image
 import numpy as np
@@ -21,7 +22,7 @@
 
 
 filenames = []
-for d in [DATA_DIR, PUBLIC_DATA_DIR]:
+for d in [DATA_DIR, PUBLIC_DATA_DIR, EXTRA_DATA_DIR]:
     if os.path.exists(d):
         files = os.listdir(d)
         filenames += [d + f for f in files if f[-4:] in ['.sif', '.SIF']]