NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-24 08:25:17 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

adds csv delimiter on the form

Browse Source
This commit is contained in:
Abhimanyu Saharan 2023-08-29 23:21:18 +05:30
parent 4da93f4628
commit 81024af024
3 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
netbox/templates/generic/bulk_import.html
View File

@ -44,6 +44,7 @@ Context:
<input type="hidden" name="import_method" value="direct" />
{% render_field form.data %}
{% render_field form.format %}
{% render_field form.csv_delimiter %}
<div class="form-group">
<div class="col col-md-12 text-end">
<button type="submit" name="data_submit" class="btn btn-primary">Submit</button>

14
netbox/utilities/choices.py
View File

@ -227,3 +227,17 @@ class ImportFormatChoices(ChoiceSet):
(JSON, 'JSON'),
(YAML, 'YAML'),
]
class CSVDelimiterChoices(ChoiceSet):
AUTO = 'auto'
COMMA = ','
SEMICOLON = ';'
TAB = '\t'
CHOICES = [
(AUTO, 'Auto-detect'),
(COMMA, 'Comma'),
(SEMICOLON, 'Semicolon'),
(TAB, 'Tab'),
]

29
netbox/utilities/forms/bulk_import.py
View File

@ -7,7 +7,7 @@ from django import forms
from django.utils.translation import gettext as _
from core.forms.mixins import SyncedDataMixin
from utilities.choices import ImportFormatChoices
from utilities.choices import CSVDelimiterChoices, ImportFormatChoices
from utilities.forms.utils import parse_csv
from .mixins import BootstrapMixin
from ..choices import ImportMethodChoices
@ -31,6 +31,13 @@ class BulkImportForm(BootstrapMixin, SyncedDataMixin, forms.Form):
choices=ImportFormatChoices,
initial=ImportFormatChoices.AUTO
)
csv_delimiter = forms.ChoiceField(
choices=CSVDelimiterChoices,
initial=CSVDelimiterChoices.AUTO,
label="CSV Delimiter",
help_text=_("The character which delimits CSV fields. Applies only to CSV format."),
required=False
)
data_field = 'data'
@ -91,13 +98,21 @@ class BulkImportForm(BootstrapMixin, SyncedDataMixin, forms.Form):
Clean CSV-formatted data. The first row will be treated as column headers.
"""
# Determine the CSV dialect
try:
# This uses a rough heuristic to detect the CSV dialect. If the data is malformed, we'll fall back to
# the default Excel dialect.
dialect = csv.Sniffer().sniff(data.strip(), delimiters=',; ')
except csv.Error:
if self.cleaned_data['csv_delimiter'] == CSVDelimiterChoices.AUTO:
# Determine the CSV dialect
try:
# This uses a rough heuristic to detect the CSV dialect. If the data is malformed, we'll fall back to
# the default Excel dialect.
dialect = csv.Sniffer().sniff(
data.strip(), delimiters=''.join(
[CSVDelimiterChoices.COMMA, CSVDelimiterChoices.SEMICOLON, CSVDelimiterChoices.TAB]
)
)
except csv.Error:
dialect = csv.excel
else:
dialect = csv.excel
dialect.delimiter = self.cleaned_data['csv_delimiter']
stream = StringIO(data.strip())
reader = csv.reader(stream, dialect=dialect)