Changeset 7a5d066 in sasview

Timestamp:

Apr 20, 2017 3:00:56 PM (7 years ago)

Author:

krzywon

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

5d8f9b3

Parents:

080d88e

git-author:

Jeff Krzywon <krzywon@…> (04/20/17 15:00:56)

git-committer:

krzywon <krzywon@…> (04/20/17 15:00:56)

Message:

Replace defaults.json file with constant to eliminate json dependency

Files:

• sasview/setup_exe.py (modified) (2 diffs)
• sasview/setup_mac.py (modified) (1 diff)
• setup.py (modified) (1 diff)
• src/sas/sascalc/dataloader/readers/__init__.py (modified) (1 diff)
• src/sas/sascalc/dataloader/readers/associations.py (modified) (2 diffs)
• src/sas/sascalc/dataloader/readers/defaults.json (deleted)

sasview/setup_exe.py

@@ -227 +227 @@
 # Copy the settings file for the sas.dataloader file extension associations
 import sas.sascalc.dataloader.readers
-f = os.path.join(sas.sascalc.dataloader.readers.get_data_path(), 'defaults.json')
+f = os.path.join(sas.sascalc.dataloader.readers.get_data_path())
 if os.path.isfile(f):
     data_files.append(('.', [f]))
@@ -241 +241 @@
 if os.path.isfile(f):
     data_files.append(('.', [f]))
-
-#f = 'default_categories.json'
-#if os.path.isfile(f):
-#    data_files.append(('.', [f]))
 
 # numerical libraries

sasview/setup_mac.py

@@ -49 +49 @@
 
 #CANSAxml reader data files
-RESOURCES_FILES.append(os.path.join(sas.sascalc.dataloader.readers.get_data_path(),'defaults.json'))
+RESOURCES_FILES.append(os.path.join(sas.sascalc.dataloader.readers.get_data_path()))
 
 DATA_FILES.append('logging.ini')

setup.py

@@ -221 +221 @@
 package_dir["sas.sascalc.dataloader"] = os.path.join(
     "src", "sas", "sascalc", "dataloader")
-package_data["sas.sascalc.dataloader.readers"] = [
-    'defaults.json', 'schema/*.xsd']
+package_data["sas.sascalc.dataloader.readers"] = ['schema/*.xsd']
 packages.extend(["sas.sascalc.dataloader", "sas.sascalc.dataloader.readers",
                  "sas.sascalc.dataloader.readers.schema"])

src/sas/sascalc/dataloader/readers/__init__.py

@@ -1 @@
-# Backward compatibility with the previous implementation of the default readers
-from associations import register_readers
+# Method to associate extensions to default readers
+from associations import read_associations
 
-# Method to associate extensions to default readers 
-from associations import read_associations
 
 # Method to return the location of the XML settings file

src/sas/sascalc/dataloader/readers/associations.py

@@ -14 +14 @@
 #copyright 2009, University of Tennessee
 #############################################################################
-import os
 import sys
 import logging
-import json
 
 logger = logging.getLogger(__name__)
 
-FILE_NAME = 'defaults.json'
+FILE_ASSOCIATIONS = {
+    ".xml": "cansas_reader",
+    ".ses": "sesans_reader",
+    ".h5": "cansas_reader_HDF5",
+    ".txt": "ascii_reader",
+    ".asc": "IgorReader",
+    ".dat": "red2d_reader",
+    ".abs": "abs_reader",
+    ".d1d": "hfir1d_reader",
+    ".sans": "danse_reader",
+    ".nxs": "nexus_reader",
+    ".pdh": "anton_paar_saxs_reader"
+}
 
-def read_associations(loader, settings=FILE_NAME):
+
+def read_associations(loader, settings=FILE_ASSOCIATIONS):
     """
     Read the specified settings file to associate
@@ -31 +42 @@
     :param settings: path to the json settings file [string]
     """
-    reader_dir = os.path.dirname(__file__)
-    path = os.path.join(reader_dir, settings)
-    
-    # If we can't find the file in the installation
-    # directory, look into the execution directory.
-    if not os.path.isfile(path):
-        path = os.path.join(os.getcwd(), settings)
-    if not os.path.isfile(path):
-        path = os.path.join(sys.path[0], settings)
-    if not os.path.isfile(path):
-        path = settings
-    if not os.path.isfile(path):
-        path = "./%s" % settings
-    if os.path.isfile(path):
-        with open(path) as fh:
-            json_tree = json.load(fh)
-        
-        # Read in the file extension associations
-        entry_list = json_tree['SasLoader']['FileType']
-
-        # For each FileType entry, get the associated reader and extension
-        for entry in entry_list:
-            reader = entry['-reader']
-            ext = entry['-extension']
-            
-            if reader is not None and ext is not None:
-                # Associate the extension with a particular reader
-                # TODO: Modify the Register code to be case-insensitive
-                # and remove the extra line below.
-                try:
-                    exec "import %s" % reader
-                    exec "loader.associate_file_type('%s', %s)" % (ext.lower(),
-                                                                    reader)
-                    exec "loader.associate_file_type('%s', %s)" % (ext.upper(),
-                                                                    reader)
-                except:
-                    msg = "read_associations: skipping association"
-                    msg += " for %s\n  %s" % (ext.lower(), sys.exc_value)
-                    logger.error(msg)
-    else:
-        print "Could not find reader association settings\n  %s [%s]" % (__file__, os.getcwd())
-         
-         
-def register_readers(registry_function):
-    """
-    Function called by the registry/loader object to register
-    all default readers using a call back function.
-    
-    :WARNING: this method is now obsolete
-
-    :param registry_function: function to be called to register each reader
-    """
-    logger.info("register_readers is now obsolete: use read_associations()")
-    import abs_reader
-    import ascii_reader
-    import cansas_reader
-    import danse_reader
-    import hfir1d_reader
-    import IgorReader
-    import red2d_reader
-    #import tiff_reader
-    import nexus_reader
-    import sesans_reader
-    import cansas_reader_HDF5
-    import anton_paar_saxs_reader
-    registry_function(sesans_reader)
-    registry_function(abs_reader)
-    registry_function(ascii_reader)
-    registry_function(cansas_reader)
-    registry_function(danse_reader)
-    registry_function(hfir1d_reader)
-    registry_function(IgorReader)
-    registry_function(red2d_reader)
-    #registry_function(tiff_reader)
-    registry_function(nexus_reader)
-    registry_function(cansas_reader_HDF5)
-    registry_function(anton_paar_saxs_reader)
-    return True
+    # For each FileType entry, get the associated reader and extension
+    for ext, reader in settings.iteritems():
+        if reader is not None and ext is not None:
+            # Associate the extension with a particular reader
+            # TODO: Modify the Register code to be case-insensitive
+            # FIXME: Remove exec statements
+            # and remove the extra line below.
+            try:
+                exec "import %s" % reader
+                exec "loader.associate_file_type('%s', %s)" % (ext.lower(),
+                                                                reader)
+                exec "loader.associate_file_type('%s', %s)" % (ext.upper(),
+                                                                reader)
+            except:
+                msg = "read_associations: skipping association"
+                msg += " for %s\n  %s" % (ext.lower(), sys.exc_value)
+                logger.error(msg)