fix iteration

Author: ziw-liu

iohub/reader.py

@@ -45,23 +45,30 @@ def _check_single_page_tiff(src: Path):
     if src.is_file():
         src = src.parent
     files = src.glob("*.tif")
-    if len(files) == 0:
+    try:
+        next(files)
+    except StopIteration:
         sub_dirs = _get_sub_dirs(src)
         if sub_dirs:
             files = (src / sub_dirs[0]).glob("*.tif")
-            if len(files) > 0:
+            try:
                 with tiff.TiffFile(next(files)) as tf:
                     if (
                         len(tf.pages) == 1
                     ):  # and tf.pages[0].is_multipage is False:
                         return True
+            except StopIteration:
+                pass
     return False
 
 
 def _check_multipage_tiff(src: Path):
     if src.is_file():
         src = src.parent
-    file = next(src.glob("*.tif"))
+    try:
+        file = next(src.glob("*.tif"))
+    except StopIteration:
+        return False
     with tiff.TiffFile(file) as tf:
         if len(tf.pages) > 1:
             return True

tests/test_reader.py

@@ -1,11 +1,12 @@
 import pytest
 
+from iohub._deprecated.singlepagetiff import MicromanagerSequenceReader
 from iohub.mmstack import MMStack
 from iohub.ndtiff import NDTiffDataset
 from iohub.reader import read_images
-
 from tests.conftest import (
     mm2gamma_ome_tiffs,
+    mm2gamma_singlepage_tiffs,
     mm1422_ome_tiffs,
     ndtiff_v2_datasets,
     ndtiff_v3_labeled_positions,
@@ -29,3 +30,9 @@ def test_detect_ome_tiff(data_path):
 def test_detect_ndtiff(data_path):
     reader = read_images(data_path)
     assert isinstance(reader, NDTiffDataset)
+
+
+@pytest.mark.parametrize("data_path", mm2gamma_singlepage_tiffs)
+def test_detect_single_page_tiff(data_path):
+    reader = read_images(data_path)
+    assert isinstance(reader, MicromanagerSequenceReader)