Custom path for data is now possible

modules/functions.py

@@ -10,6 +10,8 @@ from shutil import copyfileobj
 from gzip import open as gzipopen
 from psutil import Process
 
+from modules.functions_bot import configGet
+
 
 def nowtimeGet(format="%H:%M:%S | %d.%m.%Y") -> str:
     """Return current local time formatted as arg.
@@ -23,7 +25,7 @@ def nowtimeGet(format="%H:%M:%S | %d.%m.%Y") -> str:
     return datetime.now().strftime(format)
 
 
-def checkSize(logs_folder=f"logs{sep}", log_size=1024) -> None:
+def checkSize(logs_folder=f"{configGet('logs')}{sep}", log_size=1024) -> None:
     """Checks latest log file size and rotates it if needed.
 
     ### Args:
@@ -54,7 +56,7 @@ def checkSize(logs_folder=f"logs{sep}", log_size=1024) -> None:
             i += 1
 
 
-def logWrite(message: str, logs_folder=f"logs{sep}", level="INFO") -> None:
+def logWrite(message: str, logs_folder=f"{configGet('logs')}{sep}", level="INFO") -> None:
     """Append some message to latest log file.
 
     ### Args:

modules/functions_bot.py

@@ -4,7 +4,8 @@
 from types import NoneType
 from typing import Union
 from modules.functions import jsonLoad, jsonSave
-from os import sep
+from os import sep, listdir
+
 
 def configGet(key: str, *args: str) -> any:
     """Get value of the config key
@@ -20,6 +21,7 @@ def configGet(key: str, *args: str) -> any:
         this_key = this_key[dict_key]
     return this_key[key]
 
+
 def configAppend(key: str, value: Union[str, float, int, bool, dict, list, NoneType], *args: str) -> None:
     """Set key to a value
     ### Args:
@@ -39,6 +41,7 @@ def configAppend(key: str, value: Union[str, float, int, bool, dict, list, NoneT
     jsonSave(this_dict, "config.json")
     return
 
+
 def configRemove(key: str, value: Union[str, float, int, bool, dict, list, NoneType]) -> None:
     """Remove value from config's list key
 
@@ -62,12 +65,14 @@ def locale(key: str, *args: str, locale=configGet("locale")) -> str:
     """ 
     if (locale == None):
         locale = configGet("locale")
+
+    locales = configGet("locales")
     
     try:
-        this_dict = jsonLoad(f'locale{sep}{locale}.json')
+        this_dict = jsonLoad(f'{locales}{sep}{locale}.json')
     except FileNotFoundError:
         try:
-            this_dict = jsonLoad(f'locale{sep}{configGet("locale")}.json')
+            this_dict = jsonLoad(f'{locales}{sep}{configGet("locale")}.json')
         except FileNotFoundError:
             return f'⚠ Locale in config is invalid: could not get "{key}" in {str(args)} from locale "{locale}"'
 
@@ -88,10 +93,12 @@ def userSet(userid: Union[str, int], key: str, value: Union[str, float, int, boo
         * userid (Union[str, int]): ID of a user.
         * key (str): Key of a user's variable.
         * value (Union[str, float, int, bool, dict, list, NoneType]): Some needed value.
-    """    
-    user = jsonLoad(f"data{sep}users{sep}{userid}.json")
+    """
+    data = configGet("data")
+    user = jsonLoad(f"{data}{sep}users{sep}{userid}.json")
     user[key] = value
-    jsonSave(f"data{sep}users{sep}{userid}.json", user)
+    jsonSave(f"{data}{sep}users{sep}{userid}.json", user)
+
 
 def userGet(userid: Union[str, int], key: str) -> any:
     """Get user's variable
@@ -102,24 +109,73 @@ def userGet(userid: Union[str, int], key: str) -> any:
 
     ### Returns:
         * any: Value of requested key or None
-    """    
+    """
+    data = configGet("data")
     try:
-        return jsonLoad(f"data{sep}users{sep}{userid}.json")[key]
+        return jsonLoad(f"{data}{sep}users{sep}{userid}.json")[key]
     except KeyError:
         return None
     except FileNotFoundError:
         return None
 
+
 def userClear(userid: Union[str, int], key: str) -> None:
     """Clear user's variable
 
     ### Args:
         * userid (Union[str, int]): ID of a user.
         * key (str): Key of a user's variable.
-    """    
+    """
+    data = configGet("data")
     try:
-        user = jsonLoad(f"data{sep}users{sep}{userid}.json")
+        user = jsonLoad(f"{data}{sep}users{sep}{userid}.json")
         del user[key]
-        jsonSave(f"data{sep}users{sep}{userid}.json", user)
+        jsonSave(f"{data}{sep}users{sep}{userid}.json", user)
     except KeyError:
-        pass
+        pass
+
+
+def localeName(command: str, option: Union[str, NoneType]):
+    """Get name of a command or command's option
+
+    ### Args:
+        * command (str): Command that is set in locale file
+        * option (Union[str, NoneType]): Option's name or None (if command's name requested)
+
+    ### Returns:
+        * str: Name of a command or an option
+    """    
+    output = {}
+    locales = configGet("locales")
+    for entry in listdir(locales):
+        if entry.endswith(".json"):
+            if entry.replace(".json", "") != configGet("locale"):
+                all_commands = locale("cmd", locale=entry.replace(".json", ""))
+                if option != None:
+                    output[entry.replace(".json", "")] = all_commands[command]["options"][option]["name"]
+                else:
+                    output[entry.replace(".json", "")] = all_commands[command]["name"]
+    return output
+
+
+def localeDescription(command: str, option: Union[str, NoneType]):
+    """Get description of a command or command's option
+
+    ### Args:
+        * command (str): Command that is set in locale file
+        * option (Union[str, NoneType]): Option's name or None (if command's description requested)
+
+    ### Returns:
+        * str: Description of a command or an option
+    """    
+    output = {}
+    locales = configGet("locales")
+    for entry in listdir(locales):
+        if entry.endswith(".json"):
+            if entry.replace(".json", "") != configGet("locale"):
+                all_commands = locale("cmd", locale=entry.replace(".json", ""))
+                if option != None:
+                    output[entry.replace(".json", "")] = all_commands[command]["options"][option]["description"]
+                else:
+                    output[entry.replace(".json", "")] = all_commands[command]["description"]
+    return output