separated data layer

[rawnet] / page_channel.sh

diff --git a/page_channel.sh b/page_channel.sh
index bc870763d802ed670ff6e100d9e7eadf53d3ae2b..09fae095baf1aae17471098c916047303e1d2283 100755 (executable)
--- a/page_channel.sh
+++ b/page_channel.sh
@@ -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,62 +17,8 @@ fi
 action="${path_info}"
 unset path_info
 
-# Channel
-# ID   NAME    DESCRIPTION     LOGO    THEME   AUTHORS DESCR_CACHE FUTUREUSE
-
-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 description logo theme authors descr_cache futureuse
-  local ID NAME DESCRIPTION LOGO THEME AUTHORS DESCR_CACHE FUTUREUSE
-  local arg
-
-  for arg in "$@"; do case $arg in
-    name=*) name="${arg#*=}";;
-    description=*) description="${arg#*=}";;
-    logo=*) logo="${arg#*=}";;
-    theme=*) theme="${arg#*=}";;
-    authors=*) authors="${arg#*=}";;
-  esac; done
-
-  if LOCK "$chan_db"; then
-    while read -r ID NAME DESCRIPTION LOGO THEME AUTHORS DESCR_CACHE FUTUREUSE; do
-      if [ "$id" = "$ID" ]; then
-       printf '%s      %s      %s      %s      %s      %s      %s      %s\n' \
-               "$id" "$(STRING "${name-$(UNSTRING "$NAME")}")" \
-               "$(STRING "${description-$(UNSTRING "$DESCRIPTION")}")" \
-               "${logo:-${logo-${LOGO}}${logo+\\}}" \
-               "${theme:-${theme-${THEME}}${theme+\\}}" \
-               "$(STRING "${authors-$(UNSTRING "${AUTHORS}")}")" \
-               "$(printf %s "${description-$(UNSTRING "$DESCRIPTION")}" |markdown |STRING)" \
-               "${FUTUREUSE:-\\}"
-      else
-       printf '%s      %s      %s      %s      %s      %s      %s      %s\n' \
-               "$ID" "$NAME" "$DESCRIPTION" "$LOGO" "$THEME" "$AUTHORS" \
-               "$DESCR_CACHE" "$FUTUREUSE"
-      fi
-    done <"$chan_db" >"${chan_db}.$$"
-    mv -- "${chan_db}.$$" "${chan_db}"
-    RELEASE "$chan_db"
-  else
-    return 1
-  fi
-}
+read_channel "$channel" \
+&& vid_db="${_DATA}/${CHANNEL_ID}/videos.db"
 
 AUTHOR(){
   if [ "$CHANNEL_ID" -a "$USER_ID" -a ! "${CHANNEL_AUTHORS##*${USER_ID}*}" ]; then
@@ -89,17 +36,8 @@ AUTHOR(){
     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
@@ -136,18 +74,8 @@ AUTHOR(){
       REDIRECT "${_BASE}/channel/${channel}/#ERROR_NOTLOGGEDIN"
     elif ! AUTHOR; then
       REDIRECT "${_BASE}/channel/${channel}/#ERROR_UPDATE_NOTALLOWED"
-    elif LOCK "$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      \\      \\      0       0       0       \\      void    %s      \\      \\\n' \
-               "$video" "$(STRING "$USER_ID")" \
-               >>"$vid_db"
-        RELEASE "$vid_db"
-        REDIRECT "${_BASE}/channel/${channel}/${video}/edit"
-      fi
+    elif new_video "$video"; then
+      REDIRECT "${_BASE}/channel/${channel}/${video}/edit"
     else
       REDIRECT "${_BASE}/channel/${channel}/#ERROR_NEWVIDEO_NOLOCK"
     fi
@@ -160,14 +88,8 @@ w_video(){
         VIDEO_LENGTH VIDEO_COVER VIDEO_STATUS VIDEO_UPLOADER VIDEO_HITS \
         VIDEO_DESCR_CACHE VIDEO_FUTUREUSE
 
-  if 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; then
-           VIDEO_NAME="$(UNSTRING "$VIDEO_NAME")"
-    VIDEO_DESCRIPTION="$(UNSTRING "$VIDEO_DESCRIPTION")"
-    VIDEO_DESCR_CACHE="$(UNSTRING "$VIDEO_DESCR_CACHE")"
-         VIDEO_LENGTH="$(printf %i "$VIDEO_LENGTH" 2>&-)"
-
+  if read_video; then
+    VIDEO_LENGTH="${VIDEO_LENGTH%.*}"
     [ "${VIDEO_STATUS}" = public ] || AUTHOR || return 0
 
     thumb="${_BASE}/video/${CHANNEL_ID}/${VIDEO_ID}_thumb.jpg"
@@ -189,20 +111,22 @@ w_video(){
   fi
 }
 
-w_channel(){
+w_channel_list(){
   local vid_db
   local CHANNEL_ID CHANNEL_NAME CHANNEL_DESCRIPTION CHANNEL_LOGO \
         CHANNEL_THEME CHANNEL_AUTHORS CHANNEL_DESCR_CACHE CHANNEL_FUTUREUSE
 
-  if read -r CHANNEL_ID CHANNEL_NAME CHANNEL_DESCRIPTION CHANNEL_LOGO \
-             CHANNEL_THEME CHANNEL_AUTHORS CHANNEL_DESCR_CACHE \
-             CHANNEL_FUTUREUSE; then
-           CHANNEL_NAME="$(UNSTRING "$CHANNEL_NAME")"
-    CHANNEL_DESCRIPTION="$(UNSTRING "$CHANNEL_DESCRIPTION")"
-        CHANNEL_AUTHORS="$(UNSTRING "$CHANNEL_AUTHORS")"
-    CHANNEL_DESCR_CACHE="$(UNSTRING "$CHANNEL_DESCR_CACHE")"
+  [ "$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
          [div .description
@@ -214,21 +138,7 @@ w_channel(){
          )
        ]
        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