refactor: pre production version (#86)

timerring · Nov 27, 2024 · 29ea0e0 · 29ea0e0
1 parent 0e307d9
commit 29ea0e0
Show file tree

Hide file tree

Showing 23 changed files with 17 additions and 38 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,10 +25,10 @@ pnpm-lock.yaml
 package-lock.json
 
 # Ignore the biliup folder
-upload/config/*
-!upload/config/1234567.yaml
-!upload/config/upload_config.json
-!upload/uploadVideoQueue.txt
+src/uploadProcess/config/*
+!src/uploadProcess/config/1234567.yaml
+!src/uploadProcess/config/upload_config.json
+!src/uploadProcess/uploadVideoQueue.txt
 
 # Ignore the production
 startRecord-production.sh

diff --git a/src/bilive_upload/LICENSE b/src/bilive_upload/LICENSE
diff --git a/src/burnAndMerge.sh b/src/burnAndMerge.sh
@@ -22,10 +22,10 @@ while read -r line; do
     xmlFile=${line%.mp4}.xml
     assFile=${line%.mp4}.ass
     if [ -f "$xmlFile" ]; then
-        $BILIVE_PATH/utils/DanmakuFactory -o "$assFile" -i "$xmlFile" --msgboxfontsize 23 --ignore-warnings
+        $BILIVE_PATH/src/utils/DanmakuFactory -o "$assFile" -i "$xmlFile" --msgboxfontsize 30 --msgboxsize 400x1000 --ignore-warnings
         echo "==================== generated $assFile ===================="
         export ASS_PATH="$assFile"
-        python3 $BILIVE_PATH/utils/removeEmojis.py >> $BILIVE_PATH/logs/removeEmojis.log 2>&1
+        python3 $BILIVE_PATH/src/utils/removeEmojis.py >> $BILIVE_PATH/logs/removeEmojis.log 2>&1
     fi
 
     # Initial some basic parameters and create tmp folder
@@ -67,5 +67,5 @@ rm -r $tmpDir
 rm mergevideo.txt
 
 echo "==================== start upload $firstOutputFile ===================="
-echo "$firstOutputFile" >> $BILIVE_PATH/upload/uploadVideoQueue.txt
+echo "$firstOutputFile" >> $BILIVE_PATH/src/uploadProcess/uploadVideoQueue.txt
 echo "==================== OVER ===================="
diff --git a/src/danmakuBurning.sh b/src/danmakuBurning.sh
@@ -47,11 +47,11 @@ assPath="${path}/${roomid}_${year}-${month}-${day}-${hour}.ass"
 # use DanmakuFactory to convert the xml file
 xmlPath="${filenameWithoutExt}.xml"
 if [ -f "$xmlPath" ]; then
-    $BILIVE_PATH/utils/DanmakuFactory -o "$assPath" -i "$xmlPath" --msgboxfontsize 23 --ignore-warnings
+    $BILIVE_PATH/src/utils/DanmakuFactory -o "$assPath" -i "$xmlPath" --msgboxfontsize 30 --ignore-warnings
     rm $xmlPath
     echo “danmaku convert success!”
     export ASS_PATH="$assPath"
-    python3 $BILIVE_PATH/utils/removeEmojis.py >> $BILIVE_PATH/logs/removeEmojis.log 2>&1
+    python3 $BILIVE_PATH/src/utils/removeEmojis.py >> $BILIVE_PATH/logs/removeEmojis.log 2>&1
 fi
 
 # Burn danmaku into video.
@@ -74,4 +74,4 @@ echo "ffmpeg successfully complete!"
 rm $fullPath
 
 # Upload video.
-echo "$formatVideoName" >> $BILIVE_PATH/upload/uploadVideoQueue.txt
+echo "$formatVideoName" >> $BILIVE_PATH/src/uploadProcess/uploadVideoQueue.txt
diff --git a/src/bilive_upload/__init__.py → src/uploadProcess/__init__.py b/src/bilive_upload/__init__.py → src/uploadProcess/__init__.py
diff --git a/...ilive_upload/bilibiliuploader/__init__.py → ...ploadProcess/bilibiliuploader/__init__.py b/...ilive_upload/bilibiliuploader/__init__.py → ...ploadProcess/bilibiliuploader/__init__.py
diff --git a/...load/bilibiliuploader/bilibiliuploader.py → ...cess/bilibiliuploader/bilibiliuploader.py b/...load/bilibiliuploader/bilibiliuploader.py → ...cess/bilibiliuploader/bilibiliuploader.py
diff --git a/src/bilive_upload/bilibiliuploader/cipher.py → src/uploadProcess/bilibiliuploader/cipher.py b/src/bilive_upload/bilibiliuploader/cipher.py → src/uploadProcess/bilibiliuploader/cipher.py
diff --git a/src/bilive_upload/bilibiliuploader/core.py → src/uploadProcess/bilibiliuploader/core.py b/src/bilive_upload/bilibiliuploader/core.py → src/uploadProcess/bilibiliuploader/core.py
diff --git a/src/bilive_upload/bilibiliuploader/retry.py → src/uploadProcess/bilibiliuploader/retry.py b/src/bilive_upload/bilibiliuploader/retry.py → src/uploadProcess/bilibiliuploader/retry.py
diff --git a/upload/biliup → src/uploadProcess/biliup b/upload/biliup → src/uploadProcess/biliup
diff --git a/src/bilive_upload/cfg_upload.py → src/uploadProcess/cfg_upload.py b/src/bilive_upload/cfg_upload.py → src/uploadProcess/cfg_upload.py
diff --git a/upload/config/1234567.yaml → src/uploadProcess/config/1234567.yaml b/upload/config/1234567.yaml → src/uploadProcess/config/1234567.yaml
diff --git a/upload/config/upload_config.json → src/uploadProcess/config/upload_config.json b/upload/config/upload_config.json → src/uploadProcess/config/upload_config.json
diff --git a/src/bilive_upload/requirements.txt → src/uploadProcess/requirements.txt b/src/bilive_upload/requirements.txt → src/uploadProcess/requirements.txt
diff --git a/src/bilive_upload/setup.py → src/uploadProcess/setup.py b/src/bilive_upload/setup.py → src/uploadProcess/setup.py
diff --git a/upload/uploadQueue.sh → src/uploadProcess/uploadQueue.sh b/upload/uploadQueue.sh → src/uploadProcess/uploadQueue.sh
@@ -6,12 +6,12 @@
 #   INPUT:  none.
 #   OUTPUT: none.
 
-uploadQueue="$BILIVE_PATH/upload/uploadVideoQueue.txt"
-tempQueue="$BILIVE_PATH/upload/tempVideoQueue.txt"
+uploadQueue="$BILIVE_PATH/src/uploadProcess/uploadVideoQueue.txt"
+tempQueue="$BILIVE_PATH/src/uploadProcess/tempVideoQueue.txt"
 
 processVideo() {
     local line="$1"
-    $BILIVE_PATH/upload/uploadVideo.sh "$line" > $BILIVE_PATH/logs/uploadDanmakuLog/upload-$(date +%Y%m%d%H%M%S).log 2>&1
+    $BILIVE_PATH/src/uploadProcess/uploadVideo.sh "$line" > $BILIVE_PATH/logs/uploadDanmakuLog/upload-$(date +%Y%m%d%H%M%S).log 2>&1
     sleep 10
     sed -i '1d' "$uploadQueue"
 }

diff --git a/upload/uploadVideo.sh → src/uploadProcess/uploadVideo.sh b/upload/uploadVideo.sh → src/uploadProcess/uploadVideo.sh
@@ -43,7 +43,7 @@ echo "hour: $hour"
 # original to create the copy. Then upload videos via the copy.
 
 # define the path of yaml.
-yamlFile="$BILIVE_PATH/upload/config/$roomID.yaml"
+yamlFile="$BILIVE_PATH/src/uploadProcess/config/$roomID.yaml"
 
 # check if the yaml is exist.
 if [ ! -f "$yamlFile" ]; then
@@ -52,7 +52,7 @@ if [ ! -f "$yamlFile" ]; then
 fi
 
 # define the path of copy.
-copyYamlFile="$BILIVE_PATH/upload/config/copy_$roomID.yaml"
+copyYamlFile="$BILIVE_PATH/src/uploadProcess/config/copy_$roomID.yaml"
 
 # make the copy.
 cp "$yamlFile" "$copyYamlFile"
@@ -68,7 +68,7 @@ sed -i "s|BILI_SOURCE|https://live.bilibili.com/$roomID|g" "$copyYamlFile"
 echo "The parameters have been updated in the $copyYamlFile"
 
 # Use biliup tool to upload video, and then delete the subtitle ass file and video file.
-if $BILIVE_PATH/upload/biliup upload "$uploadPath" --config "$copyYamlFile"; then
+if $BILIVE_PATH/src/uploadProcess/biliup upload "$uploadPath" --config "$copyYamlFile"; then
     echo "Upload successfully，then delete the video"
     rm $uploadPath
 else

diff --git a/upload/uploadVideoQueue.txt → src/uploadProcess/uploadVideoQueue.txt b/upload/uploadVideoQueue.txt → src/uploadProcess/uploadVideoQueue.txt
diff --git a/utils/DanmakuFactory → src/utils/DanmakuFactory b/utils/DanmakuFactory → src/utils/DanmakuFactory
diff --git a/utils/clearLogs.sh → src/utils/clearLogs.sh b/utils/clearLogs.sh → src/utils/clearLogs.sh
diff --git a/utils/removeEmojis.py → src/utils/removeEmojis.py b/utils/removeEmojis.py → src/utils/removeEmojis.py
diff --git a/startUpload.sh b/startUpload.sh
@@ -1,7 +1,7 @@
 # kill the previous scanSegments process
 kill -9 $(pgrep -f uploadQueue)
 # start the scanSegments process
-nohup $BILIVE_PATH/upload/uploadQueue.sh > $BILIVE_PATH/logs/uploadQueue.log 2>&1 &
+nohup $BILIVE_PATH/src/uploadProcess/uploadQueue.sh > $BILIVE_PATH/logs/uploadQueue.log 2>&1 &
 # Check if the last command was successful
 if [ $? -eq 0 ]; then
     echo "success"