Update generic to work with source FileUploadHistory

valdergallo · Jan 20, 2015 · cba1a67 · cba1a67
1 parent 4d494d0
commit cba1a67
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/data_importer/importers/base.py b/data_importer/importers/base.py
@@ -28,7 +28,7 @@ def __new__(cls, **kargs):
             cls.Meta = objclass2dict(cls.Meta)
         return super(BaseImporter, cls).__new__(cls)
 
-    def __init__(self, source=None):
+    def __init__(self, source=None, *args, **kwargs):
         self._fields = []
         self._error = []
         self._cleaned_data = ()

diff --git a/data_importer/importers/generic.py b/data_importer/importers/generic.py
@@ -19,7 +19,7 @@ def set_reader(self):
         # default importers configurations
         extra_values = {
             'xlsx': {'user_iterator': True, 'data_only': True},
-            'xls': {'sheet_by_name': self.Meta.sheet_name or None, 'sheet_by_index': self.Meta.sheet_index or 0},
+            'xls': {'sheet_name': self.Meta.sheet_name or None, 'sheet_index': self.Meta.sheet_index or 0},
             'csv': {'delimiter': self.Meta.delimiter or ';'},
             'xml': {},
         }
@@ -49,12 +49,15 @@ def get_source_file_extension(self):
         """
         Gets the source file extension. Used to choose the right reader
         """
-        if hasattr(self.source, 'file'):
-            filename = self.source.file.name  # DataImporter.FileHistory instances
+        if hasattr(self.source, 'file') and hasattr(self.source.file, 'name'):
+            filename = self.source.file.name # File instances
         elif hasattr(self.source, 'file_upload'):
-            filename = self.source.file_upload.name  # Default Python opened file
+            if hasattr(self.source.file_upload, 'name'):
+                filename = self.source.file_upload.name  # Default DataImporter.models.FileUploadHistory
+            else:
+                filename = self.source.file_upload
         elif hasattr(self.source, 'name'):
-            filename = self.source.name
+            filename = self.source.name  # Default filename
         else:
             filename = self.source
 

diff --git a/data_importer/importers/xls_importer.py b/data_importer/importers/xls_importer.py
@@ -14,4 +14,5 @@ def set_reader(self):
         sheet_by_name = self.Meta.sheet_name or None
         sheet_by_index = self.Meta.sheet_index or 0
 
-        self._reader = XLSReader(self, sheet_by_name, sheet_by_index)
+        self._reader = XLSReader(self, sheet_name=sheet_by_name, sheet_index=sheet_by_index)
+