refactoring: fewer global variables, manage all url parsing in index.cgi, split some...

[rawnet] / db_video.sh

diff --git a/db_video.sh b/db_video.sh
index e2cc09d78196d5f35161519dafb810c699441f06..78d108551af1c120f64cdf9f502ee5f74ae871d0 100755 (executable)
--- a/db_video.sh
+++ b/db_video.sh
@@ -12,10 +12,15 @@ unset 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
 
-[ "$CHANNEL_ID" ] && vid_db="$_DATA/$CHANNEL_ID/videos.db"
+LOCAL_VIDEO='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
+'
 
 read_video() {
-  local video="$1"
+  local video="$1" vid_db="$_DATA/$CHANNEL_ID/videos.db"
+  [ "$CHANNEL_ID" ] || return 1
 
   # Global exports
   VIDEO_ID='' VIDEO_NAME='' VIDEO_DESCRIPTION='' VIDEO_RESX='' VIDEO_RESY=''
@@ -51,7 +56,9 @@ update_video(){
         hits descr_cache futureuse
   local ID NAME DESCRIPTION RESX RESY LENGTH COVER STATUS UPLOADER HITS \
         DESCR_CACHE FUTUREUSE
-  local arg video thumb cnt
+  local arg video thumb cnt vid_db="$_DATA/$CHANNEL_ID/videos.db"
+  [ "$CHANNEL_ID" ] || return 1
+
   video="${_DATA}/${CHANNEL_ID}/${VIDEO_ID}.upload.mp4"
   thumb="${_DATA}/${CHANNEL_ID}/${VIDEO_ID}.thumb.jpg"
 
@@ -113,7 +120,8 @@ update_video(){
 }
 
 new_video(){
-  local video="${1:-$(randomid)}"
+  local video="${1:-$(randomid)}" vid_db="$_DATA/$CHANNEL_ID/videos.db"
+  [ "$CHANNEL_ID" ] || return 1
 
   if LOCK "$vid_db"; then
     if grep -q "^${video}      " "$vid_db"; then
@@ -130,7 +138,8 @@ new_video(){
 }
 
 delete_video() {
-  local video="$1"
+  local video="$1" vid_db="$_DATA/$CHANNEL_ID/videos.db"
+  [ "$CHANNEL_ID" ] || return 1
 
   if LOCK "$vid_db"; then
     grep -v "^${video} " <"$vid_db" >"${vid_db}.$$"