Bug fixes

Author: davidhozic

docs/source/changelog.rst

@@ -32,6 +32,14 @@ Glossary
 Releases
 ----------------------
 
+v2.8.4
+=================
+- Fixed web browser waiting time being too little when searching invite links
+- Fixed web browser could not create directory (username had a new line after it, now it auto strips that)
+- Fix GUI not allowing to define inherited classes (eg. logging manager's fallback that inherits LoggerBASE)
+- Fix item not in list error upon saving if an item was written inside a GUI's dropdown menu directly and then edited.
+
+
 v2.8.3
 =================
 - Fixed new guilds being added whenever :class:`daf.client.ACCOUNT`'s update method failed.

src/daf/__init__.py

@@ -19,4 +19,4 @@
     from .misc import *
 
 
-VERSION = "2.8.3"
+VERSION = "2.8.4"

src/daf/web.py

@@ -61,7 +61,7 @@ class GLOBALS:
 
 
 WD_TIMEOUT_SHORT = 5
-WD_TIMEOUT_MED = 30
+WD_TIMEOUT_MED = 15
 WD_TIMEOUT_LONG = 90
 WD_RD_CLICK_UPPER_N = 5
 WD_RD_CLICK_LOWER_N = 2
@@ -119,8 +119,8 @@ def __init__(self,
                 "Install them with: pip install discord-advert-framework[web]"
             )
 
-        self._username = username
-        self._password = password
+        self._username = username.strip()
+        self._password = password.strip()
         self._proxy = proxy
         self.driver = None
         self._token = None
@@ -262,7 +262,7 @@ async def fetch_invite_link(self, url: str):
         await self.random_sleep(0.5, 1)
         try:
             await self.async_execute(
-                WebDriverWait(driver, WD_TIMEOUT_SHORT).until,
+                WebDriverWait(driver, WD_TIMEOUT_MED).until,
                 url_contains("discord.com")
             )
             await self.await_load()
@@ -681,6 +681,7 @@ class QueryMembers(Enum):
     QueryMembers.ALL: (None, None),
     QueryMembers.SUB_100: (None, 100),
     QueryMembers.B100_1k: (100, 1000),
+    QueryMembers.B1k_10k: (1000, 10000),
     QueryMembers.ABV_10k: (10000, None),
 }
 

src/daf_gui/object.py

@@ -477,6 +477,16 @@ def set_origin_window(cls, window: ObjectEditWindow):
 
     @classmethod
     def convert_types(cls, types_in):
+        def remove_wrapped(types: list):
+            r = types.copy()
+            for type_ in types:
+                # It's a wrapper of some class -> remove the wrapped class
+                if hasattr(type_, "__wrapped__"):
+                    if type_.__wrapped__ in r:
+                        r.remove(type_.__wrapped__)
+
+            return r
+
         while get_origin(types_in) is Union:
             types_in = get_args(types_in)
 
@@ -486,7 +496,15 @@ def convert_types(cls, types_in):
             else:
                 types_in = [types_in, ]
 
-        return types_in
+        # Also include inherited objects
+        subtypes = []
+        for t in types_in:
+            if hasattr(t, "__subclasses__") and t.__module__.split('.', 1)[0] in {"_discord", "daf"}:
+                for st in t.__subclasses__():
+                    subtypes.extend(cls.convert_types(st))
+
+        # Remove wrapped classes (eg. wrapped by decorator)
+        return remove_wrapped(types_in + subtypes)
 
     def update_window_title(self):
         self.origin_window.title(f"{'New' if self.old_object_info is None else 'Edit'} {self.get_cls_name(self.class_)} object")
@@ -623,12 +641,16 @@ def _gui_to_object(self):
     def _update_old_object(self, new: Union[ObjectInfo, Any]):
         if self.old_object_info is not None:
             ret_widget = self.return_widget
-            if isinstance(ret_widget, ListBoxScrolled):
-                ind = ret_widget.get().index(self.old_object_info)
-            else:
-                ind = ret_widget["values"].index(self.old_object_info)
+            # Ignore if not in list (Combobox allows to type values directly in instead of inserting them)
+            # thus when edit is clicked, the old information is loaded into the object edit info, howver the actual
+            # value while it was writen inside the combobox is not actually present in the list of it's values
+            with suppress(ValueError):
+                if isinstance(ret_widget, ListBoxScrolled):
+                    ind = ret_widget.get().index(self.old_object_info)
+                else:
+                    ind = ret_widget["values"].index(self.old_object_info)
 
-            ret_widget.delete(ind)
+                ret_widget.delete(ind)
 
         self.return_widget.insert(tk.END, new)
         if isinstance(self.return_widget, ComboBoxObjects):