summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFlorent Le Coz <louiz@louiz.org>2011-02-14 14:54:26 +0100
committerFlorent Le Coz <louiz@louiz.org>2011-02-14 14:54:26 +0100
commit4b31e5acf142664c2f2ebd2e0cfa26e700d947d7 (patch)
tree82471c08139bdea5bcb1ba6a149d0b970580a784 /src
parent3e550f4ae7ef13496fcc2e19ae406f324a2ee8e2 (diff)
downloadpoezio-4b31e5acf142664c2f2ebd2e0cfa26e700d947d7.tar.gz
poezio-4b31e5acf142664c2f2ebd2e0cfa26e700d947d7.tar.bz2
poezio-4b31e5acf142664c2f2ebd2e0cfa26e700d947d7.tar.xz
poezio-4b31e5acf142664c2f2ebd2e0cfa26e700d947d7.zip
Make the number of lines and messages kept in memory configurable
and lower (a lot) the number of lines kept in the info_win buffers This lower the memory usage.
Diffstat (limited to 'src')
-rw-r--r--src/room.py8
-rw-r--r--src/tabs.py2
-rw-r--r--src/text_buffer.py8
-rw-r--r--src/windows.py5
4 files changed, 12 insertions, 11 deletions
diff --git a/src/room.py b/src/room.py
index 29986142..df97c638 100644
--- a/src/room.py
+++ b/src/room.py
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Poezio. If not, see <http://www.gnu.org/licenses/>.
-from text_buffer import TextBuffer, MESSAGE_NB_LIMIT
+from text_buffer import TextBuffer
from datetime import datetime
from random import randrange
from config import config
@@ -29,8 +29,8 @@ import logging
log = logging.getLogger(__name__)
class Room(TextBuffer):
- def __init__(self, name, nick):
- TextBuffer.__init__(self)
+ def __init__(self, name, nick, messages_nb_limit=config.get('max_messages_in_memory', 2048)):
+ TextBuffer.__init__(self, messages_nb_limit)
self.name = name
self.own_nick = nick
self.color_state = theme.COLOR_TAB_NORMAL # color used in RoomInfo
@@ -115,7 +115,7 @@ class Room(TextBuffer):
time = time if time is not None else datetime.now()
nick_color = nick_color or user.color if user else None
message = Message(txt, time, nickname, nick_color, color, colorized, user=user)
- while len(self.messages) > MESSAGE_NB_LIMIT:
+ while len(self.messages) > self.messages_nb_limit:
self.messages.pop(0)
self.messages.append(message)
for window in self.windows: # make the associated windows
diff --git a/src/tabs.py b/src/tabs.py
index aa5ccab3..3b25095d 100644
--- a/src/tabs.py
+++ b/src/tabs.py
@@ -261,7 +261,7 @@ class ChatTab(Tab):
class TabWithInfoWin(Tab):
def __init__(self):
- self.info_win = windows.TextWin()
+ self.info_win = windows.TextWin(20)
self.core.information_buffer.add_window(self.info_win)
def __del__(self):
diff --git a/src/text_buffer.py b/src/text_buffer.py
index 9285a433..3b2ddd1a 100644
--- a/src/text_buffer.py
+++ b/src/text_buffer.py
@@ -24,15 +24,15 @@ log = logging.getLogger(__name__)
from message import Message
from datetime import datetime
import theme
-
-MESSAGE_NB_LIMIT = 8192
+from config import config
class TextBuffer(object):
"""
This class just keep trace of messages, in a list with various
informations and attributes.
"""
- def __init__(self):
+ def __init__(self, messages_nb_limit=config.get('max_messages_in_memory', 2048)):
+ self.messages_nb_limit = messages_nb_limit
self.messages = [] # Message objects
self.windows = [] # we keep track of one or more windows
# so we can pass the new messages to them, as they are added, so
@@ -47,7 +47,7 @@ class TextBuffer(object):
time = time or datetime.now()
msg = Message(txt, time, nickname, nick_color, color, colorized)
self.messages.append(msg)
- while len(self.messages) > MESSAGE_NB_LIMIT:
+ while len(self.messages) > self.messages_nb_limit:
self.messages.pop(0)
for window in self.windows: # make the associated windows
# build the lines from the new message
diff --git a/src/windows.py b/src/windows.py
index c46b60e3..1ec5de8a 100644
--- a/src/windows.py
+++ b/src/windows.py
@@ -432,8 +432,9 @@ class MucInfoWin(InfoWin):
self.addstr(txt, curses.color_pair(theme.COLOR_INFORMATION_BAR))
class TextWin(Win):
- def __init__(self):
+ def __init__(self, lines_nb_limit=config.get('max_lines_in_memory', 2048)):
Win.__init__(self)
+ self.lines_nb_limit = lines_nb_limit
self.pos = 0
self.built_lines = [] # Each new message is built and kept here.
# on resize, we rebuild all the messages
@@ -525,7 +526,7 @@ class TextWin(Win):
if txt.startswith('\n'):
txt = txt[1:]
first = False
- while len(self.built_lines) > LINES_NB_LIMIT:
+ while len(self.built_lines) > self.lines_nb_limit:
self.built_lines.pop(0)
return nb