Garmelon/yaboli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add some logging to Room

Browse source
This commit is contained in:
Joscha 2019-04-10 14:56:24 +00:00
parent c3fa1bf396
commit ed2bd2a2c6
3 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
test.py
View file

@ -6,7 +6,11 @@ import logging
import yaboli import yaboli
FORMAT = "{asctime} [{levelname:<7}] <{name}> {funcName}(): {message}" #FORMAT = "{asctime} [{levelname:<7}] <{name}> {funcName}(): {message}"
#LEVEL = logging.DEBUG
FORMAT = "{asctime} [{levelname:<7}] <{name}>: {message}"
LEVEL = logging.INFO
DATE_FORMAT = "%F %T" DATE_FORMAT = "%F %T"
handler = logging.StreamHandler() handler = logging.StreamHandler()
handler.setFormatter(logging.Formatter( handler.setFormatter(logging.Formatter(
@ -16,7 +20,7 @@ handler.setFormatter(logging.Formatter(
)) ))
logger = logging.getLogger('yaboli') logger = logging.getLogger('yaboli')
logger.setLevel(logging.DEBUG) logger.setLevel(LEVEL)
logger.addHandler(handler) logger.addHandler(handler)
class TestClient(yaboli.Client): class TestClient(yaboli.Client):

5
yaboli/room.py
View file

@ -9,6 +9,7 @@ from .events import Events
from .exceptions import * from .exceptions import *
from .message import LiveMessage from .message import LiveMessage
from .session import Account, LiveSession, LiveSessionListing from .session import Account, LiveSession, LiveSessionListing
from .util import atmention
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -238,6 +239,7 @@ class Room:
session = LiveSession.from_data(self, data) session = LiveSession.from_data(self, data)
self._users = self.users.with_join(session) self._users = self.users.with_join(session)
logger.info(f"{session.atmention} joined")
self._events.fire("join", session) self._events.fire("join", session)
async def _on_login_event(self, packet: Any) -> None: async def _on_login_event(self, packet: Any) -> None:
@ -258,6 +260,7 @@ class Room:
for user in self.users: for user in self.users:
if user.server_id == server_id and user.server_era == server_era: if user.server_id == server_id and user.server_era == server_era:
users = users.with_part(user) users = users.with_part(user)
logger.info(f"{user.atmention} left")
self._events.fire("part", user) self._events.fire("part", user)
self._users = users self._users = users
@ -274,6 +277,7 @@ class Room:
else: else:
await self.who() # recalibrating self._users await self.who() # recalibrating self._users
logger.info(f"{atmention(nick_from)} is now called {atmention(nick_to)}")
self._events.fire("nick", session, nick_from, nick_to) self._events.fire("nick", session, nick_from, nick_to)
async def _on_edit_message_event(self, packet: Any) -> None: async def _on_edit_message_event(self, packet: Any) -> None:
@ -289,6 +293,7 @@ class Room:
session = LiveSession.from_data(self, data) session = LiveSession.from_data(self, data)
self._users = self.users.with_part(session) self._users = self.users.with_part(session)
logger.info(f"{session.atmention} left")
self._events.fire("part", session) self._events.fire("part", session)
async def _on_pm_initiate_event(self, packet: Any) -> None: async def _on_pm_initiate_event(self, packet: Any) -> None:

5
yaboli/util.py
View file

@ -1,6 +1,6 @@
import re import re
__all__ = ["mention", "normalize", "similar"] __all__ = ["mention", "atmention", "normalize", "similar"]
# Name/nick related functions # Name/nick related functions
@ -8,6 +8,9 @@ def mention(nick: str, ping: bool = False) -> str:
mentioned = re.sub(r"""[,.!?;&<'"\s]""", "", nick) mentioned = re.sub(r"""[,.!?;&<'"\s]""", "", nick)
return "@" + mentioned if ping else mentioned return "@" + mentioned if ping else mentioned
def atmention(nick: str) -> str:
return mention(nick, ping=True)
def normalize(nick: str) -> str: def normalize(nick: str) -> str:
return mention(nick, ping=False).lower() return mention(nick, ping=False).lower()