PycordViews 1.2.3__tar.gz → 1.2.5__tar.gz

{pycordviews-1.2.3 → pycordviews-1.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PycordViews
-Version: 1.2.3
+Version: 1.2.5
 Summary: Views and multibot for py-cord library
 Home-page: https://github.com/BOXERRMD/Py-cord_Views
 Author: Chronos (alias BOXERRMD)

{pycordviews-1.2.3 → pycordviews-1.2.5}/PycordViews.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PycordViews
-Version: 1.2.3
+Version: 1.2.5
 Summary: Views and multibot for py-cord library
 Home-page: https://github.com/BOXERRMD/Py-cord_Views
 Author: Chronos (alias BOXERRMD)

{pycordviews-1.2.3 → pycordviews-1.2.5}/pycordViews/__init__.py

@@ -3,3 +3,4 @@ from .pagination.pagination_view import Pagination
 from .multibot import Multibot
 from .menu.selectMenu import SelectMenu
 from .menu.menu import Menu, CustomSelect
+from .kit import *

{pycordviews-1.2.3 → pycordviews-1.2.5}/pycordViews/multibot/multibot.py

@@ -24,15 +24,15 @@ class Multibot:
         
         self.global_timeout = global_timeout
         
-    def __get_data_queue(self) -> Union[list[dict], dict, None]:
+    def __get_data_queue(self) -> Union[list[dict], dict]:
         """
         Récupère les données dans la queue processus
         """
-        #try:
-        result = self.__process_queue.get(timeout=self.global_timeout)
-        return result
-        #except:
-            #return None
+        try:
+            result = self.__process_queue.get(timeout=self.global_timeout)
+            return result
+        except :
+            return {'status': 'error', 'message': 'timeout request exceeded'}
 
     def _start_process(self):
         """

{pycordviews-1.2.3 → pycordviews-1.2.5}/pycordViews/views/easy_modified_view.py

@@ -1,13 +1,16 @@
 from __future__ import annotations
-from discord import Interaction, ApplicationContext, Message, Member, TextChannel
+from discord import Interaction, ApplicationContext, Message, Member
+from discord.abc import GuildChannel
 from discord.ui import View, Item
-from typing import Union, Callable, TYPE_CHECKING
+from typing import Union, Callable, TYPE_CHECKING, Optional, Any
+from asyncio import iscoroutinefunction, create_task, get_event_loop, Future
 
-from .errors import CustomIDNotFound
+from .errors import CustomIDNotFound, CoroutineError
 
 if TYPE_CHECKING:
     from ..menu.selectMenu import SelectMenu
     from ..pagination.pagination_view import Pagination
+    from ..kit import Poll, Confirm
 
 
 class EasyModifiedViews(View):
@@ -17,16 +20,19 @@ class EasyModifiedViews(View):
     Allows you to easily modify and replace an ui.
     """
 
-    def __init__(self, timeout: Union[float, None] = None, disabled_on_timeout: bool = False, *items: Item):
+    def __init__(self, timeout: Optional[float] = None, disabled_on_timeout: bool = False, call_on_timeout: Optional[Callable] = None, *items: Item):
         """
         Init a Class view for Discord UI
         :param timeout: The time before ui disable
+        :param disabled_on_timeout: disable view if timeout is reached
+        :param call_on_timeout: asynchronous function to call after view timed-out
         """
         super().__init__(*items, timeout=timeout)
-        self.__timeout: Union[float, None] = timeout
+        self.__timeout: Optional[float] = timeout
         self.__disabled_on_timeout: bool = disabled_on_timeout
         self.__callback: dict[str, dict[str, Union[Callable[[Interaction], None], Item]]] = {}
         self.__ctx: Union[Message, Interaction] = None
+        self.__call_on_timeout: Callable = call_on_timeout
 
     def __check_custom_id(self, custom_id: str) -> None:
         """
@@ -43,21 +49,21 @@ class EasyModifiedViews(View):
         """
         self.__ctx = await ctx.respond(*args, **kwargs)
 
-    async def send(self, target: Union[Member, TextChannel], *args, **kwargs) -> None:
+    async def send(self, target: Union[Member, GuildChannel], *args, **kwargs) -> None:
         """
         Send at the target
         """
         self.__ctx = await target.send(*args, **kwargs)
 
     def add_items(self,
-                   *items: Union[Item, SelectMenu, Pagination]) -> "EasyModifiedViews":
+                   *items: Union[Item, SelectMenu, Pagination, Poll, Confirm]) -> "EasyModifiedViews":
         """
         Add all items in the View.
         """
 
         for ui in items:
 
-            if type(ui).__name__ in ('SelectMenu', 'Pagination'):
+            if type(ui).__name__ in ('SelectMenu', 'Pagination', 'Confirm', 'Poll'):
                 for item in ui.get_view.items:
                     self.add_items(item)
                     self.set_callable(item.custom_id, _callable=ui.get_callable(item.custom_id))
@@ -118,7 +124,7 @@ class EasyModifiedViews(View):
         """
         set up a callable for items
         :param custom_ids: items IDs of the view
-        :param _callable: The callable linked
+        :param _callable: The asynchronous callable linked. Take UI (Button, Select...) and Interaction parameters.
 
         **UI and Interaction parameter is required in callable function !**
 
@@ -230,7 +236,6 @@ class EasyModifiedViews(View):
 
         return True
 
-
     async def delete_items(self, clear_all: bool = False, *custom_ids: str) -> None:
         """
         Delete an item on the view
@@ -254,13 +259,25 @@ class EasyModifiedViews(View):
         Called if timeout view is finished
         """
         if self.__disabled_on_timeout:
-            self.shutdown()
+            create_task(self.shutdown())
+        if self.__call_on_timeout is not None:
+            create_task(self.__call_on_timeout(self.__ctx))
+
+    def call_on_timeout(self, _callable: Callable) -> None:
+        """
+        Call asynchronous function passed when the timeout is reached.
+        :param _callable: asynchronous function to call. It takes one argument : ctx
+        """
+        if iscoroutinefunction(_callable):
+            self.__call_on_timeout = _callable
+        else:
+            raise CoroutineError(_callable)
 
     async def _update(self) -> None:
         """
         Update the View on the attached message.
         """
-        if self.is_finished():
+        if self.is_finished() and not self.__disabled_on_timeout:
             return
 
         if self.message:
@@ -269,9 +286,6 @@ class EasyModifiedViews(View):
         elif self.__ctx:
             await self.__ctx.edit(view=self)
 
-        else:
-            return
-
     @property
     def get_uis(self) -> list[Item]:
         """

pycordviews-1.2.5/pycordViews/views/errors.py

@@ -0,0 +1,13 @@
+class Py_cordEasyModifiedViews(Exception):
+    """
+    Main class exception
+    """
+
+
+class CustomIDNotFound(Py_cordEasyModifiedViews):
+    def __init__(self):
+        super().__init__(f"custom_id not found !")
+
+class CoroutineError(Py_cordEasyModifiedViews):
+    def __init__(self, coro):
+        super().__init__(f"{coro} is not a coroutine !")

{pycordviews-1.2.3 → pycordviews-1.2.5}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", encoding='utf-8') as file:
 
 setup(
     name="PycordViews",
-    version="1.2.3",
+    version="1.2.5",
     url="https://github.com/BOXERRMD/Py-cord_Views",
     author="Chronos (alias BOXERRMD)",
     author_email="vagabonwalybi@gmail.com",

pycordviews-1.2.3/pycordViews/views/errors.py

@@ -1,9 +0,0 @@
-class Py_cordEasyModifiedViews(Exception):
-    """
-    Main class exception
-    """
-
-
-class CustomIDNotFound(Py_cordEasyModifiedViews):
-    def __init__(self):
-        super().__init__(f"custom_id not found !")