]> git.plutz.net Git - rawnet/blobdiff - page_video.sh
upload function to external file, ui change: put video upload before meta edit
[rawnet] / page_video.sh
old mode 100644 (file)
new mode 100755 (executable)
index b7b9953..28061c2
@@ -1,112 +1,9 @@
 #!/bin/sh
 
-# ID   NAME    DESCRIPTION     RESX    RESY    LENGTH  COVER   STATUS (void|private|hidden|public)     UPLOADER        HITS    DESCR_CACHE     FUTUREUSE
+. "$_EXEC/db_video.sh"
+. "$_EXEC/upload.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_COVER="$(UNSTRING "$VIDEO_COVER")"
-    VIDEO_DESCR_CACHE="$(UNSTRING "$VIDEO_DESCR_CACHE")"
-  else
-    video=''
-  fi
-fi
-
-update_video(){
-  local id="${1}" name description resx resy length cover status uploader \
-        hits descr_cache futureuse
-  local ID NAME DESCRIPTION RESX RESY LENGTH COVER STATUS UPLOADER HITS \
-        DESCR_CACHE FUTUREUSE
-  local arg video thumb cnt
-  video="${_DATA}/${CHANNEL_ID}/${VIDEO_ID}.mp4"
-  thumb="${_DATA}/${CHANNEL_ID}/${VIDEO_ID}_thumb.jpg"
-
-  for arg in "$@"; do case $arg in
-    name=*) name="${arg#*=}";;
-    description=*) description="${arg#*=}";;
-    cover=*) cover="${arg#*=}";;
-    status=*) status="${arg#*=}";;
-    uploader=*) uploader="${arg#*=}";;
-    hits=*) hits="${arg#*=}";;
-  esac; done
-
-  if [ -f "$video" -a -r "$video" ]; then
-    arg="$(echo; ffprobe -show_entries format=duration:stream=width,height "$video" 2>&-)"
-    resx="${arg#*width=}"; resx="${resx%%${BR}*}"
-    resy="${arg#*height=}"; resy="${resy%%${BR}*}"
-    length="${arg#*duration=}"; length="${length%%${BR}*}"
-  fi
-  if [ "${length%.*}" -a ! "${thumb}" -nt "${video}" ]; then
-    for cnt in 1 2 3 4 5 6 7 8 9 10; do
-      ffmpeg -nostdin -y -ss "$((cnt * ${length%.*} / 11))" -i "$video" \
-             -frames 1 "${thumb%.jpg}_$((cnt - 1)).jpg"
-    done 2>&-
-    montage "${thumb%.jpg}"_[0-9].jpg \
-            -background "#000000" \
-            -tile 10x1 -geometry 320x180+0+0 \
-            -interlace line -quality 85 "${thumb}"
-    rm -- "${thumb%.jpg}"_[0-9].jpg
-  fi
-
-  if LOCK "$vid_db"; then
-    while read -r ID NAME DESCRIPTION RESX RESY LENGTH COVER STATUS UPLOADER HITS \
-                  DESCR_CACHE FUTUREUSE; do
-      if [ "$id" = "$ID" ]; then
-        printf '%s     %s      %s      %i      %i      %f      %s      %s      %s      %i      %s      %s\n' \
-               "$id" "$(STRING "${name-$(UNSTRING "$NAME")}")" \
-               "$(STRING "${description-$(UNSTRING "$DESCRIPTION")}")" \
-               "${resx:-${resx-${RESX}}${resx+0}}" \
-               "${resy:-${resy-${RESY}}${resy+0}}" \
-               "${length:-${length-${LENGTH}}${length+0}}" \
-               "$(STRING "${cover-$(UNSTRING "$COVER")}")" \
-               "${status:-${status-${STATUS}}${status+void}}" \
-               "${uploader:-${uploader-${UPLOADER}}${uploader+\\}}" \
-               "${hits:-${hits-${HITS}}${hits+0}}" \
-               "$(printf %s "${description-$(UNSTRING "$DESCRIPTION")}" |markdown |STRING)" \
-               "${FUTUREUSE:-\\}"
-      else
-        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"
-      fi
-    done <"$vid_db" >"${vid_db}.$$"
-    mv -- "${vid_db}.$$" "${vid_db}"
-    RELEASE "$vid_db"
-  else
-    return 1
-  fi
-}
-
-UPLOAD(){
-  local file="$1"
-  local boundary line last
-
-  [ ! "${CONTENT_TYPE}" -o "${CONTENT_TYPE##multipart/form-data;*}" ] && return 1
-
-  boundary="${CONTENT_TYPE#*; boundary=}"
-  boundary="${boundary%%;*}"
-
-  head -c "$CONTENT_LENGTH" \
-  | sed -nE '
-    # discard lines prior to boundary
-    /^--'"${boundary}"'\r?$/!b;
-    # discard lines until first blank
-    :A; n; /^\r?$/!bA; n;
-    # print lines until boundary ( = actual file upload)
-    :FILE; p; n;
-    /^--'"${boundary}"'(--)?\r?$/!bFILE;
-    # discard remaining lines
-    :END; $q; n; bEND;
-  ' >"$file"
-  truncate -s $(( $(stat -c %s -- "$file") -2 )) -- "$file"
-}
+read_video "$video"
 
 [ "$REQUEST_METHOD" = POST ] && case "$(POST action)" in
   update_video)
@@ -133,13 +30,7 @@ UPLOAD(){
       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"
+    elif delete_video "$video"; then
       REDIRECT "${_BASE}/channel/${channel}/#DELETE_CONFIRM"
     else
       REDIRECT "${_BASE}/channel/${channel}/${video}/#ERROR_UPDATE_NOLOCK"
@@ -157,6 +48,7 @@ if [ "$REQUEST_METHOD" = POST -a "$channel" -a "$video" ]; then
   elif UPLOAD "$_DATA/$channel/$video.mp4"; then
     update_video "$video" status=private
     VIDEO_STATUS=private
+    REDIRECT "${_BASE}/channel/${channel}/${video}/edit"
   fi
 fi
 
@@ -188,56 +80,7 @@ if [ "$channel" -a "$video" -a "$action" = edit ]; then
 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: inline-block;
-      width: 20em;
-      position: absolute;
-      background-color: #FFF;
-    }
-    --></style>
-  </head><body>
-  '
-  while [ "$VIDEO_STATUS" = void ]; do
-    printf '<span class=progress>%i</span>\n' "$(stat -c %s "$_DATA/$channel/$video.mp4" 2>&-)"
-    sleep 1
-    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
-  done
-  printf '<span class=progress>Ready!</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
+  frame_uploadprogress
 
 elif [ "$channel" -a "$video" ]; then
   [ $VIDEO_STATUS = public -o $VIDEO_STATUS = hidden ] || AUTHOR || { . ${_EXEC}/page_404.sh; exit 0; }
@@ -248,16 +91,14 @@ elif [ "$channel" -a "$video" ]; then
         [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]
-         ]
+       [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")]