X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=page_video.sh;h=9e49a6fdefae7afaed27c164c335fee232e6bad0;hb=411b95e5b6135b28f79e68275e43460a8032e449;hp=ef9a82edc3f8a5c4a881fd23761661b521d1ab88;hpb=8d0b3c5e1934c4bb2a3a5dbd9e0a14ab4efa438b;p=rawnet

diff --git a/page_video.sh b/page_video.sh
old mode 100644
new mode 100755
index ef9a82e..9e49a6f
--- a/page_video.sh
+++ b/page_video.sh
@@ -1,94 +1,128 @@
 #!/bin/sh
 
-if [ "$video" -a -f "$vid_db" -a -r "$vid_db" ]; then
-  read -r VIDEO_ID VIDEO_NAME VIDEO_DESCRIPTION VIDEO_RESX VIDEO_RESY \
-          VIDEO_LENGTH VIDEO_COVER VIDEO_STATUS VIDEO_UPLOADER VIDEO_HITS \
-          VIDEO_DESCR_CACHE VIDEO_FUTUREUSE <<-EOF
-	$(grep "^${video}	" "${vid_db}")
-	EOF
-  if [ "$VIDEO_ID" ]; then
-           VIDEO_NAME="$(UNSTRING "$VIDEO_NAME")"
-    VIDEO_DESCRIPTION="$(UNSTRING "$VIDEO_DESCRIPTION")"
-    VIDEO_DESCR_CACHE="$(UNSTRING "$VIDEO_DESCR_CACHE")"
-  else
-    video=''
-  fi
-fi
+[ "$includepage_video" ] && return 0
+includepage_video="$0"
 
-# Video
-# ID	NAME	DESCRIPTION	RESX	RESY	LENGTH	COVER	STATUS (void|private|hidden|public)	UPLOADER	HITS	DESCR_CACHE	FUTUREUSE
-
-update_video(){
-  local id="${1}" name="${2}" description="${3}" resx="${4}" resy="${5}" \
-        length="${6}" cover="${7}" status="${8}" uploader="${9}" \
-        hits="${10}" descr_cache="${11}" futureuse="${12}"
-  local ID INFO
-
-  if LOCK "$vid_db"; then
-    while read -r ID INFO; do
-      if [ "$id" = "$ID" ]; then
-                # ID	NAME	DESCRIPTION RESX RESY	LENGTH	COVER	STATUS	UPLOADER HITS	DESCR_CACHE	FUTUREUSE
-        printf '%s	%s	%s	%i	%i	%i	%s	%s	%s	%i	%s	%s\n' \
-               "$id" "$(STRING "$name")" "$(STRING "$description")" "$resx" "$resy" "$length" \
-               "$(STRING "$cover")" "${status:-void}" "${uploader:-\\}" "$hits" \
-               "$(printf %s "$description" |markdown |STRING)" "${futureuse:-\\}"
-      else
-        printf '%s	%s\n' "$ID" "$INFO"
-      fi
-    done <"$vid_db" >"${vid_db}.$$"
-    mv -- "${vid_db}.$$" "${vid_db}"
-    RELEASE "$vid_db"
-  else
-    return 1
-  fi
-}
+. "$_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"
-    elif [ "${CHANNEL_AUTHORS##*${USER_ID}*}" ]; then
-      REDIRECT "${_BASE}/channel/${channel}/${video}/#ERROR_UPDATE_NOTALLOWED"
-    elif update_video "$video" "$(POST name)" "$(POST description)" 0 0 0 \
-                      "" "void" "$USER_ID" 0 ""; then
-      REDIRECT "${_BASE}/channel/${channel}/${video}/#UPDATE_SUCCESS"
+      REDIRECT "${_BASE}/channel/$CHANNEL_ID/$VIDEO_ID/#ERROR_NOTLOGGEDIN"
+    elif ! AUTHOR; then
+      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 'private|hidden|public')" \
+                      "uploader=$USER_ID"; then
+      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_ID/$VIDEO_ID/#ERROR_NOTLOGGEDIN"
+    elif ! AUTHOR; then
+      REDIRECT "${_BASE}/channel/$CHANNEL_ID/$VIDEO_ID/#ERROR_UPDATE_NOTALLOWED"
+    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"
+      REDIRECT "${_BASE}/channel/$CHANNEL_ID/#DELETE_CONFIRM"
+    else
+      REDIRECT "${_BASE}/channel/$CHANNEL_ID/$VIDEO_ID/#ERROR_UPDATE_NOLOCK"
+    fi
     ;;
 esac
 
-if [ "$channel" -a "$video" -a "$action" = edit ]; 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_ID/$VIDEO_ID/#ERROR_UPLOAD_NOTALLOWED"
+  elif [ -f "$VIDEO_FILE" ]; then
+    head -c "$CONTENT_LENGTH" >/dev/null
+    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_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" "void" #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" "void" #status_hidden  $(checked $VIDEO_STATUS hidden)]
+	    [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]
-	    [radio "status" "void" #status_public $(checked $VIDEO_STATUS public)]
+	    [radio "status" "public" #status_public $(checked $VIDEO_STATUS public)]
 	      [label for=status_public tooltip="Video will be listed publicly" Public]
 	  ]
 	  [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" ]; then
-  yield_page "$VIDEO_NAME" "video edit" <<-EOF
-	[nav [a href="../../" Channels] - [a href="../" $(HTML "${CHANNEL_NAME:-(Unnamed Channel)}")] - [span $(HTML "${VIDEO_NAME:-(Unnamed Video)}")]
-	  $( [ "$USER_ID" -a ! "${CHANNEL_AUTHORS##*${USER_ID}*}" ] \
-	     && printf ' - [a href="edit" edit]'
-	  )
+
+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
+  yield_page "$VIDEO_NAME" "video" <<-EOF
+	[nav [a href="../../" Channels] - [a href="../" $(HTML "${CHANNEL_NAME:-(Unnamed Channel)}")] - [span $(HTML "${VIDEO_NAME:-(Unnamed Video)}")]]
+        [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]
 	]
+	[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}]
+	EOF
+
 else
   . "$_EXEC/page_404.sh"
 fi