large-image-converter 1.32.9.dev38__py3-none-any.whl → 1.32.10__py3-none-any.whl

large_image_converter/__init__.py

@@ -843,7 +843,7 @@ def _is_lossy(path, tiffinfo=None):
 
 def _is_multiframe(path):
     """
-    Check if a path is a multiframe file.
+    Check if a path is a multiframe file according to vips.
 
     :param path: The path to the file
     :returns: True if multiframe.
@@ -853,18 +853,17 @@ def _is_multiframe(path):
         with _newFromFileLock:
             image = pyvips.Image.new_from_file(path)
     except Exception:
-        try:
-            open(path, 'rb').read(1)
-            raise
-        except Exception:
-            logger.warning('Is the file reachable and readable? (%r)', path)
-            raise OSError(path) from None
+        return None
     pages = 1
     if 'n-pages' in image.get_fields():
         pages = image.get_value('n-pages')
     return pages > 1
 
 
+def _is_new(path):
+    return os.path.basename(path).startswith(large_image.constants.NEW_IMAGE_PATH_FLAG)
+
+
 def _list_possible_sizes(width, height):
     """
     Given a width and height, return a list of possible sizes that could be
@@ -1038,12 +1037,15 @@ def convert(inputPath, outputPath=None, **kwargs):  # noqa: C901
             lidata = _data_from_large_image(str(inputPath), tempPath, **kwargs)
             logger.log(logging.DEBUG - 1, 'large_image information for %s: %r',
                        inputPath, lidata)
-            if lidata and (not is_vips(
-                    inputPath, (lidata['metadata']['sizeX'], lidata['metadata']['sizeY'])) or (
-                    len(lidata['metadata'].get('frames', [])) >= 2 and
-                    not _is_multiframe(inputPath)) or
-                    (np.dtype(lidata['tilesource'].dtype) != np.uint8 and
-                     np.dtype(lidata['tilesource'].dtype) != np.uint16)):
+            if lidata and (_is_new(inputPath) or _is_multiframe(inputPath)):
+                _convert_large_image(inputPath, outputPath, tempPath, lidata, **kwargs)
+            elif lidata and (
+                (len(lidata['metadata'].get('frames', [])) >= 2 and
+                 not _is_multiframe(inputPath)) or
+                (np.dtype(lidata['tilesource'].dtype) != np.uint8 and
+                 np.dtype(lidata['tilesource'].dtype) != np.uint16) or
+                not is_vips(inputPath, (lidata['metadata']['sizeX'], lidata['metadata']['sizeY']))
+            ):
                 _convert_large_image(inputPath, outputPath, tempPath, lidata, **kwargs)
             elif _is_multiframe(inputPath):
                 _generate_multiframe_tiff(inputPath, outputPath, tempPath, lidata, **kwargs)
@@ -1053,6 +1055,8 @@ def convert(inputPath, outputPath=None, **kwargs):  # noqa: C901
                 except Exception:
                     if lidata:
                         _convert_large_image(inputPath, outputPath, tempPath, lidata, **kwargs)
+                    else:
+                        raise
     return outputPath
 
 

{large_image_converter-1.32.9.dev38.dist-info → large_image_converter-1.32.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: large-image-converter
-Version: 1.32.9.dev38
+Version: 1.32.10
 Summary: Converter for Large Image.
 Author: Kitware Inc
 Author-email: kitware@kitware.com
@@ -18,7 +18,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: large-image-source-tiff>=1.32.9.dev38
+Requires-Dist: large-image-source-tiff>=1.32.10
 Requires-Dist: numpy
 Requires-Dist: psutil
 Requires-Dist: pyvips
@@ -28,14 +28,14 @@ Requires-Dist: glymur; extra == "jp2k"
 Provides-Extra: geospatial
 Requires-Dist: gdal; extra == "geospatial"
 Provides-Extra: sources
-Requires-Dist: large-image[sources]>=1.32.9.dev38; extra == "sources"
+Requires-Dist: large-image[sources]>=1.32.10; extra == "sources"
 Provides-Extra: stats
 Requires-Dist: packaging; extra == "stats"
 Requires-Dist: scikit-image; extra == "stats"
 Provides-Extra: all
 Requires-Dist: glymur; extra == "all"
 Requires-Dist: gdal; extra == "all"
-Requires-Dist: large-image[sources]>=1.32.9.dev38; extra == "all"
+Requires-Dist: large-image[sources]>=1.32.10; extra == "all"
 Requires-Dist: packaging; extra == "all"
 Requires-Dist: scikit-image; extra == "all"
 Dynamic: author

large_image_converter-1.32.10.dist-info/RECORD

@@ -0,0 +1,9 @@
+large_image_converter/__init__.py,sha256=8HscZ_keOmia7JafR33ZSLIY8uXMplobg_nNE4gCN9E,44595
+large_image_converter/__main__.py,sha256=SZOjDmX42vH4GcKB_5wdDHyB-aOy9LCx4_J97vQEjug,13358
+large_image_converter/format_aperio.py,sha256=NkKY3gaSjPlfxvcTQgFiMADdq_mkdpKjGQ7WT_QsvaM,11761
+large_image_converter-1.32.10.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+large_image_converter-1.32.10.dist-info/METADATA,sha256=fOO90lpfu2gzxZe5pB1dC1yrplp9o5DDebqYzWG7Ja4,4825
+large_image_converter-1.32.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+large_image_converter-1.32.10.dist-info/entry_points.txt,sha256=TkXGWAaHgquk_ZXfqHTjQLjv8RZriv6ioiJd7JL6UIs,78
+large_image_converter-1.32.10.dist-info/top_level.txt,sha256=cdRa-ZWWKzVHFsjK1Aq1f4bzAMPc3sgCpprmvpYczKg,22
+large_image_converter-1.32.10.dist-info/RECORD,,

large_image_converter-1.32.9.dev38.dist-info/RECORD

@@ -1,9 +0,0 @@
-large_image_converter/__init__.py,sha256=gAUfTuJ4_GdV_ltb21QLTCY3dkJVu_e-GF5Ll8Pzxsk,44445
-large_image_converter/__main__.py,sha256=SZOjDmX42vH4GcKB_5wdDHyB-aOy9LCx4_J97vQEjug,13358
-large_image_converter/format_aperio.py,sha256=NkKY3gaSjPlfxvcTQgFiMADdq_mkdpKjGQ7WT_QsvaM,11761
-large_image_converter-1.32.9.dev38.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
-large_image_converter-1.32.9.dev38.dist-info/METADATA,sha256=bVJGP2NAKR3ZizKQviTfoZDaYt_bwkPrcDwjKJq-z40,4845
-large_image_converter-1.32.9.dev38.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-large_image_converter-1.32.9.dev38.dist-info/entry_points.txt,sha256=TkXGWAaHgquk_ZXfqHTjQLjv8RZriv6ioiJd7JL6UIs,78
-large_image_converter-1.32.9.dev38.dist-info/top_level.txt,sha256=cdRa-ZWWKzVHFsjK1Aq1f4bzAMPc3sgCpprmvpYczKg,22
-large_image_converter-1.32.9.dev38.dist-info/RECORD,,