Commit b663d3a6 authored by Dimitri Podborski's avatar Dimitri Podborski
Browse files

small bugfixes

parent 9586a453
...@@ -183,7 +183,7 @@ def create_output_doc(csv_path, gitlab_projects, input_docs, template_path): ...@@ -183,7 +183,7 @@ def create_output_doc(csv_path, gitlab_projects, input_docs, template_path):
def parse_csv(csv_file, projects, docs): def parse_csv(csv_file, projects, docs):
issues = [] issues = []
with open(csv_file, 'r', encoding='utf-8-sig') as f: with open(csv_file, 'r', encoding='utf-8-sig') as f:
sample = f.read(1024) sample = f.readline()
f.seek(0) f.seek(0)
dialect = csv.Sniffer().sniff(sample) # find out the delimeter type dialect = csv.Sniffer().sniff(sample) # find out the delimeter type
has_header = csv.Sniffer().has_header(sample) has_header = csv.Sniffer().has_header(sample)
...@@ -210,13 +210,16 @@ def parse_csv(csv_file, projects, docs): ...@@ -210,13 +210,16 @@ def parse_csv(csv_file, projects, docs):
sys.exit(-1) sys.exit(-1)
for row in reader: for row in reader:
# skip empty lines
if len(' '.join(row).strip()) == 0:
continue
project_url_or_path = None project_url_or_path = None
# try URL first # try URL first
if project_url_idx is not None: if project_url_idx is not None:
if len(row[project_url_idx]) > 0: if len(row[project_url_idx]) > 0:
project_url_or_path = row[project_url_idx] project_url_or_path = row[project_url_idx]
# If URL failed, try subgroup/projectname # If URL failed, try subgroup/projectname
if project_url_or_path is None: if project_url_or_path is None and subgroup_idx is not None and project_name_idx is not None:
if len(row[subgroup_idx]) > 0 and len(row[project_name_idx]) > 0: if len(row[subgroup_idx]) > 0 and len(row[project_name_idx]) > 0:
project_url_or_path = row[subgroup_idx] + '/' + row[project_name_idx] project_url_or_path = row[subgroup_idx] + '/' + row[project_name_idx]
project = helpers.find_project(projects, project_url_or_path) project = helpers.find_project(projects, project_url_or_path)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment