From 29ea0e0fbe5ba80d0cee17a38a559af8063e379a Mon Sep 17 00:00:00 2001
From: John Howe <89397553+timerring@users.noreply.github.com>
Date: Wed, 27 Nov 2024 20:58:30 +0800
Subject: [PATCH] refactor: pre production version (#86)
---
.gitignore | 8 +++----
src/bilive_upload/LICENSE | 21 ------------------
src/burnAndMerge.sh | 6 ++---
src/danmakuBurning.sh | 6 ++---
.../__init__.py | 0
.../bilibiliuploader/__init__.py | 0
.../bilibiliuploader/bilibiliuploader.py | 0
.../bilibiliuploader/cipher.py | 0
.../bilibiliuploader/core.py | 0
.../bilibiliuploader/retry.py | 0
{upload => src/uploadProcess}/biliup | Bin
.../cfg_upload.py | 0
.../uploadProcess}/config/1234567.yaml | 0
.../uploadProcess}/config/upload_config.json | 0
.../requirements.txt | 0
src/{bilive_upload => uploadProcess}/setup.py | 0
{upload => src/uploadProcess}/uploadQueue.sh | 6 ++---
{upload => src/uploadProcess}/uploadVideo.sh | 6 ++---
.../uploadProcess}/uploadVideoQueue.txt | 0
{utils => src/utils}/DanmakuFactory | Bin
{utils => src/utils}/clearLogs.sh | 0
{utils => src/utils}/removeEmojis.py | 0
startUpload.sh | 2 +-
23 files changed, 17 insertions(+), 38 deletions(-)
delete mode 100755 src/bilive_upload/LICENSE
rename src/{bilive_upload => uploadProcess}/__init__.py (100%)
rename src/{bilive_upload => uploadProcess}/bilibiliuploader/__init__.py (100%)
rename src/{bilive_upload => uploadProcess}/bilibiliuploader/bilibiliuploader.py (100%)
rename src/{bilive_upload => uploadProcess}/bilibiliuploader/cipher.py (100%)
rename src/{bilive_upload => uploadProcess}/bilibiliuploader/core.py (100%)
rename src/{bilive_upload => uploadProcess}/bilibiliuploader/retry.py (100%)
rename {upload => src/uploadProcess}/biliup (100%)
rename src/{bilive_upload => uploadProcess}/cfg_upload.py (100%)
rename {upload => src/uploadProcess}/config/1234567.yaml (100%)
rename {upload => src/uploadProcess}/config/upload_config.json (100%)
rename src/{bilive_upload => uploadProcess}/requirements.txt (100%)
rename src/{bilive_upload => uploadProcess}/setup.py (100%)
rename {upload => src/uploadProcess}/uploadQueue.sh (73%)
rename {upload => src/uploadProcess}/uploadVideo.sh (90%)
rename {upload => src/uploadProcess}/uploadVideoQueue.txt (100%)
rename {utils => src/utils}/DanmakuFactory (100%)
rename {utils => src/utils}/clearLogs.sh (100%)
rename {utils => src/utils}/removeEmojis.py (100%)
diff --git a/.gitignore b/.gitignore
index f2b98f3..b69fe2d 100755
--- 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
deleted file mode 100755
index 04d6b50..0000000
--- a/src/bilive_upload/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2020 FDS
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/src/burnAndMerge.sh b/src/burnAndMerge.sh
index a5bde78..9ee6ff2 100755
--- 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 ===================="
\ No newline at end of file
diff --git a/src/danmakuBurning.sh b/src/danmakuBurning.sh
index d207b03..0c0856c 100755
--- 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
\ No newline at end of file
+echo "$formatVideoName" >> $BILIVE_PATH/src/uploadProcess/uploadVideoQueue.txt
\ No newline at end of file
diff --git a/src/bilive_upload/__init__.py b/src/uploadProcess/__init__.py
similarity index 100%
rename from src/bilive_upload/__init__.py
rename to src/uploadProcess/__init__.py
diff --git a/src/bilive_upload/bilibiliuploader/__init__.py b/src/uploadProcess/bilibiliuploader/__init__.py
similarity index 100%
rename from src/bilive_upload/bilibiliuploader/__init__.py
rename to src/uploadProcess/bilibiliuploader/__init__.py
diff --git a/src/bilive_upload/bilibiliuploader/bilibiliuploader.py b/src/uploadProcess/bilibiliuploader/bilibiliuploader.py
similarity index 100%
rename from src/bilive_upload/bilibiliuploader/bilibiliuploader.py
rename to src/uploadProcess/bilibiliuploader/bilibiliuploader.py
diff --git a/src/bilive_upload/bilibiliuploader/cipher.py b/src/uploadProcess/bilibiliuploader/cipher.py
similarity index 100%
rename from src/bilive_upload/bilibiliuploader/cipher.py
rename to src/uploadProcess/bilibiliuploader/cipher.py
diff --git a/src/bilive_upload/bilibiliuploader/core.py b/src/uploadProcess/bilibiliuploader/core.py
similarity index 100%
rename from src/bilive_upload/bilibiliuploader/core.py
rename to src/uploadProcess/bilibiliuploader/core.py
diff --git a/src/bilive_upload/bilibiliuploader/retry.py b/src/uploadProcess/bilibiliuploader/retry.py
similarity index 100%
rename from src/bilive_upload/bilibiliuploader/retry.py
rename to src/uploadProcess/bilibiliuploader/retry.py
diff --git a/upload/biliup b/src/uploadProcess/biliup
similarity index 100%
rename from upload/biliup
rename to src/uploadProcess/biliup
diff --git a/src/bilive_upload/cfg_upload.py b/src/uploadProcess/cfg_upload.py
similarity index 100%
rename from src/bilive_upload/cfg_upload.py
rename to src/uploadProcess/cfg_upload.py
diff --git a/upload/config/1234567.yaml b/src/uploadProcess/config/1234567.yaml
similarity index 100%
rename from upload/config/1234567.yaml
rename to src/uploadProcess/config/1234567.yaml
diff --git a/upload/config/upload_config.json b/src/uploadProcess/config/upload_config.json
similarity index 100%
rename from upload/config/upload_config.json
rename to src/uploadProcess/config/upload_config.json
diff --git a/src/bilive_upload/requirements.txt b/src/uploadProcess/requirements.txt
similarity index 100%
rename from src/bilive_upload/requirements.txt
rename to src/uploadProcess/requirements.txt
diff --git a/src/bilive_upload/setup.py b/src/uploadProcess/setup.py
similarity index 100%
rename from src/bilive_upload/setup.py
rename to src/uploadProcess/setup.py
diff --git a/upload/uploadQueue.sh b/src/uploadProcess/uploadQueue.sh
similarity index 73%
rename from upload/uploadQueue.sh
rename to src/uploadProcess/uploadQueue.sh
index 5978531..3e59db2 100755
--- a/upload/uploadQueue.sh
+++ b/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 b/src/uploadProcess/uploadVideo.sh
similarity index 90%
rename from upload/uploadVideo.sh
rename to src/uploadProcess/uploadVideo.sh
index fda6dc6..3468733 100755
--- a/upload/uploadVideo.sh
+++ b/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 b/src/uploadProcess/uploadVideoQueue.txt
similarity index 100%
rename from upload/uploadVideoQueue.txt
rename to src/uploadProcess/uploadVideoQueue.txt
diff --git a/utils/DanmakuFactory b/src/utils/DanmakuFactory
similarity index 100%
rename from utils/DanmakuFactory
rename to src/utils/DanmakuFactory
diff --git a/utils/clearLogs.sh b/src/utils/clearLogs.sh
similarity index 100%
rename from utils/clearLogs.sh
rename to src/utils/clearLogs.sh
diff --git a/utils/removeEmojis.py b/src/utils/removeEmojis.py
similarity index 100%
rename from utils/removeEmojis.py
rename to src/utils/removeEmojis.py
diff --git a/startUpload.sh b/startUpload.sh
index bd33c39..4c7881f 100755
--- 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"