crxsnake 1.4.1__py3-none-any.whl → 1.4.3__py3-none-any.whl

crxsnake/__init__.py

@@ -1,29 +1,38 @@
-from .logger import log
-from .cogs import load_cogs
-from .files import read_json, write_json
 from .tortoise import Database
 from .embed import EmbedMessage
 
+from .logger import log
+from .cogs import load_cogs
+
+from .files import *
+
 from .utils.misc import *
-from .utils.hotline import IssueHotline
-from .utils.crx import IssueCRX
-from .utils.convert import steam_to_be_guid, steam_to_dayz_guid
+from .utils.hotline import *
+from .utils.convert import *
+
 
 __all__ = [
     "Database",
-    "IssueHotline",
-    "IssueCRX",
     "EmbedMessage",
+
+    "log",
     "load_cogs",
-    "read_json",
-    "write_json",
+
     "steam_to_be_guid",
     "steam_to_dayz_guid",
-    "log",
+
     "trans",
     "green",
     "red",
     "blue",
     "yellow",
-    "purple"
+    "purple",
+
+    "restart",
+    "get_user_id",
+
+    "read_json",
+    "write_json",
+    "read_jsonc",
+    "IssueHotline"
 ]

crxsnake/cogs.py

@@ -1,6 +1,6 @@
 from sys import path
 from pathlib import Path
-from logger import log
+from .logger import log
 
 
 async def load_cogs(bot, folder: str = "src", utils_folder: str = "utils") -> None:

crxsnake/files.py

@@ -1,19 +1,20 @@
+import re
+import aiofiles
+
 from typing import Optional, Any
 from json import loads, dumps
-from aiofiles import open
 
 
 async def read_json(path: str, *keys: str) -> Optional[Any]:
     try:
-        async with open(path, "r", encoding="utf-8") as file:
+        async with aiofiles.open(path, "r", encoding="utf-8") as file:
             file_content = await file.read()
             file_data = loads(file_content)
 
             for key in keys:
-                if key not in file_data:
+                file_data = file_data.get(key)
+                if file_data is None:
                     return None
-                file_data = file_data[key]
-
             return file_data
 
     except Exception:
@@ -22,8 +23,28 @@ async def read_json(path: str, *keys: str) -> Optional[Any]:
 
 async def write_json(path: str, data: Any) -> bool:
     try:
-        async with open(path, "w", encoding="utf-8") as file:
+        async with aiofiles.open(path, "w", encoding="utf-8") as file:
             await file.write(dumps(data, ensure_ascii=False, indent=2))
             return True
     except Exception:
         raise
+
+
+async def read_jsonc(path: str, *keys: str) -> Optional[Any]:
+    try:
+        regex = re.compile(r"(\".*?\"|\'.*?\')|(/\*.*?\*/|//[^\r\n]*)", re.MULTILINE | re.DOTALL)
+
+        def __re_sub(match):
+            return match.group(1) or ""
+
+        async with aiofiles.open(path, "r", encoding="utf-8") as file:
+            file_content = regex.sub(__re_sub, await file.read())
+            file_data = loads(file_content)
+
+            for key in keys:
+                file_data = file_data.get(key)
+                if file_data is None:
+                    return None
+            return file_data
+    except Exception:
+        raise

crxsnake/tortoise.py

@@ -1,4 +1,4 @@
-from logger import log
+from .logger import log
 from tortoise import Tortoise
 
 

crxsnake/utils/hotline.py

@@ -1,24 +1,33 @@
 from random import choices
+from dataclasses import dataclass, field
 from string import ascii_uppercase, ascii_letters, digits
-from typing import List, Dict, Any, AsyncGenerator
+from typing import List, Dict, Any, Generator
+
+
+@dataclass
+class CodeArray:
+    m_code: str
+    m_name: str
+    m_type: str
+    m_itemsArray: List[Dict[str, Any]] = field(default_factory=list)
+    m_teleport_position: str = ""
+    m_vehicles: Dict[str, Any] = field(default_factory=lambda: {"m_item": "", "m_attachments": [], "m_cargo": []})
+    m_give_zone_positions: List[Dict[str, Any]] = field(default_factory=list)
+    m_give_zone_positions_forbidden: List[Dict[str, Any]] = field(default_factory=list)
 
 
 class IssueHotline:
     MAX_STACK = 100
-    """
-    Hotline issue class.
-    """
-    async def __generate_code(self) -> str:
-        part1 = "".join(choices(ascii_uppercase, k=2))
-        part2 = "".join(choices(ascii_letters + digits, k=4))
-        part3 = "".join(choices(ascii_letters + digits, k=4))
-        return f"{part1}-{part2}-{part3}"
 
-    async def __generate_count(
-        self,
-        items_list: List[Dict[str, Any]]
-    ) -> AsyncGenerator[Dict[str, Any], None]:
+    @staticmethod
+    def __generate_code() -> str:
+        return "-".join([
+            "".join(choices(ascii_uppercase, k=2)),
+            "".join(choices(ascii_letters + digits, k=4)),
+            "".join(choices(ascii_letters + digits, k=4))
+        ])
 
+    def __generate_count(self, items_list: List[Dict[str, Any]]) -> Generator[Dict[str, Any], None, None]:
         for item in items_list:
             item_count = item.get("m_count", 0)
             item_name = item.get("m_item", "")
@@ -30,89 +39,27 @@ class IssueHotline:
             if remainder > 0:
                 yield {"m_item": item_name, "m_count": remainder}
 
-    async def create_items(
-        self,
-        issue_name: str,
-        items_list: List[Dict[str, Any]]
-    ) -> Dict[str, Any]:
-        """
-        Create a dictionary with generated codes and processed items.
-
-        items_list example: [{"m_item": "item1", "m_count": 10}, {"m_item": "item2", "m_count": 20}]
-        """
-        processed_items = [item async for item in self.__generate_count(items_list)]
-        return {
-            "m_CodeArray": [
-                {
-                    "m_code": await self.__generate_code(),
-                    "m_name": issue_name,
-                    "m_type": "item",
-                    "m_itemsArray": processed_items,
-                    "m_teleport_position": "",
-                    "m_vehicles": {
-                        "m_item": "",
-                        "m_attachments": [],
-                        "m_cargo": []
-                    },
-                    "m_give_zone_positions": [],
-                    "m_give_zone_positions_forbidden": [],
-                }
-            ]
-        }
-
-    async def create_vehicle(
-        self,
-        issue_name: str,
-        items_dict: Dict[str, Any]
-    ) -> Dict[str, Any]:
-        """
-        Create a dictionary with generated code and vehicle data.
-
-        items_dict example: {"m_item": "class_name", "m_attachments": ["class_name"], "m_cargo": null}
-        """
-        return {
-            "m_CodeArray": [
-                {
-                    "m_code": await self.__generate_code(),
-                    "m_name": issue_name,
-                    "m_type": "vehicle",
-                    "m_itemsArray": [],
-                    "m_teleport_position": "",
-                    "m_vehicles": items_dict,
-                    "m_give_zone_position": "",
-                    "m_give_zone_radius": 0,
-                    "m_give_zone_positions": [],
-                    "m_give_zone_positions_forbidden": [],
-                    "m_fresh_spawn_delay": 0
-                }
-            ]
-        }
+    async def create_items(self, issue_name: str, items_list: List[Dict[str, Any]]) -> Dict[str, Any]:
+        processed_items = [item for item in self.__generate_count(items_list)]
+        return {"m_CodeArray": [CodeArray(
+            m_code=self.__generate_code(),
+            m_name=issue_name,
+            m_type="item",
+            m_itemsArray=processed_items
+        ).__dict__]}
 
-    async def create_teleport(
-        self,
-        issue_name: str,
-        teleport_position: str
-    ) -> Dict[str, Any]:
-        """
-        Create a dictionary with generated code and teleport data.
+    async def create_vehicle(self, issue_name: str, items_dict: Dict[str, Any]) -> Dict[str, Any]:
+        return {"m_CodeArray": [CodeArray(
+            m_code=self.__generate_code(),
+            m_name=issue_name,
+            m_type="vehicle",
+            m_vehicles=items_dict
+        ).__dict__]}
 
-        teleport_position format: (x, y, z)
-        """
-        return {
-            "m_CodeArray": [
-                {
-                    "m_code": await self.__generate_code(),
-                    "m_name": issue_name,
-                    "m_type": "teleport",
-                    "m_itemsArray": [],
-                    "m_teleport_position": teleport_position,
-                    "m_vehicles": {
-                        "m_item": "",
-                        "m_attachments": []
-                    },
-                    "m_give_zone_position": "",
-                    "m_give_zone_radius": 0,
-                    "m_fresh_spawn_delay": 0
-                }
-            ]
-        }
+    async def create_teleport(self, issue_name: str, teleport_position: str) -> Dict[str, Any]:
+        return {"m_CodeArray": [CodeArray(
+            m_code=self.__generate_code(),
+            m_name=issue_name,
+            m_type="teleport",
+            m_teleport_position=teleport_position
+        ).__dict__]}

{crxsnake-1.4.1.dist-info → crxsnake-1.4.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: crxsnake
-Version: 1.4.1
+Version: 1.4.3
 Home-page: https://discord.gg/EEp67FWQDP
 Author: CRX-DEV
 Author-email: cherniq66@gmail.com
@@ -14,6 +14,14 @@ Requires-Dist: tortoise-orm==0.24.0
 Requires-Dist: disnake==2.10.1
 Requires-Dist: aiofiles==23.2.1
 Requires-Dist: loguru==0.7.2
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: project-url
+Dynamic: requires-dist
 
 # CRX-Snake
 

crxsnake-1.4.3.dist-info/RECORD

@@ -0,0 +1,15 @@
+crxsnake/__init__.py,sha256=OwFoVxu6edgyalD7LPIGHBWdrF0_TJ80nSgPniMDtck,579
+crxsnake/cogs.py,sha256=E0BF6SBvF4K7KlfpwZ6j6mpIcJYX3H2neaHiLYPK2fI,633
+crxsnake/embed.py,sha256=NnOqgTJ38BokdeduSVJ4M2nxNl45t7bm0ciJNrUbcI8,2709
+crxsnake/files.py,sha256=oV8xNSETRLlE_UR5sd0-zaANQLBR9hZ0GlAXDgPn5Sc,1486
+crxsnake/logger.py,sha256=yv1298VWx0TwoBE2X9wJq1WOsGTRwDfdJ-BLds0Jnew,778
+crxsnake/tortoise.py,sha256=xRu6ns5a9xyduS8lglps4iKh0Gurkib9WnIDD1k5jZM,637
+crxsnake/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+crxsnake/utils/convert.py,sha256=lfS4fhePDdNJ4LS0PqT523bs34auIA5114NfZi4aaeE,542
+crxsnake/utils/hotline.py,sha256=l82Pf6slP4NH_rhXzo7iWjhfN4zXihoOrFxDrbqMh8U,2524
+crxsnake/utils/misc.py,sha256=eV6WBod5yMpWVH4PaCG4vNIWN9xhoeO-b6z3mRNPe0Q,434
+crxsnake-1.4.3.dist-info/LICENSE,sha256=xt4Ru6tOCU8e2wVlx_lgx7wh-sNLKbiCbmANzr2e3cc,1085
+crxsnake-1.4.3.dist-info/METADATA,sha256=VoMS37HEcXyf1jxbPBYfhEes_ENfBEe54eubfTEmGqw,1635
+crxsnake-1.4.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+crxsnake-1.4.3.dist-info/top_level.txt,sha256=GOgG6tMH05czsfM6y-Tvm9LUSd-0PPuuuYkkkbWHZjQ,9
+crxsnake-1.4.3.dist-info/RECORD,,

{crxsnake-1.4.1.dist-info → crxsnake-1.4.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (72.2.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

crxsnake/utils/crx.py

@@ -1,15 +0,0 @@
-from typing import List, Dict, Any
-
-
-class IssueCRX:
-
-
-    async def create_items(
-            self, issue_type: str, items_list: List[Dict[str, Any]]
-    ) -> Dict[str, List[Dict[str, Any]]]:
-        """
-        Create a dictionary with generated codes and processed items.
-        """
-        issue_dict = {"items": [], "cars": [], "sets": []}
-        issue_dict[issue_type].extend(items_list)
-        return issue_dict

crxsnake-1.4.1.dist-info/RECORD

@@ -1,16 +0,0 @@
-crxsnake/__init__.py,sha256=arrwu6wGSLKjgpaNdP3qK68XqSkmZiw-ZWMzfBgqjvo,624
-crxsnake/cogs.py,sha256=tzw-YCm1hCp2qMFub-0byR4L2Qm7kB4asVrdFU41ZQw,632
-crxsnake/embed.py,sha256=NnOqgTJ38BokdeduSVJ4M2nxNl45t7bm0ciJNrUbcI8,2709
-crxsnake/files.py,sha256=qBn8azQq_RMUZI2y0IK6lEXi8qQHWB-9HlgB-Z_gjRc,811
-crxsnake/logger.py,sha256=yv1298VWx0TwoBE2X9wJq1WOsGTRwDfdJ-BLds0Jnew,778
-crxsnake/tortoise.py,sha256=VBQC5tAms-EKnCmGVg7WwkbFBQcYwMS_zUPPvnzOQJc,636
-crxsnake/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-crxsnake/utils/convert.py,sha256=lfS4fhePDdNJ4LS0PqT523bs34auIA5114NfZi4aaeE,542
-crxsnake/utils/crx.py,sha256=iBZzz71u-TSWynynSLLfWqcr2CX_Zba4DbPwFmYd7iM,437
-crxsnake/utils/hotline.py,sha256=DEs70kjdG0MLXTQF2c2Bj2QzfFhCwpp7BM3xKlXmMw0,4042
-crxsnake/utils/misc.py,sha256=eV6WBod5yMpWVH4PaCG4vNIWN9xhoeO-b6z3mRNPe0Q,434
-crxsnake-1.4.1.dist-info/LICENSE,sha256=xt4Ru6tOCU8e2wVlx_lgx7wh-sNLKbiCbmANzr2e3cc,1085
-crxsnake-1.4.1.dist-info/METADATA,sha256=eiLLmS1AqkVn0EhDph986yLMvrPTY8RaSicG4KDZ9CU,1454
-crxsnake-1.4.1.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
-crxsnake-1.4.1.dist-info/top_level.txt,sha256=GOgG6tMH05czsfM6y-Tvm9LUSd-0PPuuuYkkkbWHZjQ,9
-crxsnake-1.4.1.dist-info/RECORD,,