Changeset 07f8d9a in sasview

Timestamp:

Apr 4, 2009 1:18:07 PM (16 years ago)

Author:

Mathieu Doucet <doucetm@…>

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.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

692d726

Parents:

28caa03

Message:

Improved hierarchical reader structure, put back reader plugin, minor fixes.

Location:

DataLoader

Files:

• loader.py (modified) (5 diffs)
• setup.py (modified) (2 diffs)

DataLoader/loader.py

@@ -53 +53 @@
         
         # Register default readers
-        readers.register_readers(self._identify_plugin)
+        readers.read_associations(self)
+        
+        #TODO: remove the following line when ready to switch to the new default readers
+        #readers.register_readers(self._identify_plugin)
+        
+        # Look for plug-in readers
+        self.find_plugins('plugins')
+
         
     def find_plugins(self, dir):
@@ -110 +117 @@
         return readers_found 
     
+    def associate_file_type(self, ext, module):
+        """
+            Look into a module to find whether it contains a 
+            Reader class. If so, APPEND it to readers and (potentially)
+            to the list of writers for the given extension
+            
+            @param ext: file extension [string]
+            @param module: module object
+        """
+        reader_found = False
+        
+        if hasattr(module, "Reader"):
+            try:
+                # Find supported extensions
+                loader = module.Reader()
+                if ext not in self.loaders:
+                    self.loaders[ext] = []
+                # Append the new reader to the list
+                self.loaders[ext].append(loader.read)
+
+                reader_found = True
+                
+                # Keep track of wildcards
+                type_name = module.__name__
+                if hasattr(loader, 'type_name'):
+                    type_name = loader.type_name
+                    
+                wcard = "%s files (*%s)|*%s" % (type_name, ext.lower(), ext.lower())
+                if wcard not in self.wildcards:
+                    self.wildcards.append(wcard)
+                            
+                # Check whether writing is supported
+                if hasattr(loader, 'write'):
+                    if ext not in self.writers:
+                        self.writers[ext] = []
+                    # Append the new writer to the list
+                    self.writers[ext].append(loader.write)
+                        
+            except:
+                logging.error("Loader: Error accessing Reader in %s\n  %s" % (module.__name__, sys.exc_value))
+        return reader_found
+
+    
     def _identify_plugin(self, module):
         """
@@ -126 +176 @@
                     if ext not in self.loaders:
                         self.loaders[ext] = []
-                    #The first reading will use the reader with only one ext.
-                    if len(self.loaders[ext])>0 and len(loader.ext)>2:
-                        self.loaders[ext].insert(1,loader.read)
-                    else:
-                        self.loaders[ext].insert(0,loader.read)
+                    # When finding a reader at run time, treat this reader as the new 
+                    # default
+                    self.loaders[ext].insert(0,loader.read)
 
                     reader_found = True
                     
                     # Keep track of wildcards
-                    for wcard in loader.type:
-                        if wcard not in self.wildcards:
-                            self.wildcards.append(wcard)
+                    type_name = module.__name__
+                    if hasattr(loader, 'type_name'):
+                        type_name = loader.type_name
+                    wcard = "%s files (*%s)|*%s" % (type_name, ext.lower(), ext.lower())
+                    if wcard not in self.wildcards:
+                        self.wildcards.append(wcard)
                             
                 # Check whether writing is supported
@@ -147 +198 @@
                         
             except:
-                logging.error("Loader: Error accessing Reader in %s\n  %s" % (name, sys.exc_value))
+                logging.error("Loader: Error accessing Reader in %s\n  %s" % (module.__name__, sys.exc_value))
         return reader_found
 
@@ -204 +255 @@
     __registry = Registry()
     
+    def associate_file_type(self, ext, module):
+        """
+            Look into a module to find whether it contains a 
+            Reader class. If so, append it to readers and (potentially)
+            to the list of writers for the given extension
+            
+            @param ext: file extension [string]
+            @param module: module object
+        """
+        return self.__registry.associate_file_type(ext, module)
+
     def load(self, file, format=None):
         """

DataLoader/setup.py

@@ -6 +6 @@
 # Then build and install the modules
 from distutils.core import setup, Extension
+from distutils.sysconfig import get_python_lib
 
 
@@ -19 +20 @@
     package_dir = {"DataLoader":"."},
     
-    packages = ["DataLoader","DataLoader.readers"]
+    packages = ["DataLoader","DataLoader.readers"],
+    data_files=[(os.path.join(get_python_lib(),"DataLoader","readers"), ["readers/defaults.xml"])]
     )