Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow empty values in file column #177

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow empty values in file column #177

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions panoptes_cli/commands/subject_set.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,23 +318,27 @@ def validate_file(file_path):
if not upload_state['file_column']:
upload_state['file_column'] = []
for field_number, col in enumerate(row, start=1):
if not col:
continue

file_path = os.path.join(file_root, col)
if os.path.exists(file_path):
upload_state['file_column'].append(
field_number,
)
if not validate_file(file_path):
return -1
files.append(file_path)
if validate_file(file_path):
files.append(file_path)
else:
for field_number in upload_state['file_column']:
if not row[field_number - 1]:
continue

file_path = os.path.join(
file_root,
row[field_number - 1]
)
if not validate_file(file_path):
return -1
files.append(file_path)
if validate_file(file_path):
files.append(file_path)

for field_number, _mime_type in zip(
upload_state['remote_location'],
Expand Down