"$(printf %s "${description-$(UNSTRING "$DESCRIPTION")}" |markdown |STRING)" \
"${FUTUREUSE:-\\}"
else
- printf '%s %s %s %i %i %i %s %s %s %i %s %s\n' \
+ printf '%s %s %s %i %i %f %s %s %s %i %s %s\n' \
"$ID" "$NAME" "$DESCRIPTION" "$RESX" "$RESY" "$LENGTH" \
"$COVER" "$STATUS" "$UPLOADER" "$HITS" "$DESCR_CACHE" \
"$FUTUREUSE"
UPLOAD(){
local file="$1"
- local boundary line last
- local CONTENT_TYPE="$(HEADER Content-Type)"
+ local boundary line length=0
[ ! "${CONTENT_TYPE}" -o "${CONTENT_TYPE##multipart/form-data;*}" ] && return 1
boundary="${CONTENT_TYPE#*; boundary=}"
boundary="${boundary%%;*}"
- head -c "$CONTENT_LENGTH" \
+ 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 '
- /^--'"${boundary}"'\r?$/!b;
- :A; n;
- /^\r?$/!bA;
- n;
- :FILE
- p; n;
+ # print lines until boundary ( = actual file upload)
+ :FILE; p; n;
/^--'"${boundary}"'(--)?\r?$/!bFILE;
- :END
- $q; n; bEND;
+ # 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_cancel)
REDIRECT "${_BASE}/channel/${channel}/${video}/#CANCELED"
;;
+ delete)
+ if [ ! "$USER_ID" ]; then
+ REDIRECT "${_BASE}/channel/${channel}/${video}/#ERROR_NOTLOGGEDIN"
+ elif ! AUTHOR; then
+ REDIRECT "${_BASE}/channel/${channel}/${video}/#ERROR_UPDATE_NOTALLOWED"
+ elif [ "$(POST delconfirm)" != confirm ]; then
+ REDIRECT "${_BASE}/channel/${channel}/${video}/#ERROR_NOT_CONFIRMED"
+ elif LOCK "$vid_db"; then
+ while read -r id tail; do
+ [ "$id" != "$video" ] && printf '%s %s\n' "$id" "$tail"
+ done <"$vid_db" >"${vid_db}.$$"
+ mv -- "${vid_db}.$$" "$vid_db"
+ rm -- "${_DATA}/${channel}/${video}.mp4" "${_DATA}/${channel}/${video}_thumb.jpg"
+ RELEASE "$vid_db"
+ REDIRECT "${_BASE}/channel/${channel}/#DELETE_CONFIRM"
+ else
+ REDIRECT "${_BASE}/channel/${channel}/${video}/#ERROR_UPDATE_NOLOCK"
+ fi
+ ;;
esac
if [ "$REQUEST_METHOD" = POST -a "$channel" -a "$video" ]; 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" "$VIDEO_NAME" "$VIDEO_DESCRIPTION" 0 0 0 \
- "$VIDEO_COVER" private "$VIDEO_UPOADER" "$VIDEO_HITS" \
- "" ""
+ update_video "$video" status=private
+ VIDEO_STATUS=private
fi
fi
[textarea name="description" placeholder="Description" . $(HTML "$VIDEO_DESCRIPTION")]
[submit "action" "update_video" . Update]
[submit "action" "update_video_cancel" . Cancel]
+ [fieldset .delete
+ [checkbox "delconfirm" "confirm" id="delconfirm"]
+ [label for=delconfirm Delete Video]
+ [submit "action" "delete" Delete Video]
+ ]
]
EOF
+
+elif [ "$channel" -a "$video" -a "$action" = frameuploadprogress ]; then
+ AUTHOR || REDIRECT "$_BASE/$channel/$video/#ERROR_EDIT_NOTALLOWED"
+ printf '%s\r\n' 'Content-Type: text/html' 'Connection: close' ''
+ printf '<!DOCTYPE HTML>
+ <html><head>
+ <title>Upload Progress</title>
+ <style type="text/css"><!--
+ body {
+ text-align: center;
+ }
+ .progress {
+ display: block;
+ position: absolute;
+ width: 20em;
+ background-color: #FFF;
+ border: 1pt solid;
+ border-radius: 4pt;
+ height: 1.25em;
+ }
+ .progress .bar {
+ display: block;
+ position: absolute;
+ left: 0; top: 0; bottom: 0;
+ background-color: #666;
+ }
+ .progress .count {
+ display: block;
+ position: absolute;
+ left: 0; top: 0; right: 0; bottom: 0;
+ line-height: 1.375em;
+ }
+ --></style>
+ </head><body>
+ '
+ printf '<div class=progress><div class=bar style="width: 0%%;"></div><div class=count>%i / %i</div></div>\n' 0 0
+ while [ ! -f "$_DATA/$channel/$video.mp4" -a \
+ ! -f "$_DATA/$channel/$video.mp4.upload" ]; do sleep 1; done
+ read size <"$_DATA/$channel/$video.mp4.upload"
+ while [ -f "$_DATA/$channel/$video.mp4.upload" ]; do
+ stat="$(stat -c %s "$_DATA/$channel/$video.mp4" 2>&-)"
+ printf '<div class=progress><div class=bar style="width:%i%%;"></div><div class=count>%iMB / %iMB</div></div>\n' \
+ "$(( stat * 100 / size ))" "$((stat / 1048576))" "$((size / 1048576))"
+ sleep 1
+ done
+ printf '<span class=progress><div class=bar style="width:100%%;"></div><div class=count>Ready!</div></span>\n'
+ printf '</body></html>'
+
+elif [ "$channel" -a "$video" -a "$action" = frameupload ]; then
+ AUTHOR || REDIRECT "$_BASE/$channel/$video/#ERROR_EDIT_NOTALLOWED"
+ printf '%s\r\n' 'Content-Type: text/html' ''
+ [ "$VIDEO_STATUS" = void ] && "$_EXEC"/cgilite/html-sh.sed <<-EOF
+ [!DOCTYPE HTML]
+ [html [head
+ [title Upload Form]
+ ][body
+ [form .upload method=POST enctype="multipart/form-data"
+ [input type=file name=upload]
+ [submit "action" "video_upload" Upload]
+ ]
+ ]]
+ EOF
+ [ "$VIDEO_STATUS" != void ] && "$_EXEC"/cgilite/html-sh.sed <<-EOF
+ [!DOCTYPE HTML]
+ [html [head
+ [title Upload Form]
+ ][body
+ [a href="./" target="_parent" . Reload Page!]
+ ]]
+ EOF
+
elif [ "$channel" -a "$video" ]; then
[ $VIDEO_STATUS = public -o $VIDEO_STATUS = hidden ] || AUTHOR || { . ${_EXEC}/page_404.sh; exit 0; }
yield_page "$VIDEO_NAME" "video" <<-EOF
- [nav [a href="../../" Channels] - [a href="../" $(HTML "${CHANNEL_NAME:-(Unnamed Channel)}")] - [span $(HTML "${VIDEO_NAME:-(Unnamed Video)}")]
- $(AUTHOR && printf ' - [a href="edit" edit]')
- ]
+ [nav [a href="../../" Channels] - [a href="../" $(HTML "${CHANNEL_NAME:-(Unnamed Channel)}")] - [span $(HTML "${VIDEO_NAME:-(Unnamed Video)}")]]
$( AUTHOR && [ $VIDEO_STATUS = void ] && printf '
- [form .upload method=POST enctype="multipart/form-data"
- [input type=file name=upload]
- [submit "action" "video_upload" Upload]
+ [iframe src="frameuploadprogress" width="100%%" height="50"
+ [a href="freameuploadprogress" Iframe: Upload progress]
+ ]
+ [iframe src="frameupload" width="100%%" height="50"
+ [form .upload method=POST enctype="multipart/form-data"
+ [input type=file name=upload]
+ [submit "action" "video_upload" Upload]
+ ]
]')
$( [ $VIDEO_STATUS != void ] && printf '
- [video
- [source src="%s/video/%s/%s.mp4"]
- ]' "$_BASE" "$channel" "$video"
+ [video preload=none controls=controls width=%i height=%i
+ [source src="%s/video/%s/%s.mp4" type="video/mp4"]
+ ]' "$VIDEO_RESX" "$VIDEO_RESY" "$_BASE" "$channel" "$video"
)
+ $(AUTHOR && printf '[a .button href="edit" edit]')
[h1 .name $(HTML "$VIDEO_NAME")]
[div .description . ${VIDEO_DESCR_CACHE}]
EOF
+
else
. "$_EXEC/page_404.sh"
fi
projects / rawnet / blobdiff