From 333b3f05578bde24a5004a7f8a663dbb67f64a16 Mon Sep 17 00:00:00 2001 From: XcantloadX <3188996979@qq.com> Date: Mon, 5 May 2025 19:00:06 +0800 Subject: [PATCH] =?UTF-8?q?refactor(task):=20=E9=87=8D=E5=91=BD=E5=90=8D?= =?UTF-8?q?=20kotonebot.tasks=20=E4=B8=BA=20kotonebot.kaa?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 6 +++--- MANIFEST.in | 4 ++-- justfile | 6 +++--- kotonebot/backend/debug/server.py | 2 +- kotonebot/debug_entry.py | 2 +- kotonebot/{tasks => kaa}/README.md | 0 kotonebot/{tasks => kaa}/__init__.py | 0 kotonebot/{tasks => kaa}/actions/__init__.py | 0 kotonebot/{tasks => kaa}/actions/commu.py | 2 +- kotonebot/{tasks => kaa}/actions/loading.py | 0 kotonebot/{tasks => kaa}/actions/scenes.py | 4 ++-- kotonebot/{tasks => kaa}/actions/stats.py | 0 kotonebot/{tasks => kaa}/clear_logs.py | 0 kotonebot/{tasks => kaa}/common.py | 0 kotonebot/{tasks => kaa}/daily/__init__.py | 0 .../{tasks => kaa}/daily/acquire_activity_funds.py | 0 kotonebot/{tasks => kaa}/daily/acquire_presents.py | 0 kotonebot/{tasks => kaa}/daily/assignment.py | 0 kotonebot/{tasks => kaa}/daily/capsule_toys.py | 0 kotonebot/{tasks => kaa}/daily/club_reward.py | 0 kotonebot/{tasks => kaa}/daily/contest.py | 0 kotonebot/{tasks => kaa}/daily/mission_reward.py | 0 kotonebot/{tasks => kaa}/daily/purchase.py | 0 kotonebot/{tasks => kaa}/daily/upgrade_support_card.py | 0 kotonebot/{tasks => kaa}/db/__init__.py | 0 kotonebot/{tasks => kaa}/db/constants.py | 0 kotonebot/{tasks => kaa}/db/idol_card.py | 0 kotonebot/{tasks => kaa}/db/sqlite.py | 2 +- kotonebot/{tasks => kaa}/end_game.py | 0 kotonebot/{tasks => kaa}/game_ui/__init__.py | 0 kotonebot/{tasks => kaa}/game_ui/badge.py | 0 kotonebot/{tasks => kaa}/game_ui/common.py | 2 +- .../{tasks => kaa}/game_ui/commu_event_buttons.py | 2 +- kotonebot/{tasks => kaa}/game_ui/dialog.py | 2 +- kotonebot/{tasks => kaa}/game_ui/idols_overview.py | 8 ++++---- kotonebot/{tasks => kaa}/game_ui/scrollable.py | 0 kotonebot/{tasks => kaa}/game_ui/toolbar.py | 2 +- kotonebot/{tasks => kaa}/image_db/__init__.py | 0 kotonebot/{tasks => kaa}/image_db/db.py | 2 +- .../{tasks => kaa}/image_db/descriptors/__init__.py | 0 kotonebot/{tasks => kaa}/image_db/descriptors/hist.py | 0 kotonebot/{tasks => kaa}/main/__init__.py | 0 kotonebot/{tasks => kaa}/main/cli.py | 0 kotonebot/{tasks => kaa}/main/gr.py | 8 ++++---- kotonebot/{tasks => kaa}/main/kaa.py | 0 kotonebot/{tasks => kaa}/produce/__init__.py | 0 kotonebot/{tasks => kaa}/produce/cards.py | 0 kotonebot/{tasks => kaa}/produce/common.py | 8 ++++---- kotonebot/{tasks => kaa}/produce/in_purodyuusu.py | 0 kotonebot/{tasks => kaa}/produce/non_lesson_actions.py | 2 +- kotonebot/{tasks => kaa}/produce/p_drink.py | 0 kotonebot/{tasks => kaa}/produce/produce.py | 2 +- kotonebot/{tasks => kaa}/start_game.py | 0 kotonebot/{tasks => kaa}/util/paths.py | 2 +- kotonebot/{tasks => kaa}/util/trace.py | 0 pyproject.toml | 2 +- tests/kaa/test_badge.py | 2 +- tests/util.py | 2 +- tools/R.jinja2 | 2 +- tools/db/extract_resources.py | 4 ++-- tools/make_resources.py | 10 +++++----- 61 files changed, 45 insertions(+), 45 deletions(-) rename kotonebot/{tasks => kaa}/README.md (100%) rename kotonebot/{tasks => kaa}/__init__.py (100%) rename kotonebot/{tasks => kaa}/actions/__init__.py (100%) rename kotonebot/{tasks => kaa}/actions/commu.py (98%) rename kotonebot/{tasks => kaa}/actions/loading.py (100%) rename kotonebot/{tasks => kaa}/actions/scenes.py (96%) rename kotonebot/{tasks => kaa}/actions/stats.py (100%) rename kotonebot/{tasks => kaa}/clear_logs.py (100%) rename kotonebot/{tasks => kaa}/common.py (100%) rename kotonebot/{tasks => kaa}/daily/__init__.py (100%) rename kotonebot/{tasks => kaa}/daily/acquire_activity_funds.py (100%) rename kotonebot/{tasks => kaa}/daily/acquire_presents.py (100%) rename kotonebot/{tasks => kaa}/daily/assignment.py (100%) rename kotonebot/{tasks => kaa}/daily/capsule_toys.py (100%) rename kotonebot/{tasks => kaa}/daily/club_reward.py (100%) rename kotonebot/{tasks => kaa}/daily/contest.py (100%) rename kotonebot/{tasks => kaa}/daily/mission_reward.py (100%) rename kotonebot/{tasks => kaa}/daily/purchase.py (100%) rename kotonebot/{tasks => kaa}/daily/upgrade_support_card.py (100%) rename kotonebot/{tasks => kaa}/db/__init__.py (100%) rename kotonebot/{tasks => kaa}/db/constants.py (100%) rename kotonebot/{tasks => kaa}/db/idol_card.py (100%) rename kotonebot/{tasks => kaa}/db/sqlite.py (87%) rename kotonebot/{tasks => kaa}/end_game.py (100%) rename kotonebot/{tasks => kaa}/game_ui/__init__.py (100%) rename kotonebot/{tasks => kaa}/game_ui/badge.py (100%) rename kotonebot/{tasks => kaa}/game_ui/common.py (98%) rename kotonebot/{tasks => kaa}/game_ui/commu_event_buttons.py (99%) rename kotonebot/{tasks => kaa}/game_ui/dialog.py (97%) rename kotonebot/{tasks => kaa}/game_ui/idols_overview.py (96%) rename kotonebot/{tasks => kaa}/game_ui/scrollable.py (100%) rename kotonebot/{tasks => kaa}/game_ui/toolbar.py (98%) rename kotonebot/{tasks => kaa}/image_db/__init__.py (100%) rename kotonebot/{tasks => kaa}/image_db/db.py (99%) rename kotonebot/{tasks => kaa}/image_db/descriptors/__init__.py (100%) rename kotonebot/{tasks => kaa}/image_db/descriptors/hist.py (100%) rename kotonebot/{tasks => kaa}/main/__init__.py (100%) rename kotonebot/{tasks => kaa}/main/cli.py (100%) rename kotonebot/{tasks => kaa}/main/gr.py (99%) rename kotonebot/{tasks => kaa}/main/kaa.py (100%) rename kotonebot/{tasks => kaa}/produce/__init__.py (100%) rename kotonebot/{tasks => kaa}/produce/cards.py (100%) rename kotonebot/{tasks => kaa}/produce/common.py (97%) rename kotonebot/{tasks => kaa}/produce/in_purodyuusu.py (100%) rename kotonebot/{tasks => kaa}/produce/non_lesson_actions.py (99%) rename kotonebot/{tasks => kaa}/produce/p_drink.py (100%) rename kotonebot/{tasks => kaa}/produce/produce.py (99%) rename kotonebot/{tasks => kaa}/start_game.py (100%) rename kotonebot/{tasks => kaa}/util/paths.py (79%) rename kotonebot/{tasks => kaa}/util/trace.py (100%) diff --git a/.gitignore b/.gitignore index e46cb95..ba2d7c2 100644 --- a/.gitignore +++ b/.gitignore @@ -2,8 +2,9 @@ tests/output_images tests/output_images/* R.py -kotonebot/tasks/sprites -kotonebot/tasks/metadata.py +kotonebot/kaa/sprites +kotonebot/kaa/metadata.py +kotonebot/kaa/resources kotonebot-ui/node_modules kotonebot-ui/.vite dumps*/ @@ -16,7 +17,6 @@ messages/ logs/ traces/ version -kotonebot/tasks/resources cache/ ########################## diff --git a/MANIFEST.in b/MANIFEST.in index 036464f..e2d76c0 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,5 +1,5 @@ -graft kotonebot/tasks/sprites -graft kotonebot/tasks/resources +graft kotonebot/kaa/sprites +graft kotonebot/kaa/resources prune tests prune tools prune experiments \ No newline at end of file diff --git a/justfile b/justfile index 597cd43..7522b20 100644 --- a/justfile +++ b/justfile @@ -50,7 +50,7 @@ generate-metadata: env from pathlib import Path with open("WHATS_NEW.md", "r", encoding="utf-8") as f: content = f.read() - metadata_path = Path("kotonebot/tasks/metadata.py") + metadata_path = Path("kotonebot/kaa/metadata.py") metadata_path.parent.mkdir(parents=True, exist_ok=True) with open(metadata_path, "w", encoding="utf-8") as f: f.write(f'WHATS_NEW = """\n{content}\n"""') @@ -67,10 +67,10 @@ extract-game-data: #!{{shebang_pwsh}} Write-Host "Extracting game data..." - New-Item -ItemType File -Force -Path .\kotonebot\tasks\resources\__init__.py + New-Item -ItemType File -Force -Path .\kotonebot\kaa\resources\__init__.py $currentHash = git -C .\submodules\gakumasu-diff rev-parse HEAD - $hashFile = ".\kotonebot\tasks\resources\game_ver.txt" + $hashFile = ".\kotonebot\kaa\resources\game_ver.txt" $shouldUpdate = $true if (Test-Path $hashFile) { diff --git a/kotonebot/backend/debug/server.py b/kotonebot/backend/debug/server.py index 8c061bb..8373c0d 100644 --- a/kotonebot/backend/debug/server.py +++ b/kotonebot/backend/debug/server.py @@ -143,7 +143,7 @@ def list_dir(path: str) -> list[File]: @app.get("/api/resources/autocomplete") def autocomplete(class_path: str) -> list[str]: - from kotonebot.tasks import R # HACK: hardcode + from kotonebot.kaa import R # HACK: hardcode class_names = class_path.split(".")[:-1] target_class = R # 定位到目标类 diff --git a/kotonebot/debug_entry.py b/kotonebot/debug_entry.py index af74ab2..0eda56a 100644 --- a/kotonebot/debug_entry.py +++ b/kotonebot/debug_entry.py @@ -2,7 +2,7 @@ import runpy import logging import argparse -from kotonebot.tasks.common import BaseConfig +from kotonebot.kaa.common import BaseConfig def run_script(script_path: str) -> None: diff --git a/kotonebot/tasks/README.md b/kotonebot/kaa/README.md similarity index 100% rename from kotonebot/tasks/README.md rename to kotonebot/kaa/README.md diff --git a/kotonebot/tasks/__init__.py b/kotonebot/kaa/__init__.py similarity index 100% rename from kotonebot/tasks/__init__.py rename to kotonebot/kaa/__init__.py diff --git a/kotonebot/tasks/actions/__init__.py b/kotonebot/kaa/actions/__init__.py similarity index 100% rename from kotonebot/tasks/actions/__init__.py rename to kotonebot/kaa/actions/__init__.py diff --git a/kotonebot/tasks/actions/commu.py b/kotonebot/kaa/actions/commu.py similarity index 98% rename from kotonebot/tasks/actions/commu.py rename to kotonebot/kaa/actions/commu.py index c02d246..8aea92f 100644 --- a/kotonebot/tasks/actions/commu.py +++ b/kotonebot/kaa/actions/commu.py @@ -6,7 +6,7 @@ from cv2.typing import MatLike from .. import R from ..game_ui import dialog from kotonebot.util import Interval, Countdown -from kotonebot.tasks.game_ui import WhiteFilter +from kotonebot.kaa.game_ui import WhiteFilter from kotonebot import device, image, user, action, use_screenshot logger = logging.getLogger(__name__) diff --git a/kotonebot/tasks/actions/loading.py b/kotonebot/kaa/actions/loading.py similarity index 100% rename from kotonebot/tasks/actions/loading.py rename to kotonebot/kaa/actions/loading.py diff --git a/kotonebot/tasks/actions/scenes.py b/kotonebot/kaa/actions/scenes.py similarity index 96% rename from kotonebot/tasks/actions/scenes.py rename to kotonebot/kaa/actions/scenes.py index d69abfa..bf1cd7a 100644 --- a/kotonebot/tasks/actions/scenes.py +++ b/kotonebot/kaa/actions/scenes.py @@ -2,8 +2,8 @@ import logging from .. import R from kotonebot.util import Interval -from kotonebot.tasks.game_ui import dialog -from kotonebot.tasks.game_ui import toolbar_home +from kotonebot.kaa.game_ui import dialog +from kotonebot.kaa.game_ui import toolbar_home from kotonebot import device, image, action, until, sleep logger = logging.getLogger(__name__) diff --git a/kotonebot/tasks/actions/stats.py b/kotonebot/kaa/actions/stats.py similarity index 100% rename from kotonebot/tasks/actions/stats.py rename to kotonebot/kaa/actions/stats.py diff --git a/kotonebot/tasks/clear_logs.py b/kotonebot/kaa/clear_logs.py similarity index 100% rename from kotonebot/tasks/clear_logs.py rename to kotonebot/kaa/clear_logs.py diff --git a/kotonebot/tasks/common.py b/kotonebot/kaa/common.py similarity index 100% rename from kotonebot/tasks/common.py rename to kotonebot/kaa/common.py diff --git a/kotonebot/tasks/daily/__init__.py b/kotonebot/kaa/daily/__init__.py similarity index 100% rename from kotonebot/tasks/daily/__init__.py rename to kotonebot/kaa/daily/__init__.py diff --git a/kotonebot/tasks/daily/acquire_activity_funds.py b/kotonebot/kaa/daily/acquire_activity_funds.py similarity index 100% rename from kotonebot/tasks/daily/acquire_activity_funds.py rename to kotonebot/kaa/daily/acquire_activity_funds.py diff --git a/kotonebot/tasks/daily/acquire_presents.py b/kotonebot/kaa/daily/acquire_presents.py similarity index 100% rename from kotonebot/tasks/daily/acquire_presents.py rename to kotonebot/kaa/daily/acquire_presents.py diff --git a/kotonebot/tasks/daily/assignment.py b/kotonebot/kaa/daily/assignment.py similarity index 100% rename from kotonebot/tasks/daily/assignment.py rename to kotonebot/kaa/daily/assignment.py diff --git a/kotonebot/tasks/daily/capsule_toys.py b/kotonebot/kaa/daily/capsule_toys.py similarity index 100% rename from kotonebot/tasks/daily/capsule_toys.py rename to kotonebot/kaa/daily/capsule_toys.py diff --git a/kotonebot/tasks/daily/club_reward.py b/kotonebot/kaa/daily/club_reward.py similarity index 100% rename from kotonebot/tasks/daily/club_reward.py rename to kotonebot/kaa/daily/club_reward.py diff --git a/kotonebot/tasks/daily/contest.py b/kotonebot/kaa/daily/contest.py similarity index 100% rename from kotonebot/tasks/daily/contest.py rename to kotonebot/kaa/daily/contest.py diff --git a/kotonebot/tasks/daily/mission_reward.py b/kotonebot/kaa/daily/mission_reward.py similarity index 100% rename from kotonebot/tasks/daily/mission_reward.py rename to kotonebot/kaa/daily/mission_reward.py diff --git a/kotonebot/tasks/daily/purchase.py b/kotonebot/kaa/daily/purchase.py similarity index 100% rename from kotonebot/tasks/daily/purchase.py rename to kotonebot/kaa/daily/purchase.py diff --git a/kotonebot/tasks/daily/upgrade_support_card.py b/kotonebot/kaa/daily/upgrade_support_card.py similarity index 100% rename from kotonebot/tasks/daily/upgrade_support_card.py rename to kotonebot/kaa/daily/upgrade_support_card.py diff --git a/kotonebot/tasks/db/__init__.py b/kotonebot/kaa/db/__init__.py similarity index 100% rename from kotonebot/tasks/db/__init__.py rename to kotonebot/kaa/db/__init__.py diff --git a/kotonebot/tasks/db/constants.py b/kotonebot/kaa/db/constants.py similarity index 100% rename from kotonebot/tasks/db/constants.py rename to kotonebot/kaa/db/constants.py diff --git a/kotonebot/tasks/db/idol_card.py b/kotonebot/kaa/db/idol_card.py similarity index 100% rename from kotonebot/tasks/db/idol_card.py rename to kotonebot/kaa/db/idol_card.py diff --git a/kotonebot/tasks/db/sqlite.py b/kotonebot/kaa/db/sqlite.py similarity index 87% rename from kotonebot/tasks/db/sqlite.py rename to kotonebot/kaa/db/sqlite.py index da5cc02..8e2bd96 100644 --- a/kotonebot/tasks/db/sqlite.py +++ b/kotonebot/kaa/db/sqlite.py @@ -2,7 +2,7 @@ import os import sqlite3 from typing import Any, cast -from kotonebot.tasks import resources as res +from kotonebot.kaa import resources as res _db: sqlite3.Connection | None = None _db_path = cast(str, res.__path__)[0] + '/game.db' diff --git a/kotonebot/tasks/end_game.py b/kotonebot/kaa/end_game.py similarity index 100% rename from kotonebot/tasks/end_game.py rename to kotonebot/kaa/end_game.py diff --git a/kotonebot/tasks/game_ui/__init__.py b/kotonebot/kaa/game_ui/__init__.py similarity index 100% rename from kotonebot/tasks/game_ui/__init__.py rename to kotonebot/kaa/game_ui/__init__.py diff --git a/kotonebot/tasks/game_ui/badge.py b/kotonebot/kaa/game_ui/badge.py similarity index 100% rename from kotonebot/tasks/game_ui/badge.py rename to kotonebot/kaa/game_ui/badge.py diff --git a/kotonebot/tasks/game_ui/common.py b/kotonebot/kaa/game_ui/common.py similarity index 98% rename from kotonebot/tasks/game_ui/common.py rename to kotonebot/kaa/game_ui/common.py index eace62e..72b5a66 100644 --- a/kotonebot/tasks/game_ui/common.py +++ b/kotonebot/kaa/game_ui/common.py @@ -7,7 +7,7 @@ from cv2.typing import MatLike from kotonebot.backend.image import TemplateMatchResult -from kotonebot.tasks import R +from kotonebot.kaa import R from kotonebot import action, color, image from kotonebot.backend.color import HsvColor from kotonebot.util import Rect diff --git a/kotonebot/tasks/game_ui/commu_event_buttons.py b/kotonebot/kaa/game_ui/commu_event_buttons.py similarity index 99% rename from kotonebot/tasks/game_ui/commu_event_buttons.py rename to kotonebot/kaa/game_ui/commu_event_buttons.py index 336b060..1823189 100644 --- a/kotonebot/tasks/game_ui/commu_event_buttons.py +++ b/kotonebot/kaa/game_ui/commu_event_buttons.py @@ -1,7 +1,7 @@ from dataclasses import dataclass from typing import Sequence -from kotonebot.tasks import R +from kotonebot.kaa import R from kotonebot.backend.core import HintBox from kotonebot.backend.color import HsvColor from kotonebot import action, device, ocr, sleep, Rect diff --git a/kotonebot/tasks/game_ui/dialog.py b/kotonebot/kaa/game_ui/dialog.py similarity index 97% rename from kotonebot/tasks/game_ui/dialog.py rename to kotonebot/kaa/game_ui/dialog.py index 53d782f..6ce4e47 100644 --- a/kotonebot/tasks/game_ui/dialog.py +++ b/kotonebot/kaa/game_ui/dialog.py @@ -1,4 +1,4 @@ -from kotonebot.tasks import R +from kotonebot.kaa import R from kotonebot import device, image def expect_yes(): diff --git a/kotonebot/tasks/game_ui/idols_overview.py b/kotonebot/kaa/game_ui/idols_overview.py similarity index 96% rename from kotonebot/tasks/game_ui/idols_overview.py rename to kotonebot/kaa/game_ui/idols_overview.py index 984e456..268ee66 100644 --- a/kotonebot/tasks/game_ui/idols_overview.py +++ b/kotonebot/kaa/game_ui/idols_overview.py @@ -7,13 +7,13 @@ import cv2 import numpy as np from cv2.typing import MatLike -from kotonebot.tasks import R -from kotonebot.tasks.util import paths +from kotonebot.kaa import R +from kotonebot.kaa.util import paths from kotonebot.util import Rect, cv2_imread -from kotonebot.tasks.game_ui import Scrollable +from kotonebot.kaa.game_ui import Scrollable from kotonebot.backend.debug import result, img from kotonebot import device, color, action, sleep, contains -from kotonebot.tasks.image_db import ImageDatabase, HistDescriptor, FileDataSource +from kotonebot.kaa.image_db import ImageDatabase, HistDescriptor, FileDataSource from kotonebot.backend.preprocessor import HsvColorRemover, HsvColorsRemover logger = logging.getLogger(__name__) diff --git a/kotonebot/tasks/game_ui/scrollable.py b/kotonebot/kaa/game_ui/scrollable.py similarity index 100% rename from kotonebot/tasks/game_ui/scrollable.py rename to kotonebot/kaa/game_ui/scrollable.py diff --git a/kotonebot/tasks/game_ui/toolbar.py b/kotonebot/kaa/game_ui/toolbar.py similarity index 98% rename from kotonebot/tasks/game_ui/toolbar.py rename to kotonebot/kaa/game_ui/toolbar.py index 7f2052f..3044bde 100644 --- a/kotonebot/tasks/game_ui/toolbar.py +++ b/kotonebot/kaa/game_ui/toolbar.py @@ -2,7 +2,7 @@ from typing import Literal, overload from kotonebot.backend.image import TemplateMatchResult -from kotonebot.tasks import R +from kotonebot.kaa import R from .common import WhiteFilter from kotonebot import action, device, image diff --git a/kotonebot/tasks/image_db/__init__.py b/kotonebot/kaa/image_db/__init__.py similarity index 100% rename from kotonebot/tasks/image_db/__init__.py rename to kotonebot/kaa/image_db/__init__.py diff --git a/kotonebot/tasks/image_db/db.py b/kotonebot/kaa/image_db/db.py similarity index 99% rename from kotonebot/tasks/image_db/db.py rename to kotonebot/kaa/image_db/db.py index 6313bd9..f0d3756 100644 --- a/kotonebot/tasks/image_db/db.py +++ b/kotonebot/kaa/image_db/db.py @@ -167,7 +167,7 @@ class ImageDatabase: if __name__ == '__main__': - from kotonebot.tasks.image_db.db import Db + from kotonebot.kaa.image_db.db import Db logging.basicConfig(level=logging.DEBUG, format='[%(asctime)s] [%(levelname)s] [%(name)s] [%(funcName)s] [%(lineno)d] %(message)s') imgs_path = r'E:\GithubRepos\KotonesAutoAssistant.worktrees\dev\kotonebot\tasks\resources\idol_cards' needle_path = r'D:\05.png' diff --git a/kotonebot/tasks/image_db/descriptors/__init__.py b/kotonebot/kaa/image_db/descriptors/__init__.py similarity index 100% rename from kotonebot/tasks/image_db/descriptors/__init__.py rename to kotonebot/kaa/image_db/descriptors/__init__.py diff --git a/kotonebot/tasks/image_db/descriptors/hist.py b/kotonebot/kaa/image_db/descriptors/hist.py similarity index 100% rename from kotonebot/tasks/image_db/descriptors/hist.py rename to kotonebot/kaa/image_db/descriptors/hist.py diff --git a/kotonebot/tasks/main/__init__.py b/kotonebot/kaa/main/__init__.py similarity index 100% rename from kotonebot/tasks/main/__init__.py rename to kotonebot/kaa/main/__init__.py diff --git a/kotonebot/tasks/main/cli.py b/kotonebot/kaa/main/cli.py similarity index 100% rename from kotonebot/tasks/main/cli.py rename to kotonebot/kaa/main/cli.py diff --git a/kotonebot/tasks/main/gr.py b/kotonebot/kaa/main/gr.py similarity index 99% rename from kotonebot/tasks/main/gr.py rename to kotonebot/kaa/main/gr.py index c73f050..541f968 100644 --- a/kotonebot/tasks/main/gr.py +++ b/kotonebot/kaa/main/gr.py @@ -8,12 +8,12 @@ from typing import List, Dict, Tuple, Literal, Generator import cv2 import gradio as gr -from kotonebot.tasks.main import Kaa -from kotonebot.tasks.db import IdolCard +from kotonebot.kaa.main import Kaa +from kotonebot.kaa.db import IdolCard from kotonebot.config.manager import load_config, save_config from kotonebot.config.base_config import UserConfig, BackendConfig from kotonebot.backend.context import task_registry, ContextStackVars -from kotonebot.tasks.common import ( +from kotonebot.kaa.common import ( BaseConfig, APShopItems, CapsuleToysConfig, ClubRewardConfig, PurchaseConfig, ActivityFundsConfig, PresentsConfig, AssignmentConfig, ContestConfig, ProduceConfig, MissionRewardConfig, DailyMoneyShopItems, ProduceAction, @@ -1120,7 +1120,7 @@ class KotoneBotUI: def _create_whats_new_tab(self) -> None: """创建更新日志标签页,并显示最新版本更新内容""" with gr.Tab("更新日志"): - from kotonebot.tasks.metadata import WHATS_NEW + from kotonebot.kaa.metadata import WHATS_NEW gr.Markdown(WHATS_NEW) def _create_screen_tab(self) -> None: diff --git a/kotonebot/tasks/main/kaa.py b/kotonebot/kaa/main/kaa.py similarity index 100% rename from kotonebot/tasks/main/kaa.py rename to kotonebot/kaa/main/kaa.py diff --git a/kotonebot/tasks/produce/__init__.py b/kotonebot/kaa/produce/__init__.py similarity index 100% rename from kotonebot/tasks/produce/__init__.py rename to kotonebot/kaa/produce/__init__.py diff --git a/kotonebot/tasks/produce/cards.py b/kotonebot/kaa/produce/cards.py similarity index 100% rename from kotonebot/tasks/produce/cards.py rename to kotonebot/kaa/produce/cards.py diff --git a/kotonebot/tasks/produce/common.py b/kotonebot/kaa/produce/common.py similarity index 97% rename from kotonebot/tasks/produce/common.py rename to kotonebot/kaa/produce/common.py index c4dcafd..a8e7861 100644 --- a/kotonebot/tasks/produce/common.py +++ b/kotonebot/kaa/produce/common.py @@ -12,10 +12,10 @@ from kotonebot import ( ) from .p_drink import acquire_p_drink from kotonebot.util import measure_time -from kotonebot.tasks.common import conf -from kotonebot.tasks.actions.loading import loading -from kotonebot.tasks.game_ui import CommuEventButtonUI, dialog, badge -from kotonebot.tasks.actions.commu import handle_unread_commu +from kotonebot.kaa.common import conf +from kotonebot.kaa.actions.loading import loading +from kotonebot.kaa.game_ui import CommuEventButtonUI, dialog, badge +from kotonebot.kaa.actions.commu import handle_unread_commu logger = getLogger(__name__) diff --git a/kotonebot/tasks/produce/in_purodyuusu.py b/kotonebot/kaa/produce/in_purodyuusu.py similarity index 100% rename from kotonebot/tasks/produce/in_purodyuusu.py rename to kotonebot/kaa/produce/in_purodyuusu.py diff --git a/kotonebot/tasks/produce/non_lesson_actions.py b/kotonebot/kaa/produce/non_lesson_actions.py similarity index 99% rename from kotonebot/tasks/produce/non_lesson_actions.py rename to kotonebot/kaa/produce/non_lesson_actions.py index 2471923..01dac1f 100644 --- a/kotonebot/tasks/produce/non_lesson_actions.py +++ b/kotonebot/kaa/produce/non_lesson_actions.py @@ -5,7 +5,7 @@ """ from logging import getLogger -from kotonebot.tasks.game_ui import dialog +from kotonebot.kaa.game_ui import dialog from .. import R diff --git a/kotonebot/tasks/produce/p_drink.py b/kotonebot/kaa/produce/p_drink.py similarity index 100% rename from kotonebot/tasks/produce/p_drink.py rename to kotonebot/kaa/produce/p_drink.py diff --git a/kotonebot/tasks/produce/produce.py b/kotonebot/kaa/produce/produce.py similarity index 99% rename from kotonebot/tasks/produce/produce.py rename to kotonebot/kaa/produce/produce.py index d0c0b36..5c7993a 100644 --- a/kotonebot/tasks/produce/produce.py +++ b/kotonebot/kaa/produce/produce.py @@ -365,7 +365,7 @@ if __name__ == '__main__': import time from kotonebot.backend.context import init_context, manual_context - from kotonebot.tasks.common import BaseConfig + from kotonebot.kaa.common import BaseConfig from kotonebot.util import Profiler init_context(config_type=BaseConfig) conf().produce.enabled = True diff --git a/kotonebot/tasks/start_game.py b/kotonebot/kaa/start_game.py similarity index 100% rename from kotonebot/tasks/start_game.py rename to kotonebot/kaa/start_game.py diff --git a/kotonebot/tasks/util/paths.py b/kotonebot/kaa/util/paths.py similarity index 79% rename from kotonebot/tasks/util/paths.py rename to kotonebot/kaa/util/paths.py index a7178d3..0be8616 100644 --- a/kotonebot/tasks/util/paths.py +++ b/kotonebot/kaa/util/paths.py @@ -1,7 +1,7 @@ import os from typing import cast -from kotonebot.tasks import resources as res +from kotonebot.kaa import resources as res CACHE = os.path.join('cache') RESOURCE = cast(list[str], res.__path__)[0] diff --git a/kotonebot/tasks/util/trace.py b/kotonebot/kaa/util/trace.py similarity index 100% rename from kotonebot/tasks/util/trace.py rename to kotonebot/kaa/util/trace.py diff --git a/pyproject.toml b/pyproject.toml index a1059b2..4e8329d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -48,7 +48,7 @@ dependencies = [ package-dir = { "kotonebot" = "kotonebot" } [project.scripts] -kaa = "kotonebot.tasks.main.cli:main" +kaa = "kotonebot.kaa.main.cli:main" [tool.setuptools.dynamic] version = {file = "./version"} \ No newline at end of file diff --git a/tests/kaa/test_badge.py b/tests/kaa/test_badge.py index 89944a3..ca2a80c 100644 --- a/tests/kaa/test_badge.py +++ b/tests/kaa/test_badge.py @@ -1,5 +1,5 @@ from unittest import TestCase -from kotonebot.tasks.game_ui.badge import match, BadgeResult +from kotonebot.kaa.game_ui.badge import match, BadgeResult from kotonebot.util import Rect def rect_from_center(x: int, y: int) -> Rect: diff --git a/tests/util.py b/tests/util.py index 256b88a..20c59ea 100644 --- a/tests/util.py +++ b/tests/util.py @@ -82,7 +82,7 @@ class BaseTestCase(unittest.TestCase): cls.device = MockDevice() from kotonebot.backend.debug.server import start_server from kotonebot.backend.debug import debug - from kotonebot.tasks.common import BaseConfig + from kotonebot.kaa.common import BaseConfig debug.enabled = True # debug.wait_for_message_sent = True start_server() diff --git a/tools/R.jinja2 b/tools/R.jinja2 index 98b1f90..07ca0df 100644 --- a/tools/R.jinja2 +++ b/tools/R.jinja2 @@ -3,7 +3,7 @@ ####### 此文件为自动生成,请勿编辑 ####### ####### AUTO GENERATED. DO NOT EDIT. ####### {%- endif %} -from kotonebot.tasks.common import sprite_path +from kotonebot.kaa.common import sprite_path from kotonebot.backend.core import Image, HintBox, HintPoint diff --git a/tools/db/extract_resources.py b/tools/db/extract_resources.py index d3a310c..08f4a5e 100644 --- a/tools/db/extract_resources.py +++ b/tools/db/extract_resources.py @@ -17,10 +17,10 @@ print("拉取资源...") manifest = gom.fetch() print("提取 P 偶像卡资源...") -base_path = './kotonebot/tasks/resources/idol_cards' +base_path = './kotonebot/kaa/resources/idol_cards' os.makedirs(base_path, exist_ok=True) -db = sqlite3.connect("./kotonebot/tasks/resources/game.db") +db = sqlite3.connect("./kotonebot/kaa/resources/game.db") cursor = db.execute(""" SELECT IC.id AS cardId, diff --git a/tools/make_resources.py b/tools/make_resources.py index bfc73b1..d4825e2 100644 --- a/tools/make_resources.py +++ b/tools/make_resources.py @@ -457,12 +457,12 @@ if __name__ == '__main__': parser.add_argument('-i', '--ide', help='IDE 类型', default=ide_type()) args = parser.parse_args() - if os.path.exists(r'kotonebot\tasks\sprites'): - shutil.rmtree(r'kotonebot\tasks\sprites') + if os.path.exists(r'kotonebot\kaa\sprites'): + shutil.rmtree(r'kotonebot\kaa\sprites') path = PATH + '\\jp' files = scan_png_files(path) sprites = load_sprites(path, files) - sprites = copy_sprites(sprites, r'kotonebot\tasks\sprites') + sprites = copy_sprites(sprites, r'kotonebot\kaa\sprites') classes = make_classes(sprites, args.ide) env = jinja2.Environment(loader=jinja2.FileSystemLoader('./tools')) @@ -470,9 +470,9 @@ if __name__ == '__main__': template = env.get_template('R.jinja2') print(f'Rendering template: {template.name}') - with open('./kotonebot/tasks/R.py', 'w', encoding='utf-8') as f: + with open('./kotonebot/kaa/tasks/R.py', 'w', encoding='utf-8') as f: f.write(template.render(data=classes, production=args.production)) print('Creating __init__.py') - with open('./kotonebot/tasks/sprites/__init__.py', 'w', encoding='utf-8') as f: + with open('./kotonebot/kaa/sprites/__init__.py', 'w', encoding='utf-8') as f: f.write('') print('All done!') \ No newline at end of file