Fixed update

Author: davidhozic

src/daf/client.py

@@ -387,7 +387,7 @@ def get_server(
 
         return None
 
-    async def _close(self):
+    async def _close(self, _delete = True):
         """
         Signals the tasks of this account to finish and
         waits for them.
@@ -402,6 +402,7 @@ async def _close(self):
                     exc
                 )
 
+        self.tasks.clear()
         selenium = self.selenium
         if selenium is not None:
             selenium._close()
@@ -410,7 +411,10 @@ async def _close(self):
             await guild_._close()
 
         await self._client.close()
-        self._delete()
+        self.client.clear()
+
+        if _delete:
+            self._delete()
 
     async def _loop(self):
         """
@@ -446,17 +450,16 @@ async def __loop():
             await asyncio.sleep(TASK_SLEEP_DELAY_S)
 
     @misc._async_safe("_update_sem")
-    async def update(self,  *, _init = True, **kwargs):
+    async def update(self, **kwargs):
         """
         Updates the object with new parameters and afterwards updates all lower layers (GUILD->MESSAGE->CHANNEL).
 
         .. WARNING::
             After calling this method the entire object is reset.
         """
         if self._running:
-            await self._close()
+            await self._close(False)
 
-        self._deleted = False  # Prevents cleanup task from cleaning this up
         selenium = self._selenium
         if "token" not in kwargs:
             kwargs["token"] = self._token if selenium is None else None
@@ -470,32 +473,28 @@ async def update(self,  *, _init = True, **kwargs):
             if isinstance(intents, discord.Intents) and intents.value == 0:
                 kwargs["intents"] = None
 
-        servers = kwargs.pop("servers", self.servers)
-        kwargs["servers"] = []  # Servers are updated at the end
+        servers = kwargs.pop("servers", self.servers + self._uiservers)
 
-        acc_exc = None
-        try:
-            await misc._update(self, _init=_init, **kwargs)
-        except Exception as exc:
-            self._client = discord.Client(intents=self.intents)  # Issues when relogging in?
-            await self.initialize()  # re-login
-            acc_exc = exc
-
-        # Update the guilds in the end finnaly
-        guilds = []
-        autoguilds = []
-        for server in servers:
-            try:
-                await server.update(init_options={"parent": self}, _init=_init)
-                if isinstance(server, guild.AutoGUILD):
-                    autoguilds.append(server)
-                else:
-                    guilds.append(server)
-            except Exception as exc:
-                trace(f"Could not update server after updating account, server: {server}", TraceLEVELS.ERROR, exc)
+        async def update_servers():
+            _servers = []
+            _autoguilds = []
+            for server in servers:
+                try:
+                    await server.update(init_options={"parent": self})
+                    if isinstance(server, guild._BaseGUILD):
+                        _servers.append(server)
+                    else:
+                        _autoguilds.append(servers)
+                except Exception as exc:
+                    trace(f"Could not update {server} after updating {self} - Skipping server.", TraceLEVELS.ERROR, exc)
 
-        self._servers = guilds
-        self._autoguilds = autoguilds
+            self._servers = _servers
+            self._autoguilds = _autoguilds
 
-        if acc_exc is not None:
-            raise acc_exc
+        try:
+            await misc._update(self, **kwargs)
+            await update_servers()
+        except Exception:
+            await self.initialize()  # re-login
+            await update_servers()
+            raise

src/daf/core.py

@@ -107,11 +107,10 @@ async def schema_load_from_file() -> None:
     trace("Updating accounts.", TraceLEVELS.DEBUG)
     for account in accounts:
         try:
-            await account.update(_init=False)  # Refresh without __init__ call
+            await account.update()  # Refresh without __init__ call
             GLOBALS.accounts.append(account)
         except Exception as exc:
             trace(f"Unable to restore account {account}", TraceLEVELS.ERROR, exc)
-            GLOBALS.accounts.remove(account)
 
     trace(f"Restored objects from file ({len(GLOBALS.accounts)} accounts).", TraceLEVELS.NORMAL)
 
@@ -380,6 +379,7 @@ async def shutdown() -> None:
     for task in GLOBALS.tasks:  # Wait for core tasks to finish
         await task
 
+    GLOBALS.tasks.clear()
     for account in GLOBALS.accounts:
         await account._close()
 

src/daf/guild.py

@@ -3,7 +3,7 @@
     regarding the guild and also defines a USER class from the
     _BaseGUILD class.
 """
-from typing import Any, Coroutine, Union, List, Optional, Dict, Callable, Set
+from typing import Any, Coroutine, Union, List, Optional, Dict, Callable
 from typeguard import typechecked
 from datetime import timedelta, datetime
 from copy import deepcopy
@@ -429,9 +429,9 @@ class GUILD(_BaseGUILD):
 
         .. note::
 
-            Accounts are required to have *Manage Channels* and *Manage Server* permissions inside a guild for tracking to
-            fully function. *Manage Server* is needed for getting information about invite links, *Manage Channels*
-            is needed to delete the invite from the list if it has been deleted,
+            Accounts are required to have *Manage Channels* and *Manage Server* permissions inside a guild for
+            tracking to fully function. *Manage Server* is needed for getting information about invite links,
+            *Manage Channels* is needed to delete the invite from the list if it has been deleted,
             however tracking still works without it.
     """
     __slots__ = (
@@ -481,7 +481,7 @@ async def get_invites(self) -> List[discord.Invite]:
 
         return []  # Return empty on error or no permissions
 
-    async def initialize(self, parent: Any, _init = True) -> None:
+    async def initialize(self, parent: Any) -> None:
         """
         This function initializes the API related objects and
         then tries to initialize the MESSAGE objects.
@@ -568,7 +568,7 @@ def generate_invite_log_context(self, member: discord.Member, invite_id: str) ->
         }
 
     @misc._async_safe("update_semaphore", 1)
-    async def update(self, init_options = None, _init = True, **kwargs):
+    async def update(self, init_options = None, **kwargs):
         """
         Used for changing the initialization parameters,
         the object was initialized with.
@@ -600,23 +600,22 @@ async def update(self, init_options = None, _init = True, **kwargs):
         if "invite_track" not in kwargs:
             kwargs["invite_track"] = list(self.join_count.keys())
 
+        messages = kwargs.pop("messages", self.messages + self._messages_uninitialized)
+
         if init_options is None:
             init_options = {"parent": self.parent}
 
-        # Add uninitialized servers
-        messages = kwargs.pop("messages", self.messages + self._messages_uninitialized)
-        kwargs["messages"] = []  # Messages are updated at the end
-
-        await misc._update(self, init_options=init_options, _init=_init, **kwargs)
+        await misc._update(self, init_options=init_options, **kwargs)
 
-        # Update messages
+        _messages = []
         for message in messages:
             try:
-                await message.update(_init_options={"parent": self}, _init=_init)
+                await message.update()
+                _messages.append(message)
             except Exception as exc:
-                trace(f"Unable to update message after updating GUILD, message: {message}", TraceLEVELS.ERROR, exc)
+                trace(f"Could not update {message} after updating {self} - Skipping message.", TraceLEVELS.ERROR, exc)
 
-        self._messages = messages
+        self._messages = _messages
 
 
 @misc.doc_category("Guilds")
@@ -692,7 +691,7 @@ async def initialize(self, parent: Any):
         )
 
     @misc._async_safe("update_semaphore", 1)
-    async def update(self, init_options = None, _init = True, **kwargs):
+    async def update(self, init_options = None, **kwargs):
         """
         .. versionadded:: v2.0
 
@@ -721,23 +720,22 @@ async def update(self, init_options = None, _init = True, **kwargs):
         if "snowflake" not in kwargs:
             kwargs["snowflake"] = self.snowflake
 
+        messages = kwargs.pop("messages", self.messages + self._messages_uninitialized)
+
         if init_options is None:
             init_options = {"parent": self.parent}
 
-        messages = kwargs.pop("messages", self.messages)
-        kwargs["messages"] = []  # Messages are updated at the end
-
-        await misc._update(self, init_options=init_options, _init=_init, **kwargs)
+        await misc._update(self, init_options=init_options, **kwargs)
 
-        # Update messages
+        _messages = []
         for message in messages:
             try:
-                await message.update(_init_options={"parent": self}, _init=_init)
+                await message.update()
+                _messages.append(message)
             except Exception as exc:
-                trace(f"Unable to update message after updating GUILD, message: {message}", TraceLEVELS.ERROR, exc)
+                trace(f"Could not update {message} after updating {self} - Skipping message.", TraceLEVELS.ERROR, exc)
 
-
-        self._messages = messages
+        self._messages = _messages
 
 
 @misc.doc_category("Auto objects")
@@ -1097,7 +1095,7 @@ async def _advertise(self):
         return GUILD_ADVERT_STATUS_SUCCESS
 
     @misc._async_safe("_safe_sem", 1)
-    async def update(self, init_options = None, _init = True, **kwargs):
+    async def update(self, init_options = None, **kwargs):
         """
         Updates the object with new initialization parameters.
 
@@ -1110,6 +1108,8 @@ async def update(self, init_options = None, _init = True, **kwargs):
 
         await self._close()
         try:
-            return await misc._update(self, init_options=init_options, _init=_init, **kwargs)
-        finally:
+            return await misc._update(self, init_options=init_options, **kwargs)
+        except Exception:
+            self.cache.clear()
             await self.initialize(self.parent)  # Reopen any async related connections
+            raise

src/daf/message/base.py

@@ -529,7 +529,7 @@ def remove(self, channel: ChannelType):
         """
         self.cache.remove(channel)
 
-    async def update(self, init_options = None, _init = True, **kwargs):
+    async def update(self, init_options = None, **kwargs):
         """
         Updates the object with new initialization parameters.
 
@@ -551,5 +551,4 @@ async def update(self, init_options = None, _init = True, **kwargs):
 
         return await misc._update(self,
                                   init_options=init_options,
-                                  _init=_init,
                                   **kwargs)

src/daf/message/text_based.py

@@ -525,7 +525,7 @@ async def _send(self) -> MessageSendResult:
 
     @typechecked
     @misc._async_safe("update_semaphore")
-    async def update(self, _init_options: Optional[dict] = None, _init = True, **kwargs: Any):
+    async def update(self, _init_options: Optional[dict] = None, **kwargs: Any):
         """
         .. versionadded:: v2.0
 
@@ -557,15 +557,14 @@ async def update(self, _init_options: Optional[dict] = None, _init = True, **kwa
 
         channels = kwargs.get("channels", self.channels)
         if isinstance(channels, AutoCHANNEL):
-            kwargs["channels"] = channels
-            await channels.update(init_options={"parent": self, "channel_type": "text_channels"}, _init=_init)
-        else:
+            await channels.update(init_options={"parent": self, "channel_type": "text_channels"})
+        elif not isinstance(self.channels[0], int):  # Not initialized (newly created):
             kwargs["channels"] = [x.id for x in self.channels]
 
         if _init_options is None:
             _init_options = {"parent": self.parent}
 
-        await misc._update(self, init_options=_init_options, _init=_init, **kwargs)
+        await misc._update(self, init_options=_init_options, **kwargs)
 
 
 @misc.doc_category("Messages", path="message")
@@ -878,7 +877,7 @@ async def _send(self) -> MessageSendResult:
 
     @typechecked
     @misc._async_safe("update_semaphore")
-    async def update(self, _init_options: Optional[dict] = None, _init = True, **kwargs):
+    async def update(self, _init_options: Optional[dict] = None, **kwargs):
         """
         .. versionadded:: v2.0
 
@@ -911,4 +910,4 @@ async def update(self, _init_options: Optional[dict] = None, _init = True, **kwa
         if _init_options is None:
             _init_options = {"parent": self.parent}
 
-        await misc._update(self, init_options=_init_options, _init=_init, **kwargs)
+        await misc._update(self, init_options=_init_options, **kwargs)

src/daf/message/voice_based.py

@@ -387,7 +387,7 @@ async def _send(self) -> MessageSendResult:
 
     @typechecked
     @misc._async_safe("update_semaphore")
-    async def update(self, _init_options: Optional[dict] = None, _init = True, **kwargs):
+    async def update(self, _init_options: Optional[dict] = None, **kwargs):
         """
         .. versionadded:: v2.0
 
@@ -419,12 +419,11 @@ async def update(self, _init_options: Optional[dict] = None, _init = True, **kwa
 
         channels = kwargs.get("channels", self.channels)
         if isinstance(channels, AutoCHANNEL):
-            kwargs["channels"] = channels
-            await channels.update(_init=_init)
-        else:
+            await channels.update(init_options={"parent": self, "channel_type": "voice_channels"})
+        elif not isinstance(self.channels[0], int):  # Not initialized (newly created):
             kwargs["channels"] = [x.id for x in self.channels]
 
         if _init_options is None:
             _init_options = {"parent": self.parent}
 
-        await misc._update(self, init_options=_init_options, _init=_init, **kwargs)
+        await misc._update(self, init_options=_init_options, **kwargs)