X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=page_video.sh;h=9e49a6fdefae7afaed27c164c335fee232e6bad0;hb=1cd4a538ca3b1c53a865977dc532187302716f90;hp=28061c2e18f458aa32ae8d9ab6badb7ba05dc21a;hpb=74cc921e6bcc52387f4e652f0d95f67eb9edfd50;p=rawnet

diff --git a/page_video.sh b/page_video.sh
index 28061c2..9e49a6f 100755
--- a/page_video.sh
+++ b/page_video.sh
@@ -1,65 +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"
 
 [ "$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}/${video}/edit"
+    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]
@@ -77,29 +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' ''
   frame_uploadprogress
 
-elif [ "$channel" -a "$video" ]; then
-  [ $VIDEO_STATUS = public -o $VIDEO_STATUS = hidden ] || AUTHOR || { . ${_EXEC}/page_404.sh; exit 0; }
-
+elif [ "$CHANNEL_ID" -a "$VIDEO_ID" -a ! -f "$VIDEO_FILE" ] && AUTHOR; then
   yield_page "$VIDEO_NAME" "video" <<-EOF
 	[nav [a href="../../" Channels] - [a href="../" $(HTML "${CHANNEL_NAME:-(Unnamed Channel)}")] - [span $(HTML "${VIDEO_NAME:-(Unnamed Video)}")]]
-	$( AUTHOR && [ $VIDEO_STATUS = void ] && printf '
         [iframe src="frameuploadprogress" width="100%%" height="50"
 	  [a href="freameuploadprogress" Iframe: Upload progress]
 	]
 	[form .upload method=POST enctype="multipart/form-data"
 	  [input type=file name=upload]
 	  [submit "action" "video_upload" Upload]
-	]')
-	$( [ $VIDEO_STATUS != void ] && printf '
-	[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"
-        )
+	]
+	[a .button href="edit" edit]
+	[h1 .name $(HTML "$VIDEO_NAME")]
+	[div .description . ${VIDEO_DESCR_CACHE}]
+	EOF
+
+elif [ "$CHANNEL_ID" -a "$VIDEO_ID" -a -f "$VIDEO_FILE" ]; 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)}")]]
+	[video preload=none controls=controls width="$VIDEO_RESX" height="$VIDEO_RESY"
+	$([ -f "$VIDEO_MP4" ] \
+	  && printf '[source src="%s/video/%s/%s.mp4"  type="video/mp4"]' \
+	            "$_BASE" "$CHANNEL_ID" "$VIDEO_ID"
+	  [ -f "$VIDEO_WEBM" ] \
+	  && printf '[source src="%s/video/%s/%s.webm" type="video/webm"]' \
+	            "$_BASE" "$CHANNEL_ID" "$VIDEO_ID"
+	  [ ! -f "$VIDEO_MP4" -a ! -f "$VIDEO_WEBM" ] \
+	  && printf '[source src="%s/video/%s/%s.upload.mp4"  type="video/mp4"] %s' \
+	            "$_BASE" "$CHANNEL_ID" "$VIDEO_ID" \
+                    "The video has not yet been transcoded and may not be displayed correctly."
+        )]
 	$(AUTHOR && printf '[a .button href="edit" edit]')
 	[h1 .name $(HTML "$VIDEO_NAME")]
 	[div .description . ${VIDEO_DESCR_CACHE}]