inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-16 20:15:44 +00:00
Code Activity

Fixed import for excel formats

Browse Source
This commit is contained in:
eeintech
2021-05-11 14:06:38 -04:00
parent a093118856
commit ba561d6d19
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
InvenTree/common/files.py
View File

@ -49,28 +49,27 @@ class FileManager:
cleaned_data = None
ext = os.path.splitext(file.name)[-1].lower()
ext = os.path.splitext(file.name)[-1].lower().replace('.', '')
if ext in ['.csv', '.tsv', ]:
if ext in ['csv', 'tsv', ]:
# These file formats need string decoding
raw_data = file.read().decode('utf-8')
# Reset stream position to beginning of file
file.seek(0)
elif ext in ['.xls', '.xlsx', '.json', '.yaml', ]:
elif ext in ['xls', 'xlsx', 'json', 'yaml', ]:
raw_data = file.read()
# Reset stream position to beginning of file
file.seek(0)
else:
raise ValidationError(_(f'Unsupported file format: {ext}'))
raise ValidationError(_(f'Unsupported file format: {ext.upper()}'))
try:
cleaned_data = tablib.Dataset().load(raw_data)
cleaned_data = tablib.Dataset().load(raw_data, format=ext)
except tablib.UnsupportedFormat:
raise ValidationError(_('Error reading file (invalid format)'))
except tablib.core.InvalidDimensions:
raise ValidationError(_('Error reading file (incorrect dimension)'))
except KeyError:
# TODO: Find fix for XLSX format as it keeps on returning a KeyError
raise ValidationError(_('Error reading file (data could be corrupted)'))
return cleaned_data
@ -209,6 +208,8 @@ class FileManager:
data[idx] = int(item)
except ValueError:
pass
except TypeError:
data[idx] = ''
# Skip empty rows
if empty: