feat(sipi): upload video support (DEV-771 / DEV-207) #1952
Conversation
# Conflicts: # third_party/versions.bzl
…dasch-swiss/dsp-api into wip/dev-25-upload-video-support
…dasch-swiss/dsp-api into wip/dev-25-upload-video-support
|
Kudos, SonarCloud Quality Gate passed!
|
kilchenmann
added
enhancement
kilchenmann
changed the title
| sipi/images/1111/* | ||
| sipi/images/originals/1111/* |
There was a problem hiding this comment.
I'm wondering if we shouldn't ignore all things here, and explicitly un-ignore what we want to have?
There was a problem hiding this comment.
Should we define it in a separate task. Because for me it's not clear, which folder should be kept and maybe it has to be discussed.
| :subjectClassConstraint :MovingImageFileValue ; | ||
| :subjectClassConstraint :FileValue ; |
There was a problem hiding this comment.
why was this changed? IMO, fps should only exist on moving images, not generally on files
There was a problem hiding this comment.
I think @subotic changed it. Because we no longer store the necessary moving image metadata such as width, height, duration and fps in the database. We get this information from the sidecar file from sipi.
| # check the outpath for the matrix files; | ||
| # if exists, delete it and create new | ||
| # if [ -d "matrix" ] | ||
| # then | ||
| # rm -rf ./matrix | ||
| # fi | ||
| # mkdir -p 'matrix' |
There was a problem hiding this comment.
this can probably be removed, right?
sipi/scripts/sh.lua
Outdated
| end | ||
| }) | ||
|
|
||
| return M |
There was a problem hiding this comment.
missing newline at end of file
| -- | ||
| -- json.lua | ||
| -- | ||
| -- Copyright (c) 2020 rxi | ||
| -- | ||
| -- Permission is hereby granted, free of charge, to any person obtaining a copy of | ||
| -- this software and associated documentation files (the "Software"), to deal in | ||
| -- the Software without restriction, including without limitation the rights to | ||
| -- use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies | ||
| -- of the Software, and to permit persons to whom the Software is furnished to do | ||
| -- so, subject to the following conditions: | ||
| -- | ||
| -- The above copyright notice and this permission notice shall be included in all | ||
| -- copies or substantial portions of the Software. | ||
| -- | ||
| -- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| -- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| -- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| -- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| -- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| -- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| -- SOFTWARE. | ||
| -- |
There was a problem hiding this comment.
is it normal in lua world, that we have to include 3rd party scripts as such in our repo?
There was a problem hiding this comment.
I had to add this json script to handle the sidecar file (convert and read).
| #!/bin/bash | ||
|
|
||
| # Export moving image frames for preview in search results and on timeline | ||
| # Author: André Kilchenmann, a.kilchenmann@unibas.ch |
There was a problem hiding this comment.
Should we have the author here? In all other scripts we always just used the licence in the top part of the file.
There was a problem hiding this comment.
I forgot to remove it. Resolved in 60f7cec
sipi/scripts/sh.lua
Outdated
| @@ -0,0 +1,108 @@ | |||
| local M = {} | |||
There was a problem hiding this comment.
Normally, we have the licence on top of lua scripts:
-- * Copyright © 2021 - 2022 Swiss National Data and Service Center for the Humanities and/or DaSCH Service Platform contributors.
-- * SPDX-License-Identifier: Apache-2.0
There was a problem hiding this comment.
Yes, but this file was not written by us, just downloaded from somewhere. But to be honest, I think it's no longer needed. Maybe a remnant from testing the video upload.
File removed in 0a7dab5
sipi/scripts/upload.lua
Outdated
| -- Write sidecar file | ||
| function write_sidecar_file() | ||
|
|
||
|
|
||
| end |
There was a problem hiding this comment.
I know almost nothing about lua but this seems like an empty function. Is it correct?
sipi/scripts/upload.lua
Outdated
| fps = fps | ||
| } | ||
|
|
||
| -- TODO: similar setup for audio files; get duration with ffprobe and write extended sidecar data |
There was a problem hiding this comment.
Should this be kept here? Is there a JIRA issue defined for this task or how do we remember to actually do it?
There was a problem hiding this comment.
This is the question. I've created a new subtask DEV-770
Co-authored-by: Balduin Landolt <33053745+BalduinLandolt@users.noreply.github.com>
Co-authored-by: irinaschubert <irina.schubert@dasch.swiss>
Co-authored-by: irinaschubert <irina.schubert@dasch.swiss>
…dasch-swiss/dsp-api into wip/dev-25-upload-video-support
kilchenmann
changed the title
|
Kudos, SonarCloud Quality Gate passed!
|
resolves DEV-771 and DEV-207