X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=upload.sh;h=e698573b84d3289e18edd809af53d3a78ab0f3e3;hb=eaa8b25194f1c98e481cf999d6926fe2c249d29f;hp=63704071050e2683ef0374581c616408c786b855;hpb=7e92b09827ccefdea68ab594f02c7a614b0113df;p=rawnet
diff --git a/upload.sh b/upload.sh
index 6370407..e698573 100755
--- 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() {
' "$_BASE"
printf '\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 '\n' \
"$(( stat * 100 / size ))" "$((stat / 1048576))" "$((size / 1048576))"
sleep 1