Changeset da8bb53 in sasview for src/sas/sascalc/dataloader/file_reader_base_class.py

Timestamp:

Apr 17, 2017 4:30:10 PM (8 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:

ad92c5a

Parents:

8ffafd1

git-author:

Jeff Krzywon <krzywon@…> (04/17/17 16:30:10)

git-committer:

krzywon <krzywon@…> (04/17/17 16:30:10)

Message:

Added a 4th data loader exception for generic readers that cannot open file.

File:

• src/sas/sascalc/dataloader/file_reader_base_class.py (modified) (5 diffs)

src/sas/sascalc/dataloader/file_reader_base_class.py

@@ -10 +10 @@
 from abc import abstractmethod
 from loader_exceptions import NoKnownLoaderException, FileContentsException,\
-    DataReaderException
+    DataReaderException, DefaultReaderException
 from data_info import Data1D, Data2D, DataInfo, plottable_1D, plottable_2D,\
     combine_data_info_with_plottable
@@ -47 +47 @@
         if os.path.isfile(filepath):
             basename, extension = os.path.splitext(os.path.basename(filepath))
+            self.extension = extension.lower()
             # If the file type is not allowed, return nothing
-            if extension in self.ext or self.allow_all:
+            if self.extension in self.ext or self.allow_all:
                 # Try to load the file, but raise an error if unable to.
                 try:
-                    self.unit_converter()
+                    self.load_unit_converter()
                     self.f_open = open(filepath, 'rb')
                     self.get_file_contents()
                     self.sort_one_d_data()
-                except RuntimeError:
-                    # Reader specific errors
-                    # TODO: Give a specific error.
-                    pass
+                except FileContentsException as e:
+                    self.handle_error_message(e.message)
                 except OSError as e:
                     # If the file cannot be opened
@@ -64 +63 @@
                     msg += e.message
                     self.handle_error_message(msg)
-                except Exception as e:
-                    # Handle any other generic error
-                    # TODO: raise or log?
-                    raise
                 finally:
+                    # Close the file handle if it is open
                     if not self.f_open.closed:
                         self.f_open.close()
@@ -98 +94 @@
         self.output.append(data_obj)
 
-    def unit_converter(self):
+    def load_unit_converter(self):
         """
         Generic unit conversion import 
@@ -134 +130 @@
         self.output = final_list
 
+    def set_all_to_none(self):
+        """
+        Set all mutable values to None for error handling purposes
+        """
+        self.current_dataset = None
+        self.current_datainfo = None
+        self.output = []
+
     @staticmethod
     def splitline(line):