Expand user directory for FileTileSource paths.

CHANGELOG.md

@@ -1,7 +1,12 @@
 # Change Log
 
+## Unreleased
+
 ## Version 1.9.0
 
+### Improvements
+- Expand user paths ([#746](../../pull/746))
+
 ### Features
 - Better palette support in styles ([#724](../../pull/724))
 - Enumerate available palettes ([#741](../../pull/741))

large_image/tilesource/__init__.py

@@ -28,7 +28,7 @@ def isGeospatial(path):
         # TODO: log a warning
         return False
     try:
-        ds = gdal.Open(path, gdalconst.GA_ReadOnly)
+        ds = gdal.Open(str(path), gdalconst.GA_ReadOnly)
     except Exception:
         return False
     if ds:
@@ -74,8 +74,8 @@ def getSourceNameFromDict(availableSources, pathOrUri, *args, **kwargs):
     :returns: the name of a tile source that can read the input, or None if
         there is no such source.
     """
-    uriWithoutProtocol = pathOrUri.split('://', 1)[-1]
-    isLargeImageUri = pathOrUri.startswith('large_image://')
+    uriWithoutProtocol = str(pathOrUri).split('://', 1)[-1]
+    isLargeImageUri = str(pathOrUri).startswith('large_image://')
     extensions = [ext.lower() for ext in os.path.basename(uriWithoutProtocol).split('.')[1:]]
     properties = {
         'geospatial': isGeospatial(pathOrUri),

large_image/tilesource/base.py

@@ -2332,6 +2332,13 @@ def __init__(self, path, *args, **kwargs):
         :param path: a filesystem path for the tile source.
         """
         super().__init__(*args, **kwargs)
+        # Expand the user without converting datatype of path.
+        try:
+            path = (path.expanduser() if callable(getattr(path, 'expanduser', None)) else
+                    os.path.expanduser(path))
+        except TypeError:
+            # Don't fail if the path is unusual -- maybe a source can handle it
+            pass
         self.largeImagePath = path
 
     @staticmethod

sources/bioformats/setup.py

@@ -43,11 +43,11 @@ def prerelease_local_scheme(version):
         'Programming Language :: Python :: 3.10',
     ],
     install_requires=[
-        'large-image>=1.0.0',
+        'large-image',
         'python-bioformats>=1.5.2',
     ],
     extras_require={
-        'girder': 'girder-large-image>=1.0.0',
+        'girder': 'girder-large-image',
     },
     keywords='large_image, tile source',
     packages=find_packages(exclude=['test', 'test.*']),

sources/deepzoom/setup.py

@@ -43,10 +43,10 @@ def prerelease_local_scheme(version):
         'Programming Language :: Python :: 3.10',
     ],
     install_requires=[
-        'large-image>=1.0.0',
+        'large-image',
     ],
     extras_require={
-        'girder': 'girder-large-image>=1.0.0',
+        'girder': 'girder-large-image',
     },
     keywords='large_image, tile source',
     packages=find_packages(exclude=['test', 'test.*']),

sources/dummy/setup.py

@@ -43,7 +43,7 @@ def prerelease_local_scheme(version):
         'Programming Language :: Python :: 3.10',
     ],
     install_requires=[
-        'large-image>=1.0.0',
+        'large-image',
     ],
     keywords='large_image, tile source',
     packages=find_packages(exclude=['test', 'test.*']),

sources/gdal/setup.py

@@ -43,12 +43,12 @@ def prerelease_local_scheme(version):
         'Programming Language :: Python :: 3.10',
     ],
     install_requires=[
-        'large-image>=1.0.0',
+        'large-image',
         'gdal',
         'pyproj>=2.2.0',
     ],
     extras_require={
-        'girder': 'girder-large-image>=1.0.0',
+        'girder': 'girder-large-image',
     },
     keywords='large_image, tile source',
     packages=find_packages(exclude=['test', 'test.*']),

sources/mapnik/setup.py

@@ -43,12 +43,12 @@ def prerelease_local_scheme(version):
         'Programming Language :: Python :: 3.10',
     ],
     install_requires=[
-        'large-image>=1.0.0',
+        'large-image',
         'large-image-source-gdal',
         'mapnik',
     ],
     extras_require={
-        'girder': 'girder-large-image>=1.0.0',
+        'girder': 'girder-large-image',
     },
     keywords='large_image, tile source',
     packages=find_packages(exclude=['test', 'test.*']),

sources/nd2/setup.py

@@ -43,12 +43,12 @@ def prerelease_local_scheme(version):
         'Programming Language :: Python :: 3.10',
     ],
     install_requires=[
-        'large-image>=1.0.0',
+        'large-image',
         'nd2reader>=3.3',
         'importlib-metadata ; python_version < "3.8"',
     ],
     extras_require={
-        'girder': 'girder-large-image>=1.0.0',
+        'girder': 'girder-large-image',
     },
     keywords='large_image, tile source',
     packages=find_packages(exclude=['test', 'test.*']),

sources/ometiff/setup.py

@@ -43,11 +43,11 @@ def prerelease_local_scheme(version):
         'Programming Language :: Python :: 3.10',
     ],
     install_requires=[
-        'large-image>=1.0.0',
+        'large-image',
         'large-image-source-tiff>=1.0.0',
     ],
     extras_require={
-        'girder': 'girder-large-image>=1.0.0',
+        'girder': 'girder-large-image',
     },
     keywords='large_image, tile source',
     packages=find_packages(exclude=['test', 'test.*']),

sources/openjpeg/setup.py

@@ -43,12 +43,12 @@ def prerelease_local_scheme(version):
         'Programming Language :: Python :: 3.10',
     ],
     install_requires=[
-        'large-image>=1.0.0',
+        'large-image',
         'glymur>=0.8.18 ; python_version >= "3.7"',
         'glymur>=0.8.18,<0.9.4 ; python_version < "3.7"',
     ],
     extras_require={
-        'girder': 'girder-large-image>=1.0.0',
+        'girder': 'girder-large-image',
     },
     keywords='large_image, tile source',
     packages=find_packages(exclude=['test', 'test.*']),

sources/openslide/setup.py

@@ -43,12 +43,12 @@ def prerelease_local_scheme(version):
         'Programming Language :: Python :: 3.10',
     ],
     install_requires=[
-        'large-image>=1.0.0',
+        'large-image',
         'openslide-python>=1.1.0',
         'tifftools>=1.2.0',
     ],
     extras_require={
-        'girder': 'girder-large-image>=1.0.0',
+        'girder': 'girder-large-image',
     },
     keywords='large_image, tile source',
     packages=find_packages(exclude=['test', 'test.*']),

sources/pil/setup.py

@@ -43,10 +43,10 @@ def prerelease_local_scheme(version):
         'Programming Language :: Python :: 3.10',
     ],
     install_requires=[
-        'large-image>=1.0.0',
+        'large-image',
     ],
     extras_require={
-        'girder': 'girder-large-image>=1.0.0',
+        'girder': 'girder-large-image',
     },
     keywords='large_image, tile source',
     packages=find_packages(exclude=['test', 'test.*']),

sources/test/setup.py

@@ -43,7 +43,7 @@ def prerelease_local_scheme(version):
         'Programming Language :: Python :: 3.10',
     ],
     install_requires=[
-        'large-image>=1.0.0',
+        'large-image',
     ],
     keywords='large_image, tile source',
     packages=find_packages(exclude=['test', 'test.*']),

sources/tiff/setup.py

@@ -43,12 +43,12 @@ def prerelease_local_scheme(version):
         'Programming Language :: Python :: 3.10',
     ],
     install_requires=[
-        'large-image>=1.0.0',
+        'large-image',
         'libtiff>=0.4.1',
         'tifftools>=1.2.0',
     ],
     extras_require={
-        'girder': 'girder-large-image>=1.0.0',
+        'girder': 'girder-large-image',
     },
     keywords='large_image, tile source',
     packages=find_packages(exclude=['test', 'test.*']),

test/test_source_base.py

@@ -190,3 +190,14 @@ def testGetAvailableNamedPalettes():
 
     assert len(large_image.tilesource.utilities.getAvailableNamedPalettes(False)) > \
         len(large_image.tilesource.utilities.getAvailableNamedPalettes(False, True))
+
+
+def testExpanduserPath():
+    imagePath = datastore.fetch('sample_image.ptif')
+    assert large_image.canRead(imagePath)
+    absPath = os.path.abspath(imagePath)
+    userDir = os.path.expanduser('~') + os.sep
+    if absPath.startswith(userDir):
+        userPath = '~' + os.sep + absPath[len(userDir):]
+        assert large_image.canRead(userPath)
+        assert large_image.canRead(Path(userPath))