From 15353991f68c28b5ba761e3debbc8bb2080628c5 Mon Sep 17 00:00:00 2001 From: Faraphel Date: Tue, 7 Mar 2023 11:26:39 +0100 Subject: [PATCH] path are now in the path module --- main.pyw | 2 +- source/__init__.py | 12 ------------ source/gui/regex.py | 1 - source/gui/scene/Game.py | 2 +- source/gui/scene/HistoryMenu.py | 2 +- source/gui/sound/Game.py | 2 +- source/gui/texture/Background.py | 2 +- source/gui/texture/Button.py | 2 +- source/gui/texture/Checkbox.py | 2 +- source/gui/texture/Grid.py | 2 +- source/gui/texture/Input.py | 2 +- source/gui/texture/Popup.py | 2 +- source/gui/texture/Replay.py | 2 +- source/gui/texture/Result.py | 2 +- source/gui/texture/Scroller.py | 2 +- source/gui/widget/Scroller.py | 2 -- source/gui/widget/Text.py | 2 -- source/network/Client.py | 4 ++-- source/network/Host.py | 2 +- source/path.py | 13 +++++++++++++ 20 files changed, 29 insertions(+), 33 deletions(-) create mode 100644 source/path.py diff --git a/main.pyw b/main.pyw index a618677..8bd8710 100644 --- a/main.pyw +++ b/main.pyw @@ -4,7 +4,7 @@ from source.gui.scene import MainMenu from source.gui.window import GameWindow -from source import path_font +from source.path import path_font from source.gui.better_pyglet import Label diff --git a/source/__init__.py b/source/__init__.py index beae894..e69de29 100644 --- a/source/__init__.py +++ b/source/__init__.py @@ -1,12 +0,0 @@ -from pathlib import Path - -path_save: Path = Path("./.save") -path_save.mkdir(exist_ok=True) - -path_history: Path = Path("./.history") -path_history.mkdir(exist_ok=True) - -path_assets: Path = Path("./assets") -path_sound: Path = path_assets / "sound" -path_image: Path = path_assets / "image" -path_font: Path = path_assets / "font" diff --git a/source/gui/regex.py b/source/gui/regex.py index 1b505b3..23e29cf 100644 --- a/source/gui/regex.py +++ b/source/gui/regex.py @@ -9,4 +9,3 @@ ipv4_check, ipv4_type = r"\d{1,3}(\.\d{1,3}){3}", r"[\d\.]{0,15}" port_check, port_type = number(min_length=1, max_length=5), number(min_length=0, max_length=5) username_check, username_type = r".{1,16}", r".{0,16}" - diff --git a/source/gui/scene/Game.py b/source/gui/scene/Game.py index 2e72193..65eb989 100644 --- a/source/gui/scene/Game.py +++ b/source/gui/scene/Game.py @@ -4,7 +4,7 @@ from datetime import datetime, timedelta from pathlib import Path from typing import TYPE_CHECKING, Optional -from source import path_save, path_history +from source.path import path_save, path_history from source.core.enums import BombState from source.core.error import InvalidBombPosition, PositionAlreadyShot from source.gui.scene import GameResult diff --git a/source/gui/scene/HistoryMenu.py b/source/gui/scene/HistoryMenu.py index 619617a..9c5c085 100644 --- a/source/gui/scene/HistoryMenu.py +++ b/source/gui/scene/HistoryMenu.py @@ -2,7 +2,7 @@ import math from pathlib import Path from typing import TYPE_CHECKING -from source import path_history +from source.path import path_history from source.gui import widget, texture from source.gui.scene.abc import Scene diff --git a/source/gui/sound/Game.py b/source/gui/sound/Game.py index 12a8d80..d74c61d 100644 --- a/source/gui/sound/Game.py +++ b/source/gui/sound/Game.py @@ -1,6 +1,6 @@ from .type import Sound from .abc import SoundGroup -from source import path_sound +from source.path import path_sound path = path_sound / "game" diff --git a/source/gui/texture/Background.py b/source/gui/texture/Background.py index 86afa6f..86a2122 100644 --- a/source/gui/texture/Background.py +++ b/source/gui/texture/Background.py @@ -1,6 +1,6 @@ from .abc import Style from source.gui.texture.type import Texture -from source import path_image +from source.path import path_image path = path_image / "background" diff --git a/source/gui/texture/Button.py b/source/gui/texture/Button.py index 466b067..a683fcb 100644 --- a/source/gui/texture/Button.py +++ b/source/gui/texture/Button.py @@ -1,6 +1,6 @@ from .abc import Style from source.gui.texture.type import Texture -from source import path_image +from source.path import path_image path = path_image / "button" diff --git a/source/gui/texture/Checkbox.py b/source/gui/texture/Checkbox.py index 8d3aa7d..5361510 100644 --- a/source/gui/texture/Checkbox.py +++ b/source/gui/texture/Checkbox.py @@ -1,6 +1,6 @@ from .abc import Style from .type import Texture -from source import path_image +from source.path import path_image path = path_image / "checkbox" diff --git a/source/gui/texture/Grid.py b/source/gui/texture/Grid.py index 9aa52c8..22d313e 100644 --- a/source/gui/texture/Grid.py +++ b/source/gui/texture/Grid.py @@ -1,6 +1,6 @@ from .abc import Style from .type import Texture, Animation -from source import path_image +from source.path import path_image path = path_image / "grid" path_boat = path / "boat" diff --git a/source/gui/texture/Input.py b/source/gui/texture/Input.py index 6a9c590..7580bb6 100644 --- a/source/gui/texture/Input.py +++ b/source/gui/texture/Input.py @@ -1,6 +1,6 @@ from .abc import Style from .type import Texture -from source import path_image +from source.path import path_image path = path_image / "input" diff --git a/source/gui/texture/Popup.py b/source/gui/texture/Popup.py index b45a488..e79bb51 100644 --- a/source/gui/texture/Popup.py +++ b/source/gui/texture/Popup.py @@ -1,6 +1,6 @@ from .abc import Style from .type import Texture -from source import path_image +from source.path import path_image path = path_image / "popup" diff --git a/source/gui/texture/Replay.py b/source/gui/texture/Replay.py index b9bd5e2..df48897 100644 --- a/source/gui/texture/Replay.py +++ b/source/gui/texture/Replay.py @@ -1,6 +1,6 @@ from .abc import Style from .type import Texture -from source import path_image +from source.path import path_image path = path_image / "replay" diff --git a/source/gui/texture/Result.py b/source/gui/texture/Result.py index 75341fd..c8d90b7 100644 --- a/source/gui/texture/Result.py +++ b/source/gui/texture/Result.py @@ -1,6 +1,6 @@ from .abc import Style from .type import Animation -from source import path_image +from source.path import path_image path = path_image / "result" diff --git a/source/gui/texture/Scroller.py b/source/gui/texture/Scroller.py index 0f12906..60cb516 100644 --- a/source/gui/texture/Scroller.py +++ b/source/gui/texture/Scroller.py @@ -1,6 +1,6 @@ from .abc import Style from .type import Texture -from source import path_image +from source.path import path_image path = path_image / "scroller" diff --git a/source/gui/widget/Scroller.py b/source/gui/widget/Scroller.py index e095f48..52fb643 100644 --- a/source/gui/widget/Scroller.py +++ b/source/gui/widget/Scroller.py @@ -1,7 +1,5 @@ from typing import TYPE_CHECKING, Callable, Any, Type -import pyglet.image - from source.gui.better_pyglet import Sprite, Label from source.gui.texture.abc import Style from source.gui.widget.abc import BoxWidget diff --git a/source/gui/widget/Text.py b/source/gui/widget/Text.py index 1434c05..f17a5c4 100644 --- a/source/gui/widget/Text.py +++ b/source/gui/widget/Text.py @@ -3,8 +3,6 @@ from typing import TYPE_CHECKING from source.gui.better_pyglet import Label from source.gui.widget.abc import BoxWidget -import pyglet - from source.type import Distance if TYPE_CHECKING: diff --git a/source/network/Client.py b/source/network/Client.py index 1a8436d..9946011 100644 --- a/source/network/Client.py +++ b/source/network/Client.py @@ -1,9 +1,9 @@ import json import socket from pathlib import Path -from typing import TYPE_CHECKING, Any, Optional, Callable +from typing import TYPE_CHECKING, Optional, Callable -from source import path_save +from source.path import path_save from source.gui import scene from source.network import game_network from source.network.packet import PacketUsername, PacketSettings, PacketHaveSaveBeenFound, PacketLoadOldSave diff --git a/source/network/Host.py b/source/network/Host.py index de210e1..573b2c8 100644 --- a/source/network/Host.py +++ b/source/network/Host.py @@ -4,7 +4,7 @@ from pathlib import Path from typing import TYPE_CHECKING, Optional from threading import Condition -from source import path_save +from source.path import path_save from source.gui import scene from source.network import game_network from source.utils import StoppableThread diff --git a/source/path.py b/source/path.py new file mode 100644 index 0000000..96570fb --- /dev/null +++ b/source/path.py @@ -0,0 +1,13 @@ +from pathlib import Path + + +path_save: Path = Path("./.save") +path_save.mkdir(exist_ok=True) + +path_history: Path = Path("./.history") +path_history.mkdir(exist_ok=True) + +path_assets: Path = Path("./assets") +path_sound: Path = path_assets / "sound" +path_image: Path = path_assets / "image" +path_font: Path = path_assets / "font"