diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index da45671..8911b8a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,9 +4,8 @@
+
-
-
@@ -96,7 +95,6 @@
- 1591205009488
https://trello.com/c/vK0cBbF2/38-i18n
@@ -108,7 +106,6 @@
- 1591205009488
https://trello.com/c/SafaMBht/40-core
@@ -117,7 +114,8 @@
-
+
+
diff --git a/tuxbot/__main__.py b/tuxbot/__main__.py
index 9126e6b..ad49dca 100644
--- a/tuxbot/__main__.py
+++ b/tuxbot/__main__.py
@@ -171,7 +171,7 @@ async def run_bot(tux: Tux, cli_flags: Namespace) -> None:
None
When exiting, this function return None.
"""
- data_path = data_manager.get_data_path(tux.instance_name)
+ data_path = data_manager.data_path(tux.instance_name)
tuxbot.logging.init_logging(
level=cli_flags.logging_level,
diff --git a/tuxbot/core/bot.py b/tuxbot/core/bot.py
index a7764a2..a3f5264 100644
--- a/tuxbot/core/bot.py
+++ b/tuxbot/core/bot.py
@@ -18,7 +18,7 @@ class Tux(commands.AutoShardedBot):
self.last_exception = None
self.config = Config(
- data_manager.get_data_path(self.instance_name)
+ data_manager.data_path(self.instance_name)
)
self.config.register_global(
token=None,
diff --git a/tuxbot/core/data_manager.py b/tuxbot/core/data_manager.py
index 6e8b7a3..e567250 100644
--- a/tuxbot/core/data_manager.py
+++ b/tuxbot/core/data_manager.py
@@ -7,7 +7,7 @@ config_dir = Path(app_dir.user_config_dir)
config_file = config_dir / "config.json"
-def get_data_path(instance_name: str) -> Path:
+def data_path(instance_name: str) -> Path:
"""Return Path for data configs.
Parameters
@@ -22,7 +22,7 @@ def get_data_path(instance_name: str) -> Path:
return Path(app_dir.user_data_dir) / "data" / instance_name
-def get_core_path(instance_name: str) -> Path:
+def core_path(instance_name: str) -> Path:
"""Return Path for core configs.
Parameters
@@ -34,11 +34,10 @@ def get_core_path(instance_name: str) -> Path:
Path
Generated path for core configs.
"""
- data_path = get_data_path(instance_name)
- return data_path / "data" / instance_name / "core"
+ return data_path(instance_name) / "data" / instance_name / "core"
-def get_cogs_path(instance_name: str) -> Path:
+def cogs_data_path(instance_name: str) -> Path:
"""Return Path for cogs configs.
Parameters
@@ -50,11 +49,10 @@ def get_cogs_path(instance_name: str) -> Path:
Path
Generated path for cogs configs.
"""
- data_path = get_data_path(instance_name)
- return data_path / "data" / instance_name / "cogs"
+ return data_path(instance_name) / "data" / instance_name / "cogs"
-def get_cog_path(instance_name: str, cog_name: str) -> Path:
+def cog_data_path(instance_name: str, cog_name: str) -> Path:
"""Return Path for chosen configs for cog.
Parameters
@@ -67,5 +65,4 @@ def get_cog_path(instance_name: str, cog_name: str) -> Path:
Path
Generated path for cog's configs.
"""
- data_path = get_data_path(instance_name)
- return data_path / "data" / instance_name / "cogs" / cog_name
+ return data_path(instance_name) / "data" / instance_name / "cogs" / cog_name