crxsnake 1.4.2__tar.gz → 1.4.4__tar.gz

{crxsnake-1.4.2 → crxsnake-1.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: crxsnake
-Version: 1.4.2
+Version: 1.4.4
 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.2 → crxsnake-1.4.4}/crxsnake/__init__.py

@@ -1,29 +1,37 @@
+from .tortoise import Database
 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 .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 *
+from .utils.embed_log import *
+
 
 __all__ = [
     "Database",
-    "IssueHotline",
-    "IssueCRX",
-    "EmbedMessage",
+    "EmbedLog",
+
+    "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-1.4.4/crxsnake/files.py

@@ -0,0 +1,50 @@
+import re
+import aiofiles
+
+from typing import Optional, Any
+from json import loads, dumps
+
+
+async def read_json(path: str, *keys: str) -> Optional[Any]:
+    try:
+        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:
+                file_data = file_data.get(key)
+                if file_data is None:
+                    return None
+            return file_data
+
+    except Exception:
+        raise
+
+
+async def write_json(path: str, data: Any) -> bool:
+    try:
+        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-1.4.4/crxsnake/utils/embed_log.py

@@ -0,0 +1,48 @@
+from typing import Optional, Tuple, List
+from disnake import TextChannel, User, Embed, Forbidden, HTTPException
+
+
+class EmbedLog:
+
+    @staticmethod
+    def build_embed(
+        title: Optional[str] = None,
+        color: Optional[int] = None,
+        fields: Optional[List[Tuple[str, str, bool]]] = None,
+        desc: Optional[str] = None,
+        url: Optional[str] = None,
+        thumbnail: Optional[str] = None,
+        image: Optional[str] = None,
+        footer: Optional[str] = None,
+    ) -> Embed:
+
+        embed = Embed(title=title, description=desc, color=color, url=url)
+
+        if fields:
+            for name, value, inline in fields:
+                embed.add_field(name=name, value=value, inline=inline)
+
+        if thumbnail:
+            embed.set_thumbnail(url=thumbnail)
+        if image:
+            embed.set_image(url=image)
+        if footer:
+            embed.set_footer(text=footer)
+
+        return embed
+
+    async def send_channel(self, channel: TextChannel, **kwargs) -> None:
+        embed = self.build_embed(**kwargs)
+        try:
+            await channel.send(embed=embed)
+        except Forbidden:
+            print(f"[Ошибка] Нет прав на отправку сообщений в канал {channel.name}.")
+        except HTTPException as e:
+            print(f"[Ошибка] Не удалось отправить сообщение: {e}")
+
+    async def send_user(self, user: User, **kwargs) -> None:
+        embed = self.build_embed(**kwargs)
+        try:
+            await user.send(embed=embed)
+        except Exception:
+            pass

crxsnake-1.4.4/crxsnake/utils/hotline.py

@@ -0,0 +1,65 @@
+from random import choices
+from dataclasses import dataclass, field
+from string import ascii_uppercase, ascii_letters, digits
+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
+
+    @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", "")
+            full_stacks, remainder = divmod(item_count, self.MAX_STACK)
+
+            for _ in range(full_stacks):
+                yield {"m_item": item_name, "m_count": self.MAX_STACK}
+
+            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]:
+        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_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__]}
+
+    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.2 → crxsnake-1.4.4}/crxsnake.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: crxsnake
-Version: 1.4.2
+Version: 1.4.4
 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.2 → crxsnake-1.4.4}/crxsnake.egg-info/SOURCES.txt

@@ -3,7 +3,6 @@ README.md
 setup.py
 crxsnake/__init__.py
 crxsnake/cogs.py
-crxsnake/embed.py
 crxsnake/files.py
 crxsnake/logger.py
 crxsnake/tortoise.py
@@ -14,6 +13,6 @@ crxsnake.egg-info/requires.txt
 crxsnake.egg-info/top_level.txt
 crxsnake/utils/__init__.py
 crxsnake/utils/convert.py
-crxsnake/utils/crx.py
+crxsnake/utils/embed_log.py
 crxsnake/utils/hotline.py
 crxsnake/utils/misc.py

{crxsnake-1.4.2 → crxsnake-1.4.4}/setup.py

@@ -17,7 +17,7 @@ urls = {
 
 setup(
     name="crxsnake",
-    version="1.4.2",
+    version="1.4.4",
     long_description=long_description,
     long_description_content_type="text/markdown",
     author="CRX-DEV",

crxsnake-1.4.2/crxsnake/embed.py

@@ -1,90 +0,0 @@
-from typing import Optional, Dict, Any
-
-from disnake import Embed, Forbidden, Colour
-from disnake.ext import commands
-from crxsnake.utils.misc import trans
-
-
-class EmbedMessage:
-
-    def __init__(self, bot: commands.Bot):
-        self.bot = bot
-
-    async def send_channel(
-        self,
-        channel_id: int,
-        title: Optional[str] = None,
-        description: Optional[str] = None,
-        color: Optional[Colour] = trans,
-        url: Optional[str] = None,
-        image: Optional[str] = None,
-        footer: Optional[str] = None,
-        fields: Optional[Dict[str, Any]] = None
-    ) -> None:
-        """Send an Embed message to the channel"""
-        channel = await self.bot.fetch_channel(channel_id)
-        if channel:
-            embed = self.__create_embed(
-                title,
-                description,
-                color,
-                url,
-                image,
-                footer,
-                fields
-            )
-            await channel.send(embed=embed)
-
-    async def send_user(
-        self,
-        user_id: int,
-        title: Optional[str] = None,
-        description: Optional[str] = None,
-        color: Optional[Colour] = trans,
-        url: Optional[str] = None,
-        image: Optional[str] = None,
-        footer: Optional[str] = None,
-        fields: Optional[Dict[str, Any]] = None
-    ) -> None:
-        """Send an Embed message to the user"""
-        try:
-            user = await self.bot.fetch_user(user_id)
-            if user:
-                embed = self.__create_embed(
-                    title,
-                    description,
-                    color,
-                    url,
-                    image,
-                    footer,
-                    fields
-                )
-                await user.send(embed=embed)
-        except Forbidden:
-            pass
-
-    @staticmethod
-    def __create_embed(
-        title: Optional[str] = None,
-        description: Optional[str] = None,
-        color: Optional[Colour] = trans,
-        url: Optional[str] = None,
-        image: Optional[str] = None,
-        footer: Optional[str] = None,
-        fields: Optional[Dict[str, Any]] = None
-    ) -> Embed:
-        """Return Embed"""
-        embed = Embed(
-            title=title,
-            description=description,
-            url=url,
-            color=color
-        )
-        if image:
-            embed.set_image(url=image)
-        if footer:
-            embed.set_footer(text=footer)
-        if fields:
-            for name, value in fields.items():
-                embed.add_field(name=name, value=value, inline=False)
-        return embed

crxsnake-1.4.2/crxsnake/files.py

@@ -1,29 +0,0 @@
-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:
-            file_content = await file.read()
-            file_data = loads(file_content)
-
-            for key in keys:
-                if key not in file_data:
-                    return None
-                file_data = file_data[key]
-
-            return file_data
-
-    except Exception:
-        raise
-
-
-async def write_json(path: str, data: Any) -> bool:
-    try:
-        async with open(path, "w", encoding="utf-8") as file:
-            await file.write(dumps(data, ensure_ascii=False, indent=2))
-            return True
-    except Exception:
-        raise

crxsnake-1.4.2/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.2/crxsnake/utils/hotline.py

@@ -1,118 +0,0 @@
-from random import choices
-from string import ascii_uppercase, ascii_letters, digits
-from typing import List, Dict, Any, AsyncGenerator
-
-
-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]:
-
-        for item in items_list:
-            item_count = item.get("m_count", 0)
-            item_name = item.get("m_item", "")
-            full_stacks, remainder = divmod(item_count, self.MAX_STACK)
-
-            for _ in range(full_stacks):
-                yield {"m_item": item_name, "m_count": self.MAX_STACK}
-
-            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_teleport(
-        self,
-        issue_name: str,
-        teleport_position: str
-    ) -> Dict[str, Any]:
-        """
-        Create a dictionary with generated code and teleport data.
-
-        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
-                }
-            ]
-        }