Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

Use a deque for temp chathistory storage (src/IRCBuffer.py)

Browse source
This commit is contained in:
jesopo 2019-06-07 13:31:51 +01:00
parent 2199069629
commit bc4a6debb5
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/IRCBuffer.py
View file

@ -1,6 +1,8 @@
import re, typing import collections, re, typing
from src import IRCBot, IRCServer, utils from src import IRCBot, IRCServer, utils
MAX_LINES = 64
class BufferLine(object): class BufferLine(object):
def __init__(self, sender: str, message: str, action: bool, tags: dict, def __init__(self, sender: str, message: str, action: bool, tags: dict,
from_self: bool, method: str): from_self: bool, method: str):
@ -15,17 +17,14 @@ class Buffer(object):
def __init__(self, bot: "IRCBot.Bot", server: "IRCServer.Server"): def __init__(self, bot: "IRCBot.Bot", server: "IRCServer.Server"):
self.bot = bot self.bot = bot
self.server = server self.server = server
self.lines = [] # type: typing.List[BufferLine] self._lines = collections.deque(maxlen=MAX_LINES)
self.max_lines = 64
self._skip_next = False self._skip_next = False
def _add_message(self, sender: str, message: str, action: bool, tags: dict, def _add_message(self, sender: str, message: str, action: bool, tags: dict,
from_self: bool, method: str): from_self: bool, method: str):
if not self._skip_next: if not self._skip_next:
line = BufferLine(sender, message, action, tags, from_self, method) line = BufferLine(sender, message, action, tags, from_self, method)
self.lines.insert(0, line) self._lines.appendleft(line)
if len(self.lines) > self.max_lines:
self.lines.pop()
self._skip_next = False self._skip_next = False
def add_message(self, sender: str, message: str, action: bool, tags: dict, def add_message(self, sender: str, message: str, action: bool, tags: dict,
from_self: bool=False): from_self: bool=False):
@ -36,7 +35,7 @@ class Buffer(object):
def get(self, index: int=0, **kwargs) -> typing.Optional[BufferLine]: def get(self, index: int=0, **kwargs) -> typing.Optional[BufferLine]:
from_self = kwargs.get("from_self", True) from_self = kwargs.get("from_self", True)
for line in self.lines: for line in self._lines:
if line.from_self and not from_self: if line.from_self and not from_self:
continue continue
return line return line
@ -47,7 +46,7 @@ class Buffer(object):
for_user = kwargs.get("for_user", "") for_user = kwargs.get("for_user", "")
for_user = self.server.irc_lower(for_user) if for_user else None for_user = self.server.irc_lower(for_user) if for_user else None
not_pattern = kwargs.get("not_pattern", None) not_pattern = kwargs.get("not_pattern", None)
for line in self.lines: for line in self._lines:
if line.from_self and not from_self: if line.from_self and not from_self:
continue continue
elif re.search(pattern, line.message): elif re.search(pattern, line.message):
@ -61,7 +60,7 @@ class Buffer(object):
def find_from(self, nickname: str) -> typing.Optional[BufferLine]: def find_from(self, nickname: str) -> typing.Optional[BufferLine]:
nickname_lower = self.server.irc_lower(nickname) nickname_lower = self.server.irc_lower(nickname)
for line in self.lines: for line in self._lines:
if (not line.from_self if (not line.from_self
and self.server.irc_lower(line.sender) == nickname_lower): and self.server.irc_lower(line.sender) == nickname_lower):
return line return line