use getMetadata in new ncempy version

Author: ercius

TemDataBrowser/__init__.py

@@ -82,6 +82,7 @@ def on_change_data_filename(self, fname):
         """
         try:
             is_stemtomo = False
+            print(f'Loading {fname}...')
             if Path(fname).suffix.lower() == '.emd':
                 # Check for special STEMTomo7 Berkeley EMD files
                 try:
@@ -230,7 +231,8 @@ def get_mrc_metadata(path):
         if hasattr(mrc1, 'FEIinfo'):
             # add in the special FEIinfo if it exists
             try:
-                metaData.update(mrc1.FEIinfo)
+                if isinstance(mrc1.FEIinfo, dict):
+                    metaData.update(mrc1.FEIinfo)
             except TypeError:
                 pass
 
@@ -313,6 +315,8 @@ def get_velox_metadata(path):
         import json
         metaData = {}
         with ncempy.io.emdVelox.fileEMDVelox(path) as f0:
+            if f0.list_data is None:
+                return metaData
             dataGroup = f0.list_data[0]
             dataset0 = dataGroup['Data']
 
@@ -402,11 +406,17 @@ def on_change_data_filename(self, fname):
         elif ext in ('.mrc', '.rec', '.ali'):
             meta_data = self.get_mrc_metadata(fname)
         elif ext in ('.emd',):
-            with ncempy.io.emd.fileEMD(fname) as emd0:
-                if len(emd0.list_emds) > 0:
-                    meta_data = self.get_emd_metadata(fname)
-                else:
-                    meta_data = self.get_velox_metadata(fname)
+            try: 
+                # Parse the file to see if any EMD datasets exist
+                # if not then it throws a NoEmdDataSets error
+                with ncempy.io.emd.fileEMD(fname) as f0:
+                    meta_data = f0.getMetadata(0)
+            except ncempy.io.emd.NoEmdDataSets:
+                with ncempy.io.emdVelox.fileEMDVelox(fname) as f0:
+                    if f0.list_data is not None:
+                        meta_data = f0.getMetadata(0)
+                    else:
+                        meta_data = {'file name': str(fname), 'error': 'No EMD datasets found'}
         elif ext in ('.ser',):
             meta_data = self.get_ser_metadata(fname)
         elif ext in ('.emi',):