xan/xenu_nntp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Comments, improvements

Browse source
This commit is contained in:
XANTRONIX Development 2025-01-05 23:50:50 -05:00
parent cfeffa27a4
commit afc5ce8339
1 changed files with 32 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
lib/xenu_nntp/mbox.py
View file

@ -6,32 +6,21 @@ class MBoxReaderError(Exception):
class MBoxReaderBuffer(): class MBoxReaderBuffer():
def __init__(self): def __init__(self):
self.lines = [None, None, None, None] self.lines = [None, None, None, None]
self.index = None
def add(self, line: str): def add(self, line: str):
if self.lines[0] is None: if self.lines[0] is None:
self.lines[0] = line self.lines[0] = line
self.index = 0
elif self.lines[1] is None: elif self.lines[1] is None:
self.lines[1] = line self.lines[1] = line
self.index = 1
elif self.lines[2] is None: elif self.lines[2] is None:
self.lines[2] = line self.lines[2] = line
self.index = 2
elif self.lines[3] is None: elif self.lines[3] is None:
self.lines[3] = line self.lines[3] = line
self.index = 3
else: else:
self.lines[0] = self.lines[1] self.lines[0] = self.lines[1]
self.lines[1] = self.lines[2] self.lines[1] = self.lines[2]
self.lines[2] = self.lines[3] self.lines[2] = self.lines[3]
self.lines[3] = line self.lines[3] = line
self.index = 3
if self.index is None:
self.index = 0
elif self.index < 3:
self.index += 1
def is_empty_line(self, line): def is_empty_line(self, line):
return self.lines[line] == '\n' return self.lines[line] == '\n'
@ -73,6 +62,9 @@ class MBoxReader():
while True: while True:
line = self.fh.readline() line = self.fh.readline()
#
# We have reached the final message in the stream.
#
if line is None or line == '': if line is None or line == '':
ret = self.message ret = self.message
ret.finish() ret.finish()
@ -85,23 +77,40 @@ class MBoxReader():
self.line += 1 self.line += 1
#
# Load the line in the circular mbox state buffer.
#
self.buf.add(line) self.buf.add(line)
ret = None
#
# If we are at the start of a new message...
#
if self.buf.is_start(): if self.buf.is_start():
if self.message is None: if self.message is not None:
self.message = Message() #
self.message.readline(line) # If we already have a message, return it.
else: #
ret = self.message ret = self.message
ret.finish()
#
# ...Prepare a new message object.
#
self.message = Message() self.message = Message()
if self.message is not None:
#
# Buffer the line into the current message.
#
self.message.readline(line) self.message.readline(line)
#
# Return the message if we have one.
#
if ret:
ret.finish()
return ret return ret
else:
if self.message:
self.message.readline(line)
def messages(self): def messages(self):
while True: while True: