X-Git-Url: https://git.plutz.net/?p=rawnet;a=blobdiff_plain;f=page_video.sh;fp=page_video.sh;h=74e03e60b5e5055f63a6a77ef98cd720a6f80383;hp=49f49a78181d08c12338395c6ea817b10c109d29;hb=45879706651a39f9456af903f27f68f7e6ca08ad;hpb=eaa8b25194f1c98e481cf999d6926fe2c249d29f

diff --git a/page_video.sh b/page_video.sh
index 49f49a7..74e03e6 100755
--- a/page_video.sh
+++ b/page_video.sh
@@ -19,7 +19,7 @@ read_video "$video"
       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_ID/$VIDEO_ID/#UPDATE_SUCCESS"
     else
@@ -37,10 +37,7 @@ 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 -- "$_DATA/$CHANNEL_ID/$VIDEO_ID.upload.mp4" \
-               "$_DATA/$CHANNEL_ID/$VIDEO_ID.mp4" \
-               "$_DATA/$CHANNEL_ID/$VIDEO_ID.webm" \
-               "$_DATA/$CHANNEL_ID/$VIDEO_ID.thumb.jpg"
+      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"
@@ -52,12 +49,10 @@ 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 [ "$VIDEO_STATUS" != void ]; then
+  elif [ -f "$VIDEO_FILE" ]; then
     head -c "$CONTENT_LENGTH" >/dev/null
     REDIRECT "${_BASE}/channel/$CHANNEL_ID/$VIDEO_ID/#ERROR_UPLOAD_NOCLOBBER"
-  elif UPLOAD "$_DATA/$CHANNEL_ID/$VIDEO_ID.upload.mp4"; then
-    update_video "$VIDEO_ID" status=private
-    VIDEO_STATUS=private
+  elif UPLOAD "$VIDEO_FILE"; then
     REDIRECT "${_BASE}/channel/$CHANNEL_ID/$VIDEO_ID/edit"
   fi
 fi
@@ -68,8 +63,8 @@ if [ "$CHANNEL_ID" -a "$VIDEO_ID" -a "$action" = edit ]; then
   yield_page "$VIDEO_NAME - Edit" "video edit" <<-EOF
 	[form .video .edit method=POST
 	  [input name="name" value="$(HTML "$VIDEO_NAME")" placeholder="Video Name" autocomplete=off]
-	  [fieldset .status $([ $VIDEO_STATUS = void ] && printf "disabled=disabled")
-	    [radio "status" "private" #status_private $(checked $VIDEO_STATUS private void)]
+	  [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]
@@ -92,40 +87,37 @@ elif [ "$CHANNEL_ID" -a "$VIDEO_ID" -a "$action" = frameuploadprogress ]; then
   printf '%s\r\n' 'Content-Type: text/html' 'Connection: close' ''
   frame_uploadprogress
 
-elif [ "$CHANNEL_ID" -a "$VIDEO_ID" -a "$VIDEO_STATUS" = void ]; 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]
-	]')
-	$(AUTHOR && printf '[a .button href="edit" edit]')
+	]
+	[a .button href="edit" edit]
 	[h1 .name $(HTML "$VIDEO_NAME")]
 	[div .description . ${VIDEO_DESCR_CACHE}]
 	EOF
 
-elif [ "$CHANNEL_ID" -a "$VIDEO_ID" -a "$VIDEO_STATUS" != void ]; 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" ]; 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 "${_DATA}/${CHANNEL_ID}/${VIDEO_ID}.mp4" ] \
+	$([ -f "$VIDEO_MP4" ] \
 	  && printf '[source src="%s/video/%s/%s.mp4"  type="video/mp4"]' \
 	            "$_BASE" "$CHANNEL_ID" "$VIDEO_ID"
-	  [ -f "${_DATA}/${CHANNEL_ID}/${VIDEO_ID}.webm" ] \
+	  [ -f "$VIDEO_WEBM" ] \
 	  && printf '[source src="%s/video/%s/%s.webm" type="video/webm"]' \
 	            "$_BASE" "$CHANNEL_ID" "$VIDEO_ID"
-	  [ ! -f "${_DATA}/${CHANNEL_ID}/${VIDEO_ID}.mp4" \
-	 -a ! -f "${_DATA}/${CHANNEL_ID}/${VIDEO_ID}.webm" ] \
-	  && printf '[source src="%s/video/%s/%s.upload.mp4"  type="video/mp4"]\nThe video has not yet been transcoded and may not be displayed correctly.' \
-	            "$_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")]