From cc65c07886b44c3ef471b09e13ee217e240b14b8 Mon Sep 17 00:00:00 2001 From: EstrellaXD Date: Tue, 14 Mar 2023 23:11:45 +0800 Subject: [PATCH] Fix RequestContent(), fix renamer.py --- .github/workflows/dev-latest.yml | 3 +++ .github/workflows/docker.yml | 5 ++++- .github/workflows/unittest.yml | 5 ++++- .gitignore | 1 + .dockerignore => src/.dockerignore | 2 +- Dockerfile => src/Dockerfile | 4 ++-- src/main.py | 21 ++++++++++----------- src/module/api.py | 2 +- src/module/manager/eps_complete.py | 15 --------------- src/module/manager/renamer.py | 5 +++-- src/module/models/__init__.py | 1 + src/module/network/request_url.py | 1 + requirements.txt => src/requirements.txt | 0 src/run.sh | 1 - 14 files changed, 31 insertions(+), 35 deletions(-) rename .dockerignore => src/.dockerignore (95%) rename Dockerfile => src/Dockerfile (94%) rename requirements.txt => src/requirements.txt (100%) diff --git a/.github/workflows/dev-latest.yml b/.github/workflows/dev-latest.yml index da55a6dc..966c0a79 100644 --- a/.github/workflows/dev-latest.yml +++ b/.github/workflows/dev-latest.yml @@ -8,6 +8,9 @@ jobs: latest: runs-on: ubuntu-latest steps: + - name: Enter directory + run: | + cd src - name: Checkout uses: actions/checkout@v3 - name: Create Version info diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index caa3c847..4639854c 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -9,12 +9,15 @@ jobs: docker: runs-on: ubuntu-latest steps: + - name: Enter directory + run: | + cd src - name: Checkout uses: actions/checkout@v3 - name: Create Version info run: | - echo "version='$GITHUB_REF_NAME'" > src/module/__version__.py + echo "VERSION = '$GITHUB_REF_NAME'" > module/__version__.py - name: Docker meta id: meta uses: docker/metadata-action@v4 diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index 03b0584a..b4448a7f 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -22,6 +22,10 @@ jobs: with: python-version: "3.11" + - name: Enter directory + run: | + cd src + - name: Install dependencies run: | python -m pip install --upgrade pip @@ -30,5 +34,4 @@ jobs: - name: Test run: | - cd src pytest test/test_raw_parser.py \ No newline at end of file diff --git a/.gitignore b/.gitignore index 770d221f..b161e24b 100644 --- a/.gitignore +++ b/.gitignore @@ -178,3 +178,4 @@ test.* /src/templates/ /src/config/ +/src/debuger.py diff --git a/.dockerignore b/src/.dockerignore similarity index 95% rename from .dockerignore rename to src/.dockerignore index e597ba6b..6713638d 100644 --- a/.dockerignore +++ b/src/.dockerignore @@ -16,7 +16,7 @@ coverage.xml *.log .git .mypy_cache -.pytest_cache +../.pytest_cache .hypothesis src/module/tests diff --git a/Dockerfile b/src/Dockerfile similarity index 94% rename from Dockerfile rename to src/Dockerfile index cc6fddc1..1c4c7b75 100644 --- a/Dockerfile +++ b/src/Dockerfile @@ -25,7 +25,7 @@ ENV TZ=Asia/Shanghai \ WORKDIR /app COPY --from=build --chmod=777 /install /usr/local -COPY --chmod=755 src/. /app +COPY --chmod=755 . /app RUN apk add --no-cache \ curl \ @@ -48,6 +48,6 @@ RUN addgroup -S auto_bangumi -g 1000 && \ EXPOSE 7892 -VOLUME [ "config" , "data"] +VOLUME [ "/app/config" , "/app/data"] CMD ["sh", "run.sh"] diff --git a/src/main.py b/src/main.py index 1b22df76..4496dec6 100644 --- a/src/main.py +++ b/src/main.py @@ -4,15 +4,14 @@ from module import api import multiprocessing if __name__ == "__main__": - # num_processes = 2 - # processes = [] - # p1 = multiprocessing.Process(target=app.run) - # p2 = multiprocessing.Process(target=api.run) - # process_list = [p1, p2] - # for p in process_list: - # p.start() - # processes.append(p) - # for p in processes: - # p.join() - app.run() + num_processes = 2 + processes = [] + p1 = multiprocessing.Process(target=app.run) + p2 = multiprocessing.Process(target=api.run) + process_list = [p1, p2] + for p in process_list: + p.start() + processes.append(p) + for p in processes: + p.join() diff --git a/src/module/api.py b/src/module/api.py index 1d6fdb83..eb789a93 100644 --- a/src/module/api.py +++ b/src/module/api.py @@ -9,7 +9,7 @@ import logging from .core import APIProcess from .conf import settings, DATA_PATH, LOG_PATH from .utils import json_config -from .models.api import * +from models.api import * logger = logging.getLogger(__name__) diff --git a/src/module/manager/eps_complete.py b/src/module/manager/eps_complete.py index b6ce13cf..ee404629 100644 --- a/src/module/manager/eps_complete.py +++ b/src/module/manager/eps_complete.py @@ -66,18 +66,3 @@ class FullSeasonGet: logger.info("Completed!") -if __name__ == "__main__": - a = FullSeasonGet() - data = { - "official_title": "指名！", - "title_raw": "CUE!", - "season": 1, - "season_raw": "", - "group": "喵萌Production", - "dpi": "1080p", - "source": None, - "subtitle": "简日双语", - "added": True, - "eps_collect": True - } - print(a.init_eps_complete_search_str(data)) diff --git a/src/module/manager/renamer.py b/src/module/manager/renamer.py index 8a5d44cf..0782377c 100644 --- a/src/module/manager/renamer.py +++ b/src/module/manager/renamer.py @@ -65,8 +65,9 @@ class Renamer: try: new_name = self._renamer.download_parser(name, folder_name, season, suffix, settings.bangumi_manage.rename_method) if path_name != new_name: - old_name = os.path.basename(info.content_path) - self.client.rename_torrent_file(torrent_hash, new_name, old_name, new_name) + old_path = info.content_path.replace(info.save_path, "") + old_path = old_path[len(os.path.sep):] + self.client.rename_torrent_file(torrent_hash, new_name, old_path, new_name) rename_count += 1 else: continue diff --git a/src/module/models/__init__.py b/src/module/models/__init__.py index e69de29b..8e0e9d66 100644 --- a/src/module/models/__init__.py +++ b/src/module/models/__init__.py @@ -0,0 +1 @@ +from .bangumi import * \ No newline at end of file diff --git a/src/module/network/request_url.py b/src/module/network/request_url.py index 5dbd30e6..90be4c1a 100644 --- a/src/module/network/request_url.py +++ b/src/module/network/request_url.py @@ -48,6 +48,7 @@ class RequestURL: socks.set_default_proxy(socks.SOCKS5, addr=settings.proxy.host, port=settings.proxy.port, rdns=True, username=settings.proxy.username, password=settings.proxy.password) socket.socket = socks.socksocket + return self def __exit__(self, exc_type, exc_val, exc_tb): self.session.close() diff --git a/requirements.txt b/src/requirements.txt similarity index 100% rename from requirements.txt rename to src/requirements.txt diff --git a/src/run.sh b/src/run.sh index 1a8e98ee..39000cb9 100755 --- a/src/run.sh +++ b/src/run.sh @@ -6,6 +6,5 @@ if [ -f /config/bangumi.json ]; then fi - umask ${UMASK} python3 main.py