girder-large-image 1.29.2.dev4__tar.gz → 1.29.2.dev6__tar.gz

{girder-large-image-1.29.2.dev4 → girder-large-image-1.29.2.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: girder-large-image
-Version: 1.29.2.dev4
+Version: 1.29.2.dev6
 Summary: A Girder plugin to work with large, multiresolution images.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -19,9 +19,9 @@ Requires-Python: >=3.8
 License-File: LICENSE
 Requires-Dist: girder>=3.1.18
 Requires-Dist: girder-jobs>=3.0.3
-Requires-Dist: large_image>=1.29.2.dev4
+Requires-Dist: large_image>=1.29.2.dev6
 Provides-Extra: tasks
-Requires-Dist: large-image-tasks[girder]>=1.29.2.dev4; extra == "tasks"
+Requires-Dist: large-image-tasks[girder]>=1.29.2.dev6; extra == "tasks"
 Requires-Dist: girder-worker[girder]>=0.6.0; extra == "tasks"
 
 A Girder plugin to work with large, multiresolution images.

{girder-large-image-1.29.2.dev4 → girder-large-image-1.29.2.dev6}/girder_large_image/__init__.py

@@ -158,7 +158,7 @@ def _updateJob(event):
                      datetime.timedelta(seconds=30)))
 
 
-def checkForLargeImageFiles(event):
+def checkForLargeImageFiles(event):  # noqa
     file = event.info
     logger.info('Handling file %s (%s)', file['_id'], file['name'])
     possible = False
@@ -178,10 +178,51 @@ def checkForLargeImageFiles(event):
         return
     try:
         ImageItem().createImageItem(item, file, createJob=False)
+        return
     except Exception:
-        # We couldn't automatically set this as a large image
-        girder.logger.info(
-            'Saved file %s cannot be automatically used as a largeImage' % str(file['_id']))
+        pass
+    # Check for files that are from folder/image style images.  This is custom
+    # per folder/image format
+    imageFolderRecords = {
+        'mrxs': {
+            'match': r'^Slidedat.ini$',
+            'up': 1,
+            'folder': r'^(.*)$',
+            'image': '\\1.mrxs',
+        },
+        'vsi': {
+            'match': r'^.*\.ets$',
+            'up': 2,
+            'folder': r'^_(\.*)_$',
+            'image': '\\1.vsi',
+        },
+    }
+    for check in imageFolderRecords.values():
+        if re.match(check['match'], file['name']):
+            try:
+                folderId = item['folderId']
+                folder = None
+                for _ in range(check['up']):
+                    folder = Folder().load(folderId, force=True)
+                    if not folder:
+                        break
+                    folderId = folder['parentId']
+                if not folder or not re.match(check['folder'], folder['name']):
+                    continue
+                imageName = re.sub(check['folder'], check['image'], folder['name'])
+                parentItem = Item().findOne({'folderId': folder['parentId'], 'name': imageName})
+                if not parentItem:
+                    continue
+                files = list(Item().childFiles(item=parentItem, limit=2))
+                if len(files) == 1:
+                    parentFile = files[0]
+                    ImageItem().createImageItem(parentItem, parentFile, createJob=False)
+                    return
+            except Exception:
+                pass
+    # We couldn't automatically set this as a large image
+    girder.logger.info(
+        'Saved file %s cannot be automatically used as a largeImage' % str(file['_id']))
 
 
 def removeThumbnails(event):

{girder-large-image-1.29.2.dev4 → girder-large-image-1.29.2.dev6}/girder_large_image/girder_tilesource.py

@@ -5,7 +5,7 @@ from girder.constants import AccessType
 from girder.exceptions import FilePathException, ValidationException
 from girder.models.file import File
 from girder.models.item import Item
-from large_image import tilesource
+from large_image import config, tilesource
 from large_image.constants import SourcePriority
 from large_image.exceptions import TileSourceAssetstoreError, TileSourceError
 
@@ -164,6 +164,9 @@ def getGirderTileSourceName(item, file=None, *args, **kwargs):  # noqa
     properties = {}
     if localPath:
         properties['_geospatial_source'] = tilesource.isGeospatial(localPath)
+    ignored_names = config.getConfig('all_sources_ignored_names')
+    ignoreName = (ignored_names and re.search(
+        ignored_names, baseName, flags=re.IGNORECASE))
     sourceList = []
     for sourceName in availableSources:
         if not getattr(availableSources[sourceName], 'girderSource', False):
@@ -183,7 +186,7 @@ def getGirderTileSourceName(item, file=None, *args, **kwargs):  # noqa
             if ext in sourceExtensions:
                 priority = min(priority, sourceExtensions[ext])
                 fallback = False
-        if priority >= SourcePriority.MANUAL:
+        if priority >= SourcePriority.MANUAL or (ignoreName and fallback):
             continue
         propertiesClash = any(
             getattr(availableSources[sourceName], k, False) != v

{girder-large-image-1.29.2.dev4 → girder-large-image-1.29.2.dev6}/girder_large_image.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: girder-large-image
-Version: 1.29.2.dev4
+Version: 1.29.2.dev6
 Summary: A Girder plugin to work with large, multiresolution images.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -19,9 +19,9 @@ Requires-Python: >=3.8
 License-File: LICENSE
 Requires-Dist: girder>=3.1.18
 Requires-Dist: girder-jobs>=3.0.3
-Requires-Dist: large_image>=1.29.2.dev4
+Requires-Dist: large_image>=1.29.2.dev6
 Provides-Extra: tasks
-Requires-Dist: large-image-tasks[girder]>=1.29.2.dev4; extra == "tasks"
+Requires-Dist: large-image-tasks[girder]>=1.29.2.dev6; extra == "tasks"
 Requires-Dist: girder-worker[girder]>=0.6.0; extra == "tasks"
 
 A Girder plugin to work with large, multiresolution images.

{girder-large-image-1.29.2.dev4 → girder-large-image-1.29.2.dev6}/girder_large_image.egg-info/requires.txt

@@ -1,7 +1,7 @@
 girder>=3.1.18
 girder-jobs>=3.0.3
-large_image>=1.29.2.dev4
+large_image>=1.29.2.dev6
 
 [tasks]
-large-image-tasks[girder]>=1.29.2.dev4
+large-image-tasks[girder]>=1.29.2.dev6
 girder-worker[girder]>=0.6.0