For progress frame use chunked encoding instead of long poll

[rawnet] / page_video.sh

diff --git a/page_video.sh b/page_video.sh
index 9e49a6fdefae7afaed27c164c335fee232e6bad0..3215bbb30d7a57237868eea8b617df14ab52774b 100755 (executable)
--- a/page_video.sh
+++ b/page_video.sh
@@ -6,6 +6,7 @@ includepage_video="$0"
 . "$_EXEC/db_channel.sh"
 . "$_EXEC/db_video.sh"
 . "$_EXEC/upload.sh"
+. "$_EXEC/transcoding.sh"
 
 read_channel "$channel"
 read_video "$video"
@@ -36,7 +37,8 @@ read_video "$video"
     elif [ "$(POST delconfirm)" != confirm ]; then
       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"
+      rm -f -- "$VIDEO_FILE" "$VIDEO_THUMB" "$VIDEO_MP4" "$VIDEO_WEBM" \
+               "${VIDEO_MP4%.mp4}".*.mp4 "${VIDEO_WEBM%.webm}".*.webm
       REDIRECT "${_BASE}/channel/$CHANNEL_ID/#DELETE_CONFIRM"
     else
       REDIRECT "${_BASE}/channel/$CHANNEL_ID/$VIDEO_ID/#ERROR_UPDATE_NOLOCK"
@@ -52,6 +54,7 @@ if [ "$REQUEST_METHOD" = POST -a "$CHANNEL_ID" -a "$VIDEO_ID" ]; then
     head -c "$CONTENT_LENGTH" >/dev/null
     REDIRECT "${_BASE}/channel/$CHANNEL_ID/$VIDEO_ID/#ERROR_UPLOAD_NOCLOBBER"
   elif UPLOAD "$VIDEO_FILE"; then
+    transcode "$VIDEO_FILE"
     REDIRECT "${_BASE}/channel/$CHANNEL_ID/$VIDEO_ID/edit"
   fi
 fi
@@ -83,7 +86,6 @@ if [ "$CHANNEL_ID" -a "$VIDEO_ID" -a "$action" = edit ]; then
 
 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' ''
   frame_uploadprogress
 
 elif [ "$CHANNEL_ID" -a "$VIDEO_ID" -a ! -f "$VIDEO_FILE" ] && AUTHOR; then
@@ -118,6 +120,24 @@ elif [ "$CHANNEL_ID" -a "$VIDEO_ID" -a -f "$VIDEO_FILE" ]; then
                    "$_BASE" "$CHANNEL_ID" "$VIDEO_ID" \
                     "The video has not yet been transcoded and may not be displayed correctly."
         )]
+       $([ ! -f "$VIDEO_MP4" -a ! -f "$VIDEO_WEBM" ] && {
+         read file <"$_DATA/transcoding.queue" 
+         if [ "$file" = "$VIDEO_FILE" ]; then
+           printf '[div .transcoding . This video is currently being
+                   converted to various publishing formats. It may not be
+                   rendered correctly until the conversion is finished.]'
+         elif grep -qFx "$VIDEO_FILE" "${_DATA}/transcoding.queue"; then
+           printf '[div .transcoding . This video is not yet converted to a
+                   suitable publishing format. It may not be rendered
+                   correctly until the conversion is finished. The conversion
+                   will start automatically once previous jobs have been
+                   finished.]'
+         else
+           printf '[div .transcoding Publishing formats do not seem to be
+                   available for this video. It may be possible that the
+                   uploaded file is broken and cannot be transcoded.]'
+         fi
+       })
        $(AUTHOR && printf '[a .button href="edit" edit]')
        [h1 .name $(HTML "$VIDEO_NAME")]
        [div .description . ${VIDEO_DESCR_CACHE}]