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.

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

Add layer + mag dir to wkw uploads if missing #5285

Merged
merged 6 commits into from
Mar 22, 2021
Merged

Add layer + mag dir to wkw uploads if missing #5285

merged 6 commits into from
Mar 22, 2021

Conversation

fm3
Copy link
Member

@fm3 fm3 commented Mar 16, 2021

When a user uploads wkw-converted data directly, that is not in a layer directory or not even in a mag directory, the back-end now automatically adds those to the path.

A risk to this method is that layers called 1, 1-1-1 or z0 etc would be mistaken for mags/bucket paths and this would trigger wrongly. But I’ll assume this will rarely be the case.

URL of deployed dev instance (used for testing):

Steps to test:

  • upload only parts of the dataset
  • should be moved (console logging), and viewable after import

Issues:


@fm3 fm3 self-assigned this Mar 16, 2021
@fm3 fm3 changed the title [WIP] Add layer / mag dir to wkw uploads if missing Add layer / mag dir to wkw uploads if missing Mar 16, 2021
@fm3 fm3 changed the title Add layer / mag dir to wkw uploads if missing Add layer + mag dir to wkw uploads if missing Mar 16, 2021
@fm3 fm3 marked this pull request as ready for review March 16, 2021 11:52
@fm3 fm3 requested a review from youri-k March 16, 2021 11:53
Copy link
Contributor

@youri-k youri-k left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM :shipit:

While testing, I stumbled across this typo: https://github.com/scalableminds/webknossos/blob/upload-wkw-dir/frontend/javascripts/admin/dataset/dataset_add_view.js#L99
Would you mind including a fix for this?

@fm3 fm3 enabled auto-merge (squash) March 22, 2021 07:36
@fm3 fm3 merged commit ac169fb into master Mar 22, 2021
@fm3 fm3 deleted the upload-wkw-dir branch May 3, 2021 13:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Dataset upload: add default layer name and mag if not present
2 participants