PycordViews 1.1.2__tar.gz → 1.1.4__tar.gz

{pycordviews-1.1.2 → pycordviews-1.1.4}/PKG-INFO

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

{pycordviews-1.1.2 → pycordviews-1.1.4}/PycordViews.egg-info/PKG-INFO

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

{pycordviews-1.1.2 → pycordviews-1.1.4}/PycordViews.egg-info/SOURCES.txt

@@ -8,7 +8,6 @@ PycordViews.egg-info/dependency_links.txt
 PycordViews.egg-info/requires.txt
 PycordViews.egg-info/top_level.txt
 pycordViews/__init__.py
-pycordViews/typeViews.py
 pycordViews/menu/__init__.py
 pycordViews/menu/errors.py
 pycordViews/menu/menu.py

{pycordviews-1.1.2 → pycordviews-1.1.4}/pycordViews/__init__.py

@@ -1,5 +1,5 @@
-from .typeViews import *
 from .views.easy_modified_view import EasyModifiedViews
 from .pagination.pagination_view import Pagination
 from .multibot.start_multibot import Multibot
 from .menu.selectMenu import SelectMenu
+from .menu.menu import Menu, CustomSelect

{pycordviews-1.1.2 → pycordviews-1.1.4}/pycordViews/menu/__init__.py

@@ -1,3 +1,3 @@
 from .selectMenu import SelectMenu
-from .menu import Menu
+from .menu import Menu, CustomSelect
 from .errors import *

pycordviews-1.1.4/pycordViews/menu/menu.py

@@ -0,0 +1,118 @@
+from discord.components import ComponentType
+from discord.ui import Select, Item
+from discord import MISSING, Emoji, PartialEmoji, Interaction
+from typing import Callable, Union
+
+from .errors import NotCoroutineError, ComponentTypeError
+
+
+class Menu:
+
+    def __init__(self, menu_type: ComponentType, selectmenu: "SelectMenu", **kwargs):
+        """
+        A basic menu from selectMenu class
+        """
+        self.__menu: CustomSelect = CustomSelect(menu=self, select_type=menu_type, **kwargs)
+        self.__selectMenu = selectmenu
+        self.__menu_type: ComponentType = menu_type
+
+    def set_callable(self, _callable: Union[Callable, None]) -> "Menu":
+        """
+        Add a coroutine to the menu (same function on SelectMenu class)
+        This coroutine can have 2 parameters (X, interaction)
+        """
+        if not isinstance(_callable, Callable):
+            raise NotCoroutineError(_callable)
+
+        self.__selectMenu.set_callable(self.__menu.custom_id, _callable=_callable)
+        return self
+
+    @property
+    def callable(self) -> Callable:
+        """
+        Get the current callable menu
+        """
+        return self.__selectMenu.get_callable(self.__menu.custom_id)
+
+    def add_option(self, label: str, value: str = MISSING, description: Union[str, None] = None, emoji: Union[str, Emoji, PartialEmoji, None] = None, default: bool = False) -> "Menu":
+        """
+        Add an option to choice.
+        Only from string_select type !
+        """
+        self.__is_string_select()
+
+        self.__menu.add_option(label=label, value=value, description=description, emoji=emoji, default=default)
+        return self
+
+    def remove_options(self, *labels: str) -> "Menu":
+        """
+        Remove an option to choice.
+        Only from string_select type !
+        :param labels: Label option name to delete
+        """
+        self.__is_string_select()
+
+        self.__menu.options = [i for i in self.__menu.options if i.label not in labels]
+        return self
+
+    def update_option(self, current_label: str, new_label: str = None, value: str = None, description: Union[str, None] = None, emoji: Union[str, Emoji, PartialEmoji, None] = None, default: Union[bool, None] = None) -> "Menu":
+        """
+        Update option. To find the option, write her actual label in "current_label" option.
+        Only from string_select type !
+        :param current_label: The current label option to edit
+        """
+        self.__is_string_select()
+
+        for option in self.__menu.options:
+            if option.label == current_label:
+                option.label = new_label if new_label is not None else option.label
+                option.value = value if value is not None else option.value
+                option.description = description if description is not None else option.description
+                option.default = default if default is not None else option.default
+                option.emoji = emoji if emoji is not None else option.emoji
+                break
+        return self
+
+    def __is_string_select(self) -> None:
+        """
+        Check if the menu is a string_select
+        :raise: ComponentTypeError
+        """
+        if self.__menu.type != ComponentType.string_select:
+            raise ComponentTypeError()
+
+    @property
+    def component(self) -> Select:
+        """
+        Get the component
+        """
+        return self.__menu
+
+    @property
+    def selectmenu(self) -> "SelectMenu":
+        """
+        Get the selectMenu
+        """
+        return self.__selectMenu
+
+class CustomSelect(Select):
+    """
+    Subclass of Select discord Class to use some SelectMenu functions
+    """
+
+    def __init__(self, menu: Menu, select_type: ComponentType, *items: Item, **kwargs):
+        super().__init__(select_type=select_type, *items, **kwargs)
+        self.__menu: Menu = menu
+
+    async def update(self):
+        """
+        Bridge to SelectMenu update function
+        """
+        return await self.__menu.selectmenu.update()
+
+    @property
+    def get_view(self) -> "EasyModifiedViews":
+        """
+        Bridge to SelectMenu get_view property
+        """
+        return self.__menu.selectmenu.get_view

{pycordviews-1.1.2 → pycordviews-1.1.4}/pycordViews/menu/selectMenu.py

@@ -1,7 +1,8 @@
+
 from ..views.easy_modified_view import EasyModifiedViews
 from .menu import Menu
 
-from typing import Union, Callable
+from typing import Union, Callable, Any
 from discord.components import ComponentType
 from discord import ChannelType, Member, TextChannel, ApplicationContext
 
@@ -89,7 +90,7 @@ class SelectMenu:
         global function to add a Select component
         """
         menu = Menu(component_type,
-                    self.__select_menu,
+                    self,
                     **{'custom_id': custom_id, 'placeholder': placeholder, 'min_values': min_values,
                        'max_values': max_values, 'disabled': disabled, 'row': row, 'channel_types': channel_types})
 
@@ -97,24 +98,35 @@ class SelectMenu:
 
         return menu
 
-    def set_callable(self, *custom_ids: str, _callable : Callable):
+    def set_callable(self, *custom_ids: str, _callable: Union[Callable, None]) -> "SelectMenu":
         """
-        Set a callable for the menu associated with the custom_id
+        Set a callable for the menu associated with custom_ids
         :param custom_ids: IDs to menus
+        :param _callable: The coroutine to set for all menus
         """
         self.__select_menu.set_callable(*custom_ids, _callable=_callable)
+        return self
 
-    async def respond(self, ctx: ApplicationContext, *args, **kwargs) -> None:
+    async def respond(self, ctx: ApplicationContext, *args, **kwargs) -> Any:
         """
         Respond at the ApplicationContext
         """
-        await self.__select_menu.respond(ctx=ctx, *args, view=self.__select_menu, **kwargs)
+        return await self.__select_menu.respond(ctx=ctx, *args, view=self.__select_menu, **kwargs)
 
-    async def send(self, target: Union[Member, TextChannel], *args, **kwargs) -> None:
+    async def send(self, target: Union[Member, TextChannel], *args, **kwargs) -> Any:
         """
         Send at the target
         """
-        await self.__select_menu.send(target=target, *args, view=self.__select_menu, **kwargs)
+        return await self.__select_menu.send(target=target, *args, view=self.__select_menu, **kwargs)
+
+    async def update(self):
+        """
+        Update the message.
+        If the command doesn't have been respond, nothing happened.
+        """
+        if self.get_view.message is None:
+            return
+        await self.__select_menu.update_items(*self.get_view.items)
 
     @property
     def get_view(self) -> EasyModifiedViews:
@@ -122,3 +134,10 @@ class SelectMenu:
         Get the current view
         """
         return self.__select_menu
+
+    def get_callable(self, custom_id: str) -> Union[Callable, None]:
+        """
+        Get the callable UI
+        :param custom_id: UI ID
+        """
+        return self.__select_menu.get_callable(custom_id)

{pycordviews-1.1.2 → pycordviews-1.1.4}/pycordViews/pagination/pagination_view.py

@@ -23,6 +23,7 @@ class Pagination:
 
         self.__view.add_items(Button(label='⏮', row=0, custom_id='back+', style=ButtonStyle.blurple))
         self.__view.add_items(Button(label='◀', row=0, custom_id='back', style=ButtonStyle.blurple))
+        self.__view.add_items(Button(label='None', row=0, custom_id='counter', style=ButtonStyle.gray, disabled=True))
         self.__view.add_items(Button(label='▶', row=0, custom_id='forward', style=ButtonStyle.blurple))
         self.__view.add_items(Button(label='⏭', row=0, custom_id='forward+', style=ButtonStyle.blurple))
         self.__view.set_callable('back+', 'back', 'forward', 'forward+', _callable=self.__turn_page)
@@ -30,7 +31,7 @@ class Pagination:
         self.__pages: list[tuple[tuple, dict]] = []
         self.__current_page: int = 0
 
-    def add_page(self, *args, **kwargs) -> None:
+    def add_page(self, *args, **kwargs) -> "Pagination":
         """
         Adds a page (in a list) as if this function directly sent the message
         Pages are just modified and not reset ! Don't forget to disable embeds or content if the page don't need this.
@@ -38,8 +39,10 @@ class Pagination:
         add_page(content="my message", embeds=[embed1, embed2], ...)
         """
         self.__pages.append((args, kwargs))
+        self.__view.get_ui('counter').label = f"{self.__current_page+1}/{len(self.__pages)}"
+        return self
 
-    def delete_pages(self, *page_numbers: Union[str, int]):
+    def delete_pages(self, *page_numbers: Union[str, int]) -> "Pagination":
         """
         Deletes pages in the order in which they were added
         **Start to 0 !**
@@ -53,6 +56,8 @@ class Pagination:
                 raise PageNumberNotFound(page_number)
 
             del self.__pages[page_number]
+        self.__view.get_ui('counter').label = f"{self.__current_page+1}/{len(self.__pages)}"
+        return self
 
     async def __turn_page(self, button, interaction: Interaction):
         """
@@ -79,11 +84,14 @@ class Pagination:
         elif interaction.custom_id == 'forward+':  # Go to the last page
             self.__current_page = page_count-1
 
+        self.__view.get_ui('counter').label = f"{self.__current_page + 1}/{len(self.__pages)}"
 
         await interaction.message.edit(
 
             *self.__pages[self.__current_page][0],
 
+            view=self.get_view,
+
             **self.__pages[self.__current_page][1]
 
         )
@@ -91,18 +99,18 @@ class Pagination:
         # Acknowledge the interaction
         await interaction.response.defer(invisible=True)
 
-    async def send(self, target: Union[Member, TextChannel]) -> None:
+    async def send(self, target: Union[Member, TextChannel]) -> Any:
         """
         Send pagination without introduction message.
         :param target: The member or channel to send the pagination
         """
-        await self.__view.send(ctx=target, *self.__pages[0][0], **self.__pages[0][1], view=self.get_view)
+        return await self.__view.send(ctx=target, *self.__pages[0][0], **self.__pages[0][1], view=self.get_view)
 
-    async def respond(self, ctx: ApplicationContext) -> None:
+    async def respond(self, ctx: ApplicationContext) -> Any:
         """
         Respond to the command call
         """
-        await self.__view.respond(ctx=ctx, *self.__pages[0][0], **self.__pages[0][1], view=self.get_view)
+        return await self.__view.respond(ctx=ctx, *self.__pages[0][0], **self.__pages[0][1], view=self.get_view)
 
     @property
     def get_view(self) -> EasyModifiedViews:
@@ -115,5 +123,6 @@ class Pagination:
     def get_page(self) -> int:
         """
         Get the number of showed page
+        (start to 0)
         """
         return self.__current_page

{pycordviews-1.1.2 → pycordviews-1.1.4}/pycordViews/views/easy_modified_view.py

@@ -1,10 +1,14 @@
+from __future__ import annotations
 from discord import Interaction, ApplicationContext, Message, Member, TextChannel
 from discord.ui import View, Item
-from typing import Union, Callable, Iterable
+from typing import Union, Callable, TYPE_CHECKING
 
-from ..typeViews import T_views
 from .errors import CustomIDNotFound
 
+if TYPE_CHECKING:
+    from ..menu.selectMenu import SelectMenu
+    from ..pagination.pagination_view import Pagination
+
 
 class EasyModifiedViews(View):
     """
@@ -21,7 +25,7 @@ class EasyModifiedViews(View):
         super().__init__(*items, timeout=timeout)
         self.__timeout: Union[float, None] = timeout
         self.__disabled_on_timeout: bool = disabled_on_timeout
-        self.__callback: dict[str, dict[str, Union[Callable[[Interaction], None], T_views]]] = {}
+        self.__callback: dict[str, dict[str, Union[Callable[[Interaction], None], Item]]] = {}
         self.__ctx: Union[Message, Interaction] = None
 
     def __check_custom_id(self, custom_id: str) -> None:
@@ -46,19 +50,25 @@ class EasyModifiedViews(View):
         self.__ctx = await target.send(*args, **kwargs)
 
     def add_items(self,
-                   *items: T_views) -> "EasyModifiedViews":
+                   *items: Union[Item, SelectMenu, Pagination]) -> "EasyModifiedViews":
         """
         Add all items in the View.
         """
 
         for ui in items:
 
-            self.__callback[ui.custom_id] = {'ui': ui, 'func': None}
-            self.add_item(ui)
+            if type(ui).__name__ in ('SelectMenu', 'Pagination'):
+                for item in ui.get_view.items:
+                    self.add_items(item)
+                    self.set_callable(item.custom_id, _callable=ui.get_callable(item.custom_id))
+
+            else:
+                self.__callback[ui.custom_id] = {'ui': ui, 'func': None}
+                self.add_item(ui)
 
         return self
 
-    async def update_items(self, *items: T_views) -> "EasyModifiedViews":
+    async def update_items(self, *items: Item) -> "EasyModifiedViews":
         """
         Update all views.
         Append items if custom_ids not in the view
@@ -67,7 +77,6 @@ class EasyModifiedViews(View):
         """
 
         for item in items:
-
             try:
                 self.__check_custom_id(item.custom_id)
                 self.__callback[item.custom_id]['ui'] = item
@@ -128,6 +137,14 @@ class EasyModifiedViews(View):
 
             self.__callback[custom_id]['func'] = _callable
 
+    def get_callable(self, custom_id: str) -> Union[Callable, None]:
+        """
+        Get the callable UI
+        :param custom_id: UI ID
+        """
+        self.__check_custom_id(custom_id)
+        return self.__callback[custom_id]['func']
+
     async def interaction_check(self, interaction: Interaction) -> bool:
         """
         Func to apply items
@@ -243,25 +260,26 @@ class EasyModifiedViews(View):
         """
         Update the View on the attached message.
         """
-        try:
+        if self.is_finished():
+            return
 
-            if self.message:
-                await self.message.edit(view=self)
+        if self.message:
+            await self.message.edit(view=self)
 
-            else:
-                await self.__ctx.edit(view=self)
+        elif self.__ctx:
+            await self.__ctx.edit(view=self)
 
-        except:
-            pass
+        else:
+            return
 
     @property
-    def get_uis(self) -> list[T_views]:
+    def get_uis(self) -> list[Item]:
         """
         Get all uis in the view
         """
         return [i['ui'] for i in self.__callback.values()]
 
-    def get_ui(self, custom_id: str) -> T_views:
+    def get_ui(self, custom_id: str) -> Item:
         """
         Get an ui in the view
         :raise: CustomIDNotFound
@@ -270,4 +288,8 @@ class EasyModifiedViews(View):
         return self.__callback[custom_id]['ui']
 
     def __str__(self):
-        return str(self.__callback)
+        return str(self.__callback)
+
+    @property
+    def items(self) -> tuple[Item]:
+        return tuple([i['ui'] for i in self.__callback.values()])

{pycordviews-1.1.2 → pycordviews-1.1.4}/setup.py

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

pycordviews-1.1.2/pycordViews/menu/menu.py

@@ -1,57 +0,0 @@
-from discord.components import ComponentType
-from discord.ui import Select
-from discord import MISSING, Emoji, PartialEmoji
-from typing import Callable, Union
-
-from .errors import NotCoroutineError, ComponentTypeError
-
-
-class Menu:
-
-    def __init__(self, menu_type: ComponentType, selectmenu: "SelectMenu", **kwargs):
-        """
-        A basic menu from selectMenu class
-        """
-        self.__menu: Select = Select(select_type=menu_type, **kwargs)
-        self.__selectMenu = selectmenu
-
-    def set_callable(self, _callable: Callable) -> "Menu":
-        """
-        Add a coroutine to the menu
-        """
-        if not isinstance(_callable, Callable):
-            raise NotCoroutineError(_callable)
-
-        self.__selectMenu.set_callable(self.__menu.custom_id, _callable=_callable)
-        return self
-
-    def add_option(self, label: str, value: str = MISSING, description: Union[str, None] = None, emoji: Union[str, Emoji, PartialEmoji, None] = None, default: bool = False) -> "Menu":
-        """
-        Add an option to choice.
-        Only from string_select type !
-        """
-        if self.__menu.type != ComponentType.string_select:
-            raise ComponentTypeError()
-
-        self.__menu.add_option(label=label, value=value, description=description, emoji=emoji, default=default)
-        return self
-
-    @property
-    def component(self) -> Select:
-        """
-        Get the component
-        """
-        return self.__menu
-
-    @property
-    def callable(self) -> Callable:
-        """
-        Get the callable link to the menu
-        """
-        return self.__callable
-
-    @callable.setter
-    def callable(self, _callable: Callable):
-        """
-        Set the callable link to menu
-        """

pycordviews-1.1.2/pycordViews/typeViews.py

@@ -1,4 +0,0 @@
-from typing import TypeVar
-from discord.ui import Button, Select, Modal
-
-T_views = TypeVar('T_views', Button, Select)