Move python project into a separate directory

SeoulSKY · Mar 4, 2024 · 2634d86 · 2634d86
1 parent 2c6f847
commit 2634d86
Show file tree

Hide file tree

Showing 86 changed files with 19 additions and 21 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,10 @@
 /venv/
-.idea
+**.idea
 /.env
 **__pycache__
 **.DS_Store
-**.pytest_cache/
-/logs/
-/cache/
+**.pytest_cache
+**logs/
+**cache/
 
 service_account.json
diff --git a/README.md b/README.md
@@ -38,22 +38,20 @@ Create `.env` file, copy and paste all contents from `.env.example` file, and fi
 | CAI_CHAR_ID                          | ID for the character in the Character AI. Follow the [guide](https://pycai.gitbook.io/welcome/api/values) to learn how to acquire it.                                                                          |
 | CAI_TGT                              | ID for the target in the Character AI. Its value starts with `internal_id:`. Run `scripts/cai_tgt.py` to get it.                                                                                               |
 
-
 ### Running with [Docker](https://www.docker.com) and [Docker Compose](https://docs.docker.com/compose/install/) (Recommended)
 
 Run the following command:
 
-```
-docker-compose pull && docker-compose up
+```bash
+docker-compose pull && docker-compose up -d
 ```
 
 Optionally, you can add `-d` flag to run the docker container in detached mode.
 
-
 If you want to build the docker image by yourself and run it, use the following commands:
 
-```
-docker-compose -f docker-compose-dev.yml up --build
+```bash
+docker-compose -f docker-compose-dev.yml up --build -d
 ```
 
 ### Running without [Docker](https://www.docker.com)

diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
@@ -2,13 +2,13 @@ version: "3"
 
 services:
   sorusora:
-    build: .
+    build: ./sorusora
     container_name: sorusora
     volumes:
-      - ./logs:/app/logs
-      - ./cache:/app/cache
-      - ./cache/algos_packages:${HOME}/.local/share/argos-translate/packages/
-      - ./cache/algos_cache:${HOME}/.local/cache/argos-translate/
+      - ./sorusora/logs:/app/logs
+      - ./sorusora/cache:/app/cache
+      - ./sorusora/cache/algos_packages:${HOME}/.local/share/argos-translate/packages/
+      - ./sorusora/cache/algos_cache:${HOME}/.local/cache/argos-translate/
     env_file:
       - .env
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -5,10 +5,10 @@ services:
     image: ghcr.io/seoulsky/sorusora:latest
     container_name: sorusora
     volumes:
-      - ./logs:/app/logs
-      - ./cache:/app/cache
-      - ./cache/algos_packages:${HOME}/.local/share/argos-translate/packages/
-      - ./cache/algos_cache:${HOME}/.local/cache/argos-translate/
+      - ./sorusora/logs:/app/logs
+      - ./sorusora/cache:/app/cache
+      - ./sorusora/cache/algos_packages:${HOME}/.local/share/argos-translate/packages/
+      - ./sorusora/cache/algos_cache:${HOME}/.local/cache/argos-translate/
     env_file:
       - .env
 

diff --git a/.pylintrc → sorusora/.pylintrc b/.pylintrc → sorusora/.pylintrc
diff --git a/.python-version → sorusora/.python-version b/.python-version → sorusora/.python-version
diff --git a/Dockerfile → sorusora/Dockerfile b/Dockerfile → sorusora/Dockerfile
diff --git a/assets/arcaea_logo.png → sorusora/assets/arcaea_logo.png b/assets/arcaea_logo.png → sorusora/assets/arcaea_logo.png
diff --git a/assets/bad_apple.mp4 → sorusora/assets/bad_apple.mp4 b/assets/bad_apple.mp4 → sorusora/assets/bad_apple.mp4
diff --git a/assets/ultra_bk.mp4 → sorusora/assets/ultra_bk.mp4 b/assets/ultra_bk.mp4 → sorusora/assets/ultra_bk.mp4
diff --git a/commands/__init__.py → sorusora/commands/__init__.py b/commands/__init__.py → sorusora/commands/__init__.py
diff --git a/commands/about.py → sorusora/commands/about.py b/commands/about.py → sorusora/commands/about.py
diff --git a/commands/arcaea.py → sorusora/commands/arcaea.py b/commands/arcaea.py → sorusora/commands/arcaea.py
diff --git a/commands/chat.py → sorusora/commands/chat.py b/commands/chat.py → sorusora/commands/chat.py
diff --git a/commands/dice.py → sorusora/commands/dice.py b/commands/dice.py → sorusora/commands/dice.py
diff --git a/commands/help_.py → sorusora/commands/help_.py b/commands/help_.py → sorusora/commands/help_.py
diff --git a/commands/movie.py → sorusora/commands/movie.py b/commands/movie.py → sorusora/commands/movie.py
@@ -25,7 +25,7 @@
 Path to the cache directory for desktop
 """
 
-MOBILE_CACHE_PATH = constants.CACHE_DIR / "movie" /"mobile"
+MOBILE_CACHE_PATH = constants.CACHE_DIR / "movie" / "mobile"
 """
 Path to the cache directory for mobile
 """

diff --git a/commands/ping.py → sorusora/commands/ping.py b/commands/ping.py → sorusora/commands/ping.py
diff --git a/commands/translator.py → sorusora/commands/translator.py b/commands/translator.py → sorusora/commands/translator.py
diff --git a/context_menus/__init__.py → sorusora/context_menus/__init__.py b/context_menus/__init__.py → sorusora/context_menus/__init__.py
diff --git a/context_menus/translate_message.py → sorusora/context_menus/translate_message.py b/context_menus/translate_message.py → sorusora/context_menus/translate_message.py
diff --git a/docs/about/en.md → sorusora/docs/about/en.md b/docs/about/en.md → sorusora/docs/about/en.md
diff --git a/docs/about/ko.md → sorusora/docs/about/ko.md b/docs/about/ko.md → sorusora/docs/about/ko.md
diff --git a/docs/help/about/en.md → sorusora/docs/help/about/en.md b/docs/help/about/en.md → sorusora/docs/help/about/en.md
diff --git a/docs/help/about/ko.md → sorusora/docs/help/about/ko.md b/docs/help/about/ko.md → sorusora/docs/help/about/ko.md
diff --git a/docs/help/arcaea/linkplay/en.md → sorusora/docs/help/arcaea/linkplay/en.md b/docs/help/arcaea/linkplay/en.md → sorusora/docs/help/arcaea/linkplay/en.md
diff --git a/docs/help/arcaea/linkplay/ko.md → sorusora/docs/help/arcaea/linkplay/ko.md b/docs/help/arcaea/linkplay/ko.md → sorusora/docs/help/arcaea/linkplay/ko.md
diff --git a/docs/help/chat/clear/en.md → sorusora/docs/help/chat/clear/en.md b/docs/help/chat/clear/en.md → sorusora/docs/help/chat/clear/en.md
diff --git a/docs/help/chat/clear/ko.md → sorusora/docs/help/chat/clear/ko.md b/docs/help/chat/clear/ko.md → sorusora/docs/help/chat/clear/ko.md
diff --git a/docs/help/chat/set_language/en.md → sorusora/docs/help/chat/set_language/en.md b/docs/help/chat/set_language/en.md → sorusora/docs/help/chat/set_language/en.md
diff --git a/docs/help/chat/set_language/ko.md → sorusora/docs/help/chat/set_language/ko.md b/docs/help/chat/set_language/ko.md → sorusora/docs/help/chat/set_language/ko.md
diff --git a/docs/help/dice/en.md → sorusora/docs/help/dice/en.md b/docs/help/dice/en.md → sorusora/docs/help/dice/en.md
diff --git a/docs/help/dice/ko.md → sorusora/docs/help/dice/ko.md b/docs/help/dice/ko.md → sorusora/docs/help/dice/ko.md
diff --git a/docs/help/ping/en.md → sorusora/docs/help/ping/en.md b/docs/help/ping/en.md → sorusora/docs/help/ping/en.md
diff --git a/docs/help/ping/ko.md → sorusora/docs/help/ping/ko.md b/docs/help/ping/ko.md → sorusora/docs/help/ping/ko.md
diff --git a/.../translator/clear_channel_languages/en.md → .../translator/clear_channel_languages/en.md b/.../translator/clear_channel_languages/en.md → .../translator/clear_channel_languages/en.md
diff --git a/.../translator/clear_channel_languages/ko.md → .../translator/clear_channel_languages/ko.md b/.../translator/clear_channel_languages/ko.md → .../translator/clear_channel_languages/ko.md
diff --git a/docs/help/translator/clear_languages/en.md → ...ocs/help/translator/clear_languages/en.md b/docs/help/translator/clear_languages/en.md → ...ocs/help/translator/clear_languages/en.md
diff --git a/docs/help/translator/clear_languages/ko.md → ...ocs/help/translator/clear_languages/ko.md b/docs/help/translator/clear_languages/ko.md → ...ocs/help/translator/clear_languages/ko.md
diff --git a/...lp/translator/set_channel_languages/en.md → ...lp/translator/set_channel_languages/en.md b/...lp/translator/set_channel_languages/en.md → ...lp/translator/set_channel_languages/en.md
diff --git a/...lp/translator/set_channel_languages/ko.md → ...lp/translator/set_channel_languages/ko.md b/...lp/translator/set_channel_languages/ko.md → ...lp/translator/set_channel_languages/ko.md
diff --git a/docs/help/translator/set_languages/en.md → .../docs/help/translator/set_languages/en.md b/docs/help/translator/set_languages/en.md → .../docs/help/translator/set_languages/en.md
diff --git a/docs/help/translator/set_languages/ko.md → .../docs/help/translator/set_languages/ko.md b/docs/help/translator/set_languages/ko.md → .../docs/help/translator/set_languages/ko.md
diff --git a/locales/en/commands/about.ftl → sorusora/locales/en/commands/about.ftl b/locales/en/commands/about.ftl → sorusora/locales/en/commands/about.ftl
diff --git a/locales/en/commands/arcaea.ftl → sorusora/locales/en/commands/arcaea.ftl b/locales/en/commands/arcaea.ftl → sorusora/locales/en/commands/arcaea.ftl
diff --git a/locales/en/commands/chat.ftl → sorusora/locales/en/commands/chat.ftl b/locales/en/commands/chat.ftl → sorusora/locales/en/commands/chat.ftl
diff --git a/locales/en/commands/dice.ftl → sorusora/locales/en/commands/dice.ftl b/locales/en/commands/dice.ftl → sorusora/locales/en/commands/dice.ftl
diff --git a/locales/en/commands/help.ftl → sorusora/locales/en/commands/help.ftl b/locales/en/commands/help.ftl → sorusora/locales/en/commands/help.ftl
diff --git a/locales/en/commands/movie.ftl → sorusora/locales/en/commands/movie.ftl b/locales/en/commands/movie.ftl → sorusora/locales/en/commands/movie.ftl
diff --git a/locales/en/commands/ping.ftl → sorusora/locales/en/commands/ping.ftl b/locales/en/commands/ping.ftl → sorusora/locales/en/commands/ping.ftl
diff --git a/locales/en/commands/translator.ftl → sorusora/locales/en/commands/translator.ftl b/locales/en/commands/translator.ftl → sorusora/locales/en/commands/translator.ftl
diff --git a/...es/en/context_menus/translate_message.ftl → ...es/en/context_menus/translate_message.ftl b/...es/en/context_menus/translate_message.ftl → ...es/en/context_menus/translate_message.ftl
diff --git a/locales/en/main.ftl → sorusora/locales/en/main.ftl b/locales/en/main.ftl → sorusora/locales/en/main.ftl
diff --git a/locales/en/utils/translator.ftl → sorusora/locales/en/utils/translator.ftl b/locales/en/utils/translator.ftl → sorusora/locales/en/utils/translator.ftl
diff --git a/locales/en/utils/ui.ftl → sorusora/locales/en/utils/ui.ftl b/locales/en/utils/ui.ftl → sorusora/locales/en/utils/ui.ftl
diff --git a/locales/ko/commands/about.ftl → sorusora/locales/ko/commands/about.ftl b/locales/ko/commands/about.ftl → sorusora/locales/ko/commands/about.ftl
diff --git a/locales/ko/commands/arcaea.ftl → sorusora/locales/ko/commands/arcaea.ftl b/locales/ko/commands/arcaea.ftl → sorusora/locales/ko/commands/arcaea.ftl
diff --git a/locales/ko/commands/chat.ftl → sorusora/locales/ko/commands/chat.ftl b/locales/ko/commands/chat.ftl → sorusora/locales/ko/commands/chat.ftl
diff --git a/locales/ko/commands/dice.ftl → sorusora/locales/ko/commands/dice.ftl b/locales/ko/commands/dice.ftl → sorusora/locales/ko/commands/dice.ftl
diff --git a/locales/ko/commands/help.ftl → sorusora/locales/ko/commands/help.ftl b/locales/ko/commands/help.ftl → sorusora/locales/ko/commands/help.ftl
diff --git a/locales/ko/commands/movie.ftl → sorusora/locales/ko/commands/movie.ftl b/locales/ko/commands/movie.ftl → sorusora/locales/ko/commands/movie.ftl
diff --git a/locales/ko/commands/ping.ftl → sorusora/locales/ko/commands/ping.ftl b/locales/ko/commands/ping.ftl → sorusora/locales/ko/commands/ping.ftl
diff --git a/locales/ko/commands/translator.ftl → sorusora/locales/ko/commands/translator.ftl b/locales/ko/commands/translator.ftl → sorusora/locales/ko/commands/translator.ftl
diff --git a/...es/ko/context_menus/translate_message.ftl → ...es/ko/context_menus/translate_message.ftl b/...es/ko/context_menus/translate_message.ftl → ...es/ko/context_menus/translate_message.ftl
diff --git a/locales/ko/main.ftl → sorusora/locales/ko/main.ftl b/locales/ko/main.ftl → sorusora/locales/ko/main.ftl
diff --git a/locales/ko/utils/translator.ftl → sorusora/locales/ko/utils/translator.ftl b/locales/ko/utils/translator.ftl → sorusora/locales/ko/utils/translator.ftl
diff --git a/locales/ko/utils/ui.ftl → sorusora/locales/ko/utils/ui.ftl b/locales/ko/utils/ui.ftl → sorusora/locales/ko/utils/ui.ftl
diff --git a/main.py → sorusora/main.py b/main.py → sorusora/main.py
diff --git a/mongo/__init__.py → sorusora/mongo/__init__.py b/mongo/__init__.py → sorusora/mongo/__init__.py
diff --git a/mongo/channel.py → sorusora/mongo/channel.py b/mongo/channel.py → sorusora/mongo/channel.py
diff --git a/mongo/user.py → sorusora/mongo/user.py b/mongo/user.py → sorusora/mongo/user.py
diff --git a/requirements.txt → sorusora/requirements.txt b/requirements.txt → sorusora/requirements.txt
diff --git a/scripts/cai_tgt.py → sorusora/scripts/cai_tgt.py b/scripts/cai_tgt.py → sorusora/scripts/cai_tgt.py
diff --git a/scripts/clear_commands.py → sorusora/scripts/clear_commands.py b/scripts/clear_commands.py → sorusora/scripts/clear_commands.py
@@ -31,7 +31,7 @@ async def setup_hook(self) -> None:
 
 
 if __name__ == "__main__":
-    load_dotenv()
+    assert load_dotenv()
 
     bot = TempBot(command_prefix="!", intents=discord.Intents.all())
     bot.run(os.getenv("BOT_TOKEN"))
diff --git a/scripts/v103.py → sorusora/scripts/v103.py b/scripts/v103.py → sorusora/scripts/v103.py
diff --git a/scripts/v110.py → sorusora/scripts/v110.py b/scripts/v110.py → sorusora/scripts/v110.py
diff --git a/tests/__init__.py → sorusora/tests/__init__.py b/tests/__init__.py → sorusora/tests/__init__.py
diff --git a/tests/conftest.py → sorusora/tests/conftest.py b/tests/conftest.py → sorusora/tests/conftest.py
diff --git a/tests/pytest.ini → sorusora/tests/pytest.ini b/tests/pytest.ini → sorusora/tests/pytest.ini
diff --git a/tests/test_mongo/__init__.py → sorusora/tests/test_mongo/__init__.py b/tests/test_mongo/__init__.py → sorusora/tests/test_mongo/__init__.py
diff --git a/tests/test_mongo/test_document.py → sorusora/tests/test_mongo/test_document.py b/tests/test_mongo/test_document.py → sorusora/tests/test_mongo/test_document.py
diff --git a/utils/__init__.py → sorusora/utils/__init__.py b/utils/__init__.py → sorusora/utils/__init__.py
diff --git a/utils/constants.py → sorusora/utils/constants.py b/utils/constants.py → sorusora/utils/constants.py
diff --git a/utils/templates.py → sorusora/utils/templates.py b/utils/templates.py → sorusora/utils/templates.py
diff --git a/utils/translator.py → sorusora/utils/translator.py b/utils/translator.py → sorusora/utils/translator.py
diff --git a/utils/ui.py → sorusora/utils/ui.py b/utils/ui.py → sorusora/utils/ui.py