X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=page_video.sh;h=9e49a6fdefae7afaed27c164c335fee232e6bad0;hb=411b95e5b6135b28f79e68275e43460a8032e449;hp=587ee526f18e0b1b72d7043c990519756e02538b;hpb=abe43467796699b21501e922247c4eaf681ee273;p=rawnet diff --git a/page_video.sh b/page_video.sh index 587ee52..9e49a6f 100755 --- a/page_video.sh +++ b/page_video.sh @@ -1,95 +1,69 @@ #!/bin/sh +[ "$includepage_video" ] && return 0 +includepage_video="$0" + +. "$_EXEC/db_channel.sh" . "$_EXEC/db_video.sh" +. "$_EXEC/upload.sh" +read_channel "$channel" read_video "$video" -UPLOAD(){ - local file="$1" - local boundary line length=0 - - [ ! "${CONTENT_TYPE}" -o "${CONTENT_TYPE##multipart/form-data;*}" ] && return 1 - - boundary="${CONTENT_TYPE#*; boundary=}" - boundary="${boundary%%;*}" - - while read -r line; do - length="$(( length + ${#line} + 1))" - [ "${line%${CR}}" = "--$boundary" ] && break - done - while read -r line; do - length="$(( length + ${#line} + 1))" - [ ! "${line%${CR}}" ] && break \ - || debug "$line" - done - - printf "%i\n" "$(( CONTENT_LENGTH - length ))" >"${file}.upload" - head -c "$(( CONTENT_LENGTH - length ))" \ - | sed -nE ' - # print lines until boundary ( = actual file upload) - :FILE; p; n; - /^--'"${boundary}"'(--)?\r?$/!bFILE; - # discard remaining lines - :END; $q; n; bEND; - ' >"$file" - truncate -s $(( $(stat -c %s -- "$file") -2 )) -- "$file" - rm -- "${file}.upload" -} - [ "$REQUEST_METHOD" = POST ] && case "$(POST action)" in update_video) if [ ! "$USER_ID" ]; then - REDIRECT "${_BASE}/channel/${channel}/${video}/#ERROR_NOTLOGGEDIN" + REDIRECT "${_BASE}/channel/$CHANNEL_ID/$VIDEO_ID/#ERROR_NOTLOGGEDIN" elif ! AUTHOR; then - REDIRECT "${_BASE}/channel/${channel}/${video}/#ERROR_UPDATE_NOTALLOWED" - elif update_video "$video" "name=$(POST name)" \ + REDIRECT "${_BASE}/channel/$CHANNEL_ID/$VIDEO_ID/#ERROR_UPDATE_NOTALLOWED" + elif update_video "$VIDEO_ID" "name=$(POST name)" \ "description=$(POST description)" \ - "status=$(POST status |grep -m1 -xE 'void|private|hidden|public')" \ + "status=$(POST status |grep -m1 -xE 'private|hidden|public')" \ "uploader=$USER_ID"; then - REDIRECT "${_BASE}/channel/${channel}/${video}/#UPDATE_SUCCESS" + REDIRECT "${_BASE}/channel/$CHANNEL_ID/$VIDEO_ID/#UPDATE_SUCCESS" else - REDIRECT "${_BASE}/channel/${channel}/${video}/#ERROR_UPDATE_NOLOCK" + REDIRECT "${_BASE}/channel/$CHANNEL_ID/$VIDEO_ID/#ERROR_UPDATE_NOLOCK" fi ;; update_video_cancel) - REDIRECT "${_BASE}/channel/${channel}/${video}/#CANCELED" + REDIRECT "${_BASE}/channel/$CHANNEL_ID/$VIDEO_ID/#CANCELED" ;; delete) if [ ! "$USER_ID" ]; then - REDIRECT "${_BASE}/channel/${channel}/${video}/#ERROR_NOTLOGGEDIN" + REDIRECT "${_BASE}/channel/$CHANNEL_ID/$VIDEO_ID/#ERROR_NOTLOGGEDIN" elif ! AUTHOR; then - REDIRECT "${_BASE}/channel/${channel}/${video}/#ERROR_UPDATE_NOTALLOWED" + REDIRECT "${_BASE}/channel/$CHANNEL_ID/$VIDEO_ID/#ERROR_UPDATE_NOTALLOWED" elif [ "$(POST delconfirm)" != confirm ]; then - REDIRECT "${_BASE}/channel/${channel}/${video}/#ERROR_NOT_CONFIRMED" - elif delete_video "$video"; then - REDIRECT "${_BASE}/channel/${channel}/#DELETE_CONFIRM" + REDIRECT "${_BASE}/channel/$CHANNEL_ID/$VIDEO_ID/#ERROR_NOT_CONFIRMED" + elif delete_video "$VIDEO_ID"; then + rm -f -- "$VIDEO_FILE" "$VIDEO_THUMB" "$VIDEO_MP4" "$VIDEO_WEBM" + REDIRECT "${_BASE}/channel/$CHANNEL_ID/#DELETE_CONFIRM" else - REDIRECT "${_BASE}/channel/${channel}/${video}/#ERROR_UPDATE_NOLOCK" + REDIRECT "${_BASE}/channel/$CHANNEL_ID/$VIDEO_ID/#ERROR_UPDATE_NOLOCK" fi ;; esac -if [ "$REQUEST_METHOD" = POST -a "$channel" -a "$video" ]; then +if [ "$REQUEST_METHOD" = POST -a "$CHANNEL_ID" -a "$VIDEO_ID" ]; then if ! AUTHOR; then head -c "$CONTENT_LENGTH" >/dev/null - REDIRECT "${_BASE}/channel/${channel}/${video}/#ERROR_UPLOAD_NOTALLOWED" - elif [ "$VIDEO_STATUS" != void ]; then + REDIRECT "${_BASE}/channel/$CHANNEL_ID/$VIDEO_ID/#ERROR_UPLOAD_NOTALLOWED" + elif [ -f "$VIDEO_FILE" ]; then head -c "$CONTENT_LENGTH" >/dev/null - REDIRECT "${_BASE}/channel/${channel}/${video}/#ERROR_UPLOAD_NOCLOBBER" - elif UPLOAD "$_DATA/$channel/$video.mp4"; then - update_video "$video" status=private - VIDEO_STATUS=private + REDIRECT "${_BASE}/channel/$CHANNEL_ID/$VIDEO_ID/#ERROR_UPLOAD_NOCLOBBER" + elif UPLOAD "$VIDEO_FILE"; then + REDIRECT "${_BASE}/channel/$CHANNEL_ID/$VIDEO_ID/edit" fi fi -if [ "$channel" -a "$video" -a "$action" = edit ]; then - AUTHOR || REDIRECT "$_BASE/$channel/$video/#ERROR_EDIT_NOTALLOWED" +if [ "$CHANNEL_ID" -a "$VIDEO_ID" -a "$action" = edit ]; then + AUTHOR || REDIRECT "$_BASE/$CHANNEL_ID/$VIDEO_ID/#ERROR_EDIT_NOTALLOWED" yield_page "$VIDEO_NAME - Edit" "video edit" <<-EOF [form .video .edit method=POST - [input name="name" value="$(HTML "$VIDEO_NAME")" placeholder="Video Name"] - [fieldset .status $([ $VIDEO_STATUS = void ] && printf "disabled=disabled") - [radio "status" "private" #status_private $(checked $VIDEO_STATUS private void)] + [input name="name" value="$(HTML "$VIDEO_NAME")" placeholder="Video Name" autocomplete=off] + [fieldset .status $([ ! -f "$VIDEO_FILE" ] && printf "disabled=disabled") + [radio "status" "private" #status_private $(checked $VIDEO_STATUS private)] [label for=status_private tooltip="Video is only visible to channel authors" Private] [radio "status" "hidden" #status_hidden $(checked $VIDEO_STATUS hidden)] [label for=status_hidden tooltip="Video will not be listed but can be viewed by anyone knowing the URL" Hidden] @@ -107,96 +81,43 @@ if [ "$channel" -a "$video" -a "$action" = edit ]; then ] EOF -elif [ "$channel" -a "$video" -a "$action" = frameuploadprogress ]; then - AUTHOR || REDIRECT "$_BASE/$channel/$video/#ERROR_EDIT_NOTALLOWED" +elif [ "$CHANNEL_ID" -a "$VIDEO_ID" -a "$action" = frameuploadprogress ]; then + AUTHOR || REDIRECT "$_BASE/$CHANNEL_ID/$VIDEO_ID/#ERROR_EDIT_NOTALLOWED" printf '%s\r\n' 'Content-Type: text/html' 'Connection: close' '' - printf ' -
-