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

[rawnet] / upload.sh
diff --git a/upload.sh b/upload.sh

index 63704071050e2683ef0374581c616408c786b855..e698573b84d3289e18edd809af53d3a78ab0f3e3 100755 (executable)
--- a/upload.sh
+++ b/upload.sh
@@ -1,5 +1,8 @@
  #!/bin/sh
  
+[ "$include_upload" ] && return 0
+include_upload="$0"
+
  UPLOAD(){
    local file="$1"
    local boundary line length=0
@@ -40,11 +43,11 @@ frame_uploadprogress() {
    </head><body id=uploadprogress>
    ' "$_BASE"
    printf '<div class=progress><div class=bar style="width: 0%%;"></div><div class=count>%i / %i</div></div>\n' 0 0
-  while [  ! -f "$_DATA/$channel/$video.upload.mp4" \
-        -a ! -f "$_DATA/$channel/$video.upload.mp4.upload" ]; do sleep 1; done
-  read size <"$_DATA/$channel/$video.upload.mp4.upload"
-  while [ -f "$_DATA/$channel/$video.upload.mp4.upload" ]; do
-    stat="$(stat -c %s "$_DATA/$channel/$video.upload.mp4" 2>&-)"
+  while [  ! -f "$_DATA/$CHANNEL_ID/${VIDEO_ID}.upload.mp4" \
+        -a ! -f "$_DATA/$CHANNEL_ID/${VIDEO_ID}.upload.mp4.upload" ]; do sleep 1; done
+  read size <"$_DATA/$CHANNEL_ID/${VIDEO_ID}.upload.mp4.upload"
+  while [ -f "$_DATA/$CHANNEL_ID/${VIDEO_ID}.upload.mp4.upload" ]; do
+    stat="$(stat -c %s "$_DATA/$CHANNEL_ID/${VIDEO_ID}.upload.mp4" 2>&-)"
      printf '<div class=progress><div class=bar style="width:%i%%;"></div><div class=count>%iMB / %iMB</div></div>\n' \
        "$(( stat * 100 / size ))" "$((stat / 1048576))" "$((size / 1048576))"
      sleep 1