Merge pull request #479 from girder/tiff-internal-metadata

Expose more tiff internal metadata.

sources/tiff/large_image_source_tiff/__init__.py

@@ -293,10 +293,26 @@ def getInternalMetadata(self, **kwargs):
         """
         results = {}
         for idx, dir in enumerate(self._tiffDirectories[::-1]):
-            if dir and hasattr(dir, '_description_record'):
-                results['xml' + (
-                    '' if not results.get('xml') else '_' + str(idx))] = self._xmlToMetadata(
-                        dir._description_record)
+            if dir:
+                if hasattr(dir, '_description_record'):
+                    results['xml' + (
+                        '' if not results.get('xml') else '_' + str(idx))] = self._xmlToMetadata(
+                            dir._description_record)
+                for k, v in six.iteritems(dir._tiffInfo):
+                    print(dir, k, v)
+                    if k == 'imagedescription' and hasattr(dir, '_description_record'):
+                        continue
+                    if isinstance(v, (str, bytes)) and k:
+                        if isinstance(v, bytes):
+                            try:
+                                v = v.decode('utf8')
+                            except UnicodeDecodeError:
+                                continue
+                        results.setdefault('tiff', {})
+                        if not dir and k not in results['tiff']:
+                            results['tiff'][k] = v
+                        elif k not in results['tiff'] or v != results['tiff'][k]:
+                            results['tiff'][k + ':%d' % idx] = v
         return results
 
     @methodcache()