status bar for upload

[rawnet] / page_channel.sh

diff --git a/page_channel.sh b/page_channel.sh
index 8d1d1837fc2018d4765cc748c730746ad9745d32..bc870763d802ed670ff6e100d9e7eadf53d3ae2b 100755 (executable)
--- a/page_channel.sh
+++ b/page_channel.sh
@@ -137,12 +137,12 @@ AUTHOR(){
     elif ! AUTHOR; then
       REDIRECT "${_BASE}/channel/${channel}/#ERROR_UPDATE_NOTALLOWED"
     elif LOCK "$vid_db"; then
-      if grep -q '^${video}    ' "$vid_db"; then
+      if grep -q "^${video}    " "$vid_db"; then
         RELEASE "$vid_db"
         REDIRECT "${_BASE}/channel/${channel}/#ERROR_NEWVIDEO_EXISTS"
       else
                # ID    NAME    DESC    RESX    RESY    LENGTH  COVER   STATUS  UPLOADER HITS   FUTUREUSE
-       printf '%s      \\      \\      \\      \\      \\      \\      void    %s      \\      \\\n' \
+       printf '%s      \\      \\      0       0       0       \\      void    %s      \\      \\\n' \
                "$video" "$(STRING "$USER_ID")" \
                >>"$vid_db"
         RELEASE "$vid_db"
@@ -166,20 +166,23 @@ w_video(){
            VIDEO_NAME="$(UNSTRING "$VIDEO_NAME")"
     VIDEO_DESCRIPTION="$(UNSTRING "$VIDEO_DESCRIPTION")"
     VIDEO_DESCR_CACHE="$(UNSTRING "$VIDEO_DESCR_CACHE")"
+         VIDEO_LENGTH="$(printf %i "$VIDEO_LENGTH" 2>&-)"
 
     [ "${VIDEO_STATUS}" = public ] || AUTHOR || return 0
 
     thumb="${_BASE}/video/${CHANNEL_ID}/${VIDEO_ID}_thumb.jpg"
     [ "$NAME" = \\ ] && NAME="(Unnamed Video)"
     printf '[div .video .thumb
-              [h3 [a href="%s/channel/%s/%s/" . %s]]
-              [figure [img src="%s" alt=""]]
-              [span .duration . %i:%02i]
-              [div .description . %s]
+              [a href="%s/channel/%s/%s/"
+                [h3 . %s]
+                [figure [img src="%s" alt=""]]
+                [span .duration . %i:%02i]
+                [div .description . %s]
+              ]
             ]' "$_BASE" "$CHANNEL_ID" "$VIDEO_ID" \
                "$(HTML "${VIDEO_NAME:-(Unnamed Video)}")" \
                "$thumb" \
-               "$((${VIDEO_LENGTH%.*} / 60))" "$((${VIDEO_LENGTH%.*} % 60))" \
+               "$((VIDEO_LENGTH / 60))" "$((VIDEO_LENGTH % 60))" \
                "$(UNSTRING "$DESCR_CACHE")"
   else
     return 1