diff --git a/.github/workflows/dev-latest.yml b/.github/workflows/dev-latest.yml new file mode 100644 index 00000000..d6ee17d2 --- /dev/null +++ b/.github/workflows/dev-latest.yml @@ -0,0 +1,34 @@ +name: Deploy To Dockerhub(dev) + +on: + pull_request: + branches: [ main ] + +jobs: + latest: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Create Version info + run: | + echo "version='2.6.0'" > module/conf/version.py + - + name: Set up QEMU + uses: docker/setup-qemu-action@v2 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - + name: Login to Docker Hub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKER_HUB_USERNAME }} + password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} + - + name: Build and push + uses: docker/build-push-action@v3 + with: + push: true + tags: estrellaxd/auto_bangumi:dev-latest + file: ./Dockerfile diff --git a/Dockerfile b/Dockerfile index d0209137..ff1935b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ ENV TZ=Asia/Shanghai \ PGID=1000 \ UMASK=022 -WORKDIR /app +WORKDIR / COPY --from=build --chmod=777 /install /usr/local COPY --chmod=755 . . diff --git a/main.py b/main.py index 3a07ef45..78247028 100644 --- a/main.py +++ b/main.py @@ -1,5 +1,11 @@ -from module.app import run +from module import app +from module import api +import multiprocessing if __name__ == "__main__": - run() + multiprocessing.process() + + app.run() + api.run() + diff --git a/run.sh b/run.sh index d38b7ada..1a8e98ee 100755 --- a/run.sh +++ b/run.sh @@ -1,12 +1,11 @@ #!/bin/bash # Check old version -if [ ]; then +if [ -f /config/bangumi.json ]; then mv /config/bangumi.json /data/bangumi.json fi umask ${UMASK} -exec su-exec auto_bangumi:auto_bangumi python3 main.py & -exec su-exec auto_bangumi:auto_bangumi python3 api.py +python3 main.py diff --git a/test/test_raw_parser.py b/test/test_raw_parser.py index 78b62a90..969fcc5a 100644 --- a/test/test_raw_parser.py +++ b/test/test_raw_parser.py @@ -34,3 +34,20 @@ def test_raw_parser(): assert info.resolution == "1080p" assert info.episode == 9 assert info.season == 1 + + content = "[梦蓝字幕组]New Doraemon 哆啦A梦新番[747][2023.02.25][AVC][1080P][GB_JP][MP4]" + info = parser.analyse(content) + assert info.group == "梦蓝字幕组" + assert info.title_zh == "哆啦A梦新番" + assert info.title_en == "New Doraemon" + assert info.resolution == "1080P" + assert info.episode == 747 + assert info.season == 1 + + content = "[织梦字幕组][尼尔:机械纪元 NieR Automata Ver1.1a][02集][1080P][AVC][简日双语]" + info = parser.analyse(content) + assert info.group == "织梦字幕组" + assert info.title_zh == "尼尔:机械纪元 NieR Automata Ver1.1a" + assert info.resolution == "1080P" + assert info.episode == 2 + assert info.season == 1