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

feat(sipi): add storing of original and sidecar (DSP-1318) #1808

Merged
merged 8 commits into from Feb 5, 2021

Conversation

@lrosenth
Copy link
Contributor

@lrosenth lrosenth commented Feb 1, 2021

resolves DSP-1318. The changed lua scripts now preserve the original uploaded file and create a sidecar file that contains the original filename, derivative filename and SHA256-checksums.

In SIPI "knora.json" has been changed to read the sidecar file if available and return also the original filename for non-image files. This the original filename can be preserved on the dsp-api backend

DSP-API now returns a URL ending in /file as the object of knora-api:fileValueAsUrl for non-image files.

@lrosenth lrosenth added the enhancement label Feb 1, 2021
@lrosenth lrosenth requested review from subotic and benjamingeer Feb 1, 2021
@lrosenth lrosenth self-assigned this Feb 1, 2021
@subotic subotic changed the title Wip/dsp 1318 lua original and sidecar feat(sipi): add storing of original and sidecar (DSP-1318) Feb 2, 2021
subotic added 2 commits Feb 2, 2021
@subotic
Copy link
Collaborator

@subotic subotic commented Feb 4, 2021

@benjamingeer I've updated the Sipi version.

@subotic
Copy link
Collaborator

@subotic subotic commented Feb 5, 2021

@benjamingeer would you maybe have a bit of time today to work on this PR?

@benjamingeer
Copy link
Collaborator

@benjamingeer benjamingeer commented Feb 5, 2021

@subotic I've been working on it this morning, it's almost done.

benjamingeer added 2 commits Feb 5, 2021
# Conflicts:
#	webapi/src/main/scala/org/knora/webapi/messages/util/ValueUtilV1.scala
#	webapi/src/main/scala/org/knora/webapi/messages/v1/responder/valuemessages/ValueMessagesV1.scala
#	webapi/src/main/scala/org/knora/webapi/responders/v1/ResourcesResponderV1.scala
Copy link
Collaborator

@benjamingeer benjamingeer left a comment

Thanks very much, I think this is good to merge now.

@benjamingeer benjamingeer merged commit 022ed7e into main Feb 5, 2021
11 checks passed
11 checks passed
Build Everything
Details
Prepare next release
Details
Test client-test-data
Details
API Unit Tests
Details
API E2E Tests
Details
API Integration Tests
Details
Upgrade Integration Tests
Details
Docs Build Test
Details
Publish (on release only)
Details
Deploy docs (on release only)
Details
Google chat notification about release and published version
Details
@benjamingeer benjamingeer deleted the wip/DSP-1318-lua-original-and-sidecar branch Feb 5, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants