X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=page_channel.sh;h=36d9dcd777f963299fa7584865243786fc372ac2;hb=1cd4a538ca3b1c53a865977dc532187302716f90;hp=223f88298794fd1a6319b6cb0bbbd5e11d07feae;hpb=fdce2b28611f69f277d6801c910efbd914111be0;p=rawnet

diff --git a/page_channel.sh b/page_channel.sh
old mode 100644
new mode 100755
index 223f882..36d9dcd
--- a/page_channel.sh
+++ b/page_channel.sh
@@ -1,177 +1,101 @@
 #!/bin/sh
 
-chan_db="$_DATA/channels.db"
+["$includepage_channel" ] && return 0
+includepage_channel="$0"
 
-channel='' video='' action=''
-path_info="$PATH_INFO"
-path_info="${path_info#/channel/}"
-if [ "$(checkid "${path_info%%/*}")" ]; then
-  channel="${path_info%%/*}"
-  path_info="${path_info#*/}"
-fi
-if [ "$(checkid "${path_info%%/*}")" ]; then
-  video="${path_info%%/*}"
-  path_info="${path_info#*/}"
-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
+. "$_EXEC/db_channel.sh"
+. "$_EXEC/widgets.sh"
 
-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"
-  else
-    return 1
-  fi
-}
-
-# Video
-# ID	NAME	DESCRIPTION	RESX	RESY	LENGTH	COVER	STATUS	UPLOADER	HITS
+read_channel "$channel"
 
 [ "$REQUEST_METHOD" = POST ] && case "$(POST action)" in
   newchannel)
     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
     ;;
   update_channel)
-    if [ ! "$channel" ]; then
+    if [ ! "$CHANNEL_ID" ]; then
       REDIRECT "${_BASE}/channel/#ERROR_NOCHANNEL"
     elif [ ! "$USER_ID" ]; then
-      REDIRECT "${_BASE}/channel/${channel}/#ERROR_NOTLOGGEDIN"
-    elif [ "${CHANNEL_AUTHORS##*${USER_ID}*}" ]; then
-      REDIRECT "${_BASE}/channel/${channel}/#ERROR_UPDATE_NOTALLOWED"
-    elif update_channel "$channel" "$(POST name)" "$(POST description)" \
-                        "" "" "$USER_ID" "" ""; then
-      REDIRECT "${_BASE}/channel/${channel}/"
+      REDIRECT "${_BASE}/channel/$CHANNEL_ID/#ERROR_NOTLOGGEDIN"
+    elif ! AUTHOR; then
+      REDIRECT "${_BASE}/channel/$CHANNEL_ID/#ERROR_UPDATE_NOTALLOWED"
+    elif update_channel "$CHANNEL_ID" "name=$(POST name)" \
+                        "description=$(POST description)" \
+                        "authors=$USER_ID"; then
+      REDIRECT "${_BASE}/channel/$CHANNEL_ID/"
     else
-      REDIRECT "${_BASE}/channel/${channel}/#ERROR_UPDATE_NOLOCK"
+      REDIRECT "${_BASE}/channel/$CHANNEL_ID/#ERROR_UPDATE_NOLOCK"
     fi
     ;;
+  update_channel_cancel)
+    REDIRECT "${_BASE}/channel/$CHANNEL_ID/"
+    ;;
   newvideo)
+    . "$_EXEC/db_video.sh"
     video="$(POST video |checkid)"
-    # database video create
-    REDIRECT "${_BASE}/channel/${channel}/${video}/"
-    ;;
-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
-  else
-    return 1
-  fi
-}
 
-w_channel(){
-  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"
-    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"
-	  )
-	]
-	EOF
-  else
-    return 1
-  fi
-}
+    AUTHOR \
+    && mkdir -p -- "${_DATA}/$CHANNEL_ID/"
 
-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"
-}
+    if [ ! "$video" ]; then
+      REDIRECT "${_BASE}/channel/$CHANNEL_ID/#ERROR_INVALID_ID"
+    elif [ ! "$CHANNEL_ID" ]; then
+      REDIRECT "${_BASE}/channel/#ERROR_NOCHANNEL"
+    elif [ ! "$USER_ID" ]; then
+      REDIRECT "${_BASE}/channel/$CHANNEL_ID/#ERROR_NOTLOGGEDIN"
+    elif ! AUTHOR; then
+      REDIRECT "${_BASE}/channel/$CHANNEL_ID/#ERROR_UPDATE_NOTALLOWED"
+    elif new_video "$video"; then
+      REDIRECT "${_BASE}/channel/$CHANNEL_ID/$video/"
+    else
+      REDIRECT "${_BASE}/channel/$CHANNEL_ID/#ERROR_NEWVIDEO_NOLOCK"
+    fi
+    ;;
+esac
 
-if [ "$channel" -a "$video" ]; then
-  . ${_EXEC}/page_video.sh
-elif [ "$channel" -a "$action" = edit ]; then
+if [ "$CHANNEL_ID" -a "$action" = edit ]; then
+  AUTHOR || REDIRECT "${_BASE}/$CHANNEL_ID/#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>
+	  [input name="name" value="$(HTML "$CHANNEL_NAME")" placeholder="Channel Name" autocomplete=off]
+	  [textarea name="description" placeholder="Description" . $(HTML "$CHANNEL_DESCRIPTION")]
 	  [submit "action" "update_channel" . Update]
+	  [submit "action" "update_channel_cancel" . Cancel]
 	]
 	EOF
-elif [ "$channel" ]; then
+elif [ "$CHANNEL_ID" ]; then
   yield_page "$CHANNEL_NAME" "channel" <<-EOF
+	[nav [a href="../" Channels] - [span $(HTML "${CHANNEL_NAME:-(Unnamed Channel)}")]]
 	[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"
-	  )
-	]
+	$(AUTHOR && printf '[a .button href="edit" edit]')
+	[h1 .videos Videos]
+	[div .videos . $(
+	  AUTHOR && printf '
+	     [form .video .newvideo method=POST
+	       [hidden "video" "%s"]
+	       [submit "action" "newvideo" New Video]
+	     ]' "$(timeid)"
+	  list_videos |while w_video; do :; done
+	)]
 	EOF
 else
   yield_page "Channels" "channels" <<-EOF
-	$(w_channel_list)
+	$([ "$USER_ID" ] && printf '
+	  [form .channel .newchannel method=POST
+	    [hidden "channel" "%s"]
+	    [submit "action" "newchannel" New Channel]
+	  ]' "$(timeid)"
+	)
+	$([ -f "$chan_db" -a -r "$chan_db" ] \
+	  && while w_channel; do :; done <"$chan_db"
+	)
 	EOF
 fi