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

Jump to bottom

Metadata parameters #8

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Metadata parameters #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bce0e0f
add metadata options
KatamariJr Aug 26, 2021
505fecd
update readme with new usage
KatamariJr Aug 26, 2021
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
5 changes: 5 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ Options:
> default: 1
-H HEADER Set additional header.
-r Reuploads given file from the beginning.
-n Add the filename to the Upload-Metadata.
-m Append Upload-Metadata key-value pairs. Values
must be in form of "key base64value,key base64value".
Values can be omitted for a key. Values MUST
be base64 encoded.
-h Shows usage.

➤ https://tus.io/protocols/resumable-upload.html
Expand Down
26 changes: 23 additions & 3 deletions bin/tus
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ set -e

: ${TUSD:=""}
: ${TUS_HEADERS:=''}
: ${TUS_METADATA:=''}
export TUS_CHUNK_SIZE=${TUS_CHUNK_SIZE:-1048576}
export TUS_PARALLEL=${TUS_PARALLEL:-1}

Expand Down Expand Up @@ -38,6 +39,11 @@ Options:
> default: 1
-H HEADER Set additional header.
-r Reuploads given file from the beginning.
-n Add the filename to the Upload-Metadata.
Copy link
Owner

Choose a reason for hiding this comment

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

This would be a breaking change as the default behaviour atm is that the name is auto appended. Problem?

-m Append Upload-Metadata key-value pairs. Values
must be in form of "key base64value,key base64value".
Values can be omitted for a key. Values MUST
be base64 encoded.
-h Shows usage.

EOTXT
Expand Down Expand Up @@ -94,6 +100,12 @@ function tus_create {
for header in "${@}"; do
tus_headers+=(-H "${header}")
done

#append the filename to metadata if requested
if [ ${METADATA_NAME} -eq 1 ]
then
TUS_METADATA+=",name $(basename "${file}" | tr -d '\n' | base64)"
fi

# Apparently 'Location: ..' is terminated by CRLF. grep and awk faithfully
# preserve the line ending, and the shell's $() substitution strips off the
Expand All @@ -109,7 +121,7 @@ function tus_create {
--header "Tus-Resumable: 1.0.0" \
--header "Content-Length: 0" \
--header "Upload-Length: ${size}" \
--header "Upload-Metadata: name $(basename "${file}" | tr -d '\n' | base64)" \
--header "Upload-Metadata: ${TUS_METADATA}" \
--header "Connection: close" \
${TUSD} | grep 'Location:' | awk '{print $2}' | tr -d '\015' 1> $tus_location 2>&1 &
return $?
Expand Down Expand Up @@ -170,6 +182,7 @@ function tus_upload {
# TODO unhandled error codes
# - 409: mismatched offset
# - 423: file currently locked
# - 500: server error
function tus_complete {
local file="${1}"
local dest="${2}"
Expand Down Expand Up @@ -201,7 +214,7 @@ function tus_concat {
--header "Tus-Resumable: 1.0.0" \
--header "Content-Length: 0" \
--header "Upload-Concat: final;$(strip-domain "${TUSD}" "${@}")" \
--header "Upload-Metadata: name $(basename "${file}" | tr -d '\n' | base64)" \
--header "Upload-Metadata: ${TUS_METADATA}" \
--header "Connection: close" \
${TUSD} | grep 'Location:' | awk '{print $2}' | tr -d '\015' 1> $tus_location 2>&1 &
echo $?
Expand Down Expand Up @@ -229,12 +242,19 @@ trap cleanup EXIT
IFS=',' read -r -a TUS_HEADERS <<< "${TUS_HEADERS}"
OPT_RESET=0
OPT_OPTIONS=0
while getopts ohrc:p:H:t: opt
METADATA_NAME=0
while getopts ohrnc:p:H:t:m: opt
do
case "${opt}" in
t)
TUSD="${OPTARG}"
;;
m)
TUS_METADATA+="${OPTARG}"
;;
n)
METADATA_NAME=1
;;
c)
[ -z "${OPTARG}" ] || echo "${OPTARG}" | grep -vq '^[[:digit:]]*$' \
&& usage
Expand Down