]> git.plutz.net Git - rawnet/blobdiff - page_channel.sh
separated data layer
[rawnet] / page_channel.sh
index 223f88298794fd1a6319b6cb0bbbd5e11d07feae..09fae095baf1aae17471098c916047303e1d2283 100755 (executable)
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-chan_db="$_DATA/channels.db"
+. "$_EXEC/db_channel.sh"
+. "$_EXEC/db_video.sh"
 
 channel='' video='' action=''
 path_info="$PATH_INFO"
@@ -16,44 +17,12 @@ fi
 action="${path_info}"
 unset path_info
 
-# Channel
-# ID   NAME    DESCRIPTION     LOGO    THEME   AUTHORS DESCR_CACHE FUTUREUSE
+read_channel "$channel" \
+&& vid_db="${_DATA}/${CHANNEL_ID}/videos.db"
 
-if [ "$channel" -a -f "$chan_db" -a -r "$chan_db" ]; then
-  read -r CHANNEL_ID CHANNEL_NAME CHANNEL_DESCRIPTION CHANNEL_LOGO \
-          CHANNEL_THEME CHANNEL_AUTHORS CHANNEL_DESCR_CACHE \
-          CHANNEL_FUTUREUSE <<-EOF
-       $(grep "^${channel}     " "${chan_db}")
-       EOF
-  if [ "$CHANNEL_ID" ]; then
-           CHANNEL_NAME="$(UNSTRING "$CHANNEL_NAME")"
-    CHANNEL_DESCRIPTION="$(UNSTRING "$CHANNEL_DESCRIPTION")"
-        CHANNEL_AUTHORS="$(UNSTRING "$CHANNEL_AUTHORS")"
-    CHANNEL_DESCR_CACHE="$(UNSTRING "$CHANNEL_DESCR_CACHE")"
-    vid_db="${_DATA}/${CHANNEL_ID}/videos.db"
-  else
-    channel=''
-  fi
-fi
-
-update_channel(){
-  local id="${1}" name="${2}" description="${3}" logo="${4}" theme="${5}" \
-        authors="${6}" descr_cache="${7}" futureuse="${8}"
-  local ID INFO
-  if LOCK "$chan_db"; then
-    while read -r ID INFO; do
-      if [ "$id" = "$ID" ]; then
-       printf '%s      %s      %s      %s      %s      %s      %s      %s\n' \
-               "$id" "$(STRING "$name")" "$(STRING "$description")" \
-               "${logo:-\\}" "${theme:-\\}" "$(STRING "$authors")" \
-               "$(printf %s "$description" |markdown |STRING)" \
-               "${futureuse:-\\}"
-      else
-       printf '%s      %s\n' "$ID" "$INFO"
-      fi
-    done <"$chan_db" >"${chan_db}.$$"
-    mv -- "${chan_db}.$$" "${chan_db}"
-    RELEASE "$chan_db"
+AUTHOR(){
+  if [ "$CHANNEL_ID" -a "$USER_ID" -a ! "${CHANNEL_AUTHORS##*${USER_ID}*}" ]; then
+    return 0
   else
     return 1
   fi
@@ -67,17 +36,8 @@ update_channel(){
     channel="$(POST channel |checkid)"
     if [ ! "$USER_ID" ]; then
       REDIRECT "${_BASE}/channel/#ERROR_NEWCHANNEL_NOTALLOWED"
-    elif LOCK "$chan_db"; then
-      if grep -q '^${channel}  ' "$chan_db"; then
-        RELEASE "$chan_db"
-        REDIRECT "${_BASE}/channel/#ERROR_NEWCHANNEL_EXISTS"
-      else
-       printf '%s      \\      \\      \\      \\      %s      \\      \\\n' \
-               "$channel" "$(STRING "$USER_ID")" \
-               >>"$chan_db"
-        RELEASE "$chan_db"
-        REDIRECT "${_BASE}/channel/${channel}/edit"
-      fi
+    elif new_channel "$channel"; then
+      REDIRECT "${_BASE}/channel/${channel}/edit"
     else
       REDIRECT "${_BASE}/channel/#ERROR_NEWCHANNEL_NOLOCK"
     fi
@@ -87,88 +47,129 @@ update_channel(){
       REDIRECT "${_BASE}/channel/#ERROR_NOCHANNEL"
     elif [ ! "$USER_ID" ]; then
       REDIRECT "${_BASE}/channel/${channel}/#ERROR_NOTLOGGEDIN"
-    elif [ "${CHANNEL_AUTHORS##*${USER_ID}*}" ]; then
+    elif ! AUTHOR; then
       REDIRECT "${_BASE}/channel/${channel}/#ERROR_UPDATE_NOTALLOWED"
-    elif update_channel "$channel" "$(POST name)" "$(POST description)" \
-                        "" "" "$USER_ID" "" ""; then
+    elif update_channel "$channel" "name=$(POST name)" \
+                        "description=$(POST description)" \
+                        "authors=$USER_ID"; then
       REDIRECT "${_BASE}/channel/${channel}/"
     else
       REDIRECT "${_BASE}/channel/${channel}/#ERROR_UPDATE_NOLOCK"
     fi
     ;;
+  update_channel_cancel)
+    REDIRECT "${_BASE}/channel/${channel}/"
+    ;;
   newvideo)
     video="$(POST video |checkid)"
-    # database video create
-    REDIRECT "${_BASE}/channel/${channel}/${video}/"
+
+    AUTHOR \
+    && mkdir -p -- "${_DATA}/${channel}/"
+
+    if [ ! "$video" ]; then
+      REDIRECT "${_BASE}/channel/${channel}/#ERROR_INVALID_ID"
+    elif [ ! "$channel" ]; then
+      REDIRECT "${_BASE}/channel/#ERROR_NOCHANNEL"
+    elif [ ! "$USER_ID" ]; then
+      REDIRECT "${_BASE}/channel/${channel}/#ERROR_NOTLOGGEDIN"
+    elif ! AUTHOR; then
+      REDIRECT "${_BASE}/channel/${channel}/#ERROR_UPDATE_NOTALLOWED"
+    elif new_video "$video"; then
+      REDIRECT "${_BASE}/channel/${channel}/${video}/edit"
+    else
+      REDIRECT "${_BASE}/channel/${channel}/#ERROR_NEWVIDEO_NOLOCK"
+    fi
     ;;
 esac
 
 w_video(){
-  local CID="$1" thumb
-  local ID NAME DESCRIPTION RESX RESY LENGTH COVER STATUS UPLOADER HITS FUTUREUSE
-  if read -r ID NAME DESCRIPTION RESX RESY LENGTH COVER STATUS UPLOADER HITS FUTUREUSE; then
-    thumb="${_BASE}/${CID}/thumb_${ID}.jpg"
-    cat <<-EOF
-       [div .video
-         [h3 . $(UNSTRING "$NAME" |HTML)]
-         [img href="${thumb}" alt="$(UNSTRING "$DESCRIPTION" |HTML)"]
-       ]
-       EOF
+  local thumb
+  local 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
+
+  if read_video; then
+    VIDEO_LENGTH="${VIDEO_LENGTH%.*}"
+    [ "${VIDEO_STATUS}" = public ] || AUTHOR || return 0
+
+    thumb="${_BASE}/video/${CHANNEL_ID}/${VIDEO_ID}_thumb.jpg"
+    [ "$NAME" = \\ ] && NAME="(Unnamed Video)"
+    printf '[div .video .thumb
+              [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))" \
+               "$(UNSTRING "$DESCR_CACHE")"
   else
     return 1
   fi
 }
 
-w_channel(){
+w_channel_list(){
   local vid_db
-  local ID NAME DESCRIPTION LOGO THEME AUTHORS DESCR_CACHE FUTUREUSE
-  if read -r ID NAME DESCRIPTION LOGO THEME AUTHORS DESCR_CACHE FUTUREUSE; then
-    vid_db="${_DATA}/${ID}/videos.db"
+  local CHANNEL_ID CHANNEL_NAME CHANNEL_DESCRIPTION CHANNEL_LOGO \
+        CHANNEL_THEME CHANNEL_AUTHORS CHANNEL_DESCR_CACHE CHANNEL_FUTUREUSE
+
+  [ "$USER_ID" ] && cat <<-EOF
+       [form .channel .newchannel method=POST
+         [hidden "channel" "$(timeid)"]
+         [submit "action" "newchannel" New Channel]
+       ]
+       EOF
+
+  [ -f "$chan_db" -a -r "$chan_db" ] \
+  && while read_channel; do
+    vid_db="${_DATA}/${CHANNEL_ID}/videos.db"
+
     cat <<-EOF
        [div .channel
-         [h2 . $(UNSTRING "$NAME" |HTML)]
-         [div .description . $(UNSTRING "$DESCR_CACHE")]
-         $( [ -f "$vid_db" -a -r "$vid_db" ] \
-            && while w_video "$ID"; do :; done <"$vid_db"
+         [div .description
+           [h2 [a href="${_BASE}/channel/${CHANNEL_ID}/" $(HTML "${CHANNEL_NAME:-(Unnamed Channel)}")]]
+           ${CHANNEL_DESCR_CACHE}
+         ]$(
+            [ -f "$vid_db" -a -r "$vid_db" ] \
+           && while w_video; do :; done <"$vid_db"
          )
        ]
        EOF
-  else
-    return 1
-  fi
-}
-
-w_channel_list(){
-  if [ $USER_ID ]; then
-    printf '
-    [form .channel .newchannel method=POST
-      [hidden "channel" "%s"]
-      [submit "action" "newchannel" New Channel]
-    ]' "$(timeid)"
-  fi
-  [ -f "$chan_db" -a -r "$chan_db" ] \
-  && while w_channel; do :; done <"$chan_db"
+  done <"$chan_db"
 }
 
 if [ "$channel" -a "$video" ]; then
   . ${_EXEC}/page_video.sh
 elif [ "$channel" -a "$action" = edit ]; then
+  AUTHOR || REDIRECT "${_BASE}/${channel}/#ERROR_EDIT_NOTALLOWED"
   yield_page "$CHANNEL_NAME - Edit" "channel edit" <<-EOF
        [form .channel .edit method=POST
          [input name="name" value="$(HTML "$CHANNEL_NAME")" placeholder="Channel Name"]
-         <textarea name="description" placeholder="Description">$(HTML "$CHANNEL_DESCRIPTION")</textarea>
+         [textarea name="description" placeholder="Description" . $(HTML "$CHANNEL_DESCRIPTION")]
          [submit "action" "update_channel" . Update]
+         [submit "action" "update_channel_cancel" . Cancel]
        ]
        EOF
 elif [ "$channel" ]; then
   yield_page "$CHANNEL_NAME" "channel" <<-EOF
+       [nav [a href="../" Channels] - [span $(HTML "${CHANNEL_NAME:-(Unnamed Channel)}")]
+         $(AUTHOR && printf ' - [a href="edit" edit]')
+       ]
        [h1 .name $(HTML "$CHANNEL_NAME")]
        [div .description . ${CHANNEL_DESCR_CACHE}]
-       [div .videos
-         $( [ -f "$vid_db" -a -r "$vid_db" ] \
-            && while w_video "$ID"; do :; done <"$vid_db"
-         )
-       ]
+       [h1 .videos Videos]
+       [div .videos . $(
+         AUTHOR && printf '
+             [form .video .newvideo method=POST
+               [hidden "video" "%s"]
+               [submit "action" "newvideo" New Video]
+             ]' "$(timeid)"
+         [ -f "$vid_db" -a -r "$vid_db" ] \
+         && while w_video "$ID"; do :; done <"$vid_db"
+       )]
        EOF
 else
   yield_page "Channels" "channels" <<-EOF