From a3b6969349547e7a47b82fcbded868eab1e798dc Mon Sep 17 00:00:00 2001 From: XANTRONIX Development Date: Sat, 9 Nov 2024 22:28:28 -0500 Subject: [PATCH] Rename Message.add() to Message._parse_line() --- lib/nntp/tiny/message.py | 55 ++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 30 deletions(-) diff --git a/lib/nntp/tiny/message.py b/lib/nntp/tiny/message.py index f553f3c..2003879 100644 --- a/lib/nntp/tiny/message.py +++ b/lib/nntp/tiny/message.py @@ -96,7 +96,31 @@ class Message(DatabaseTable): self.content ) - def add(self, line: str): + def header(self, key: str): + return self.headers.get(key.lower()) + + def unique_id(self) -> str: + return self.header('Message-ID') + + def parent_id(self) -> str: + return self.header('References') + + def date(self): + try: + return search_dates(self.headers['date'])[0][1] + except: + return datetime.datetime.fromtimestamp(0) + + def sender(self): + return self.headers.get('from', 'Unknown') + + def subject(self): + return self.headers.get('subject', '(no subject)') + + def is_first_line(self): + return len(self.headers) == 1 and (self.body == '' or self.body is None) + + def _parse_line(self, line: str): if self.line is not None: self.content += self.line @@ -123,35 +147,6 @@ class Message(DatabaseTable): self.line = line - def header(self, key: str): - return self.headers.get(key.lower()) - - def unique_id(self) -> str: - return self.header('Message-ID') - - def parent_id(self) -> str: - return self.header('References') - - def date(self): - try: - return search_dates(self.headers['date'])[0][1] - except: - return datetime.datetime.fromtimestamp(0) - - def sender(self): - return self.headers.get('from', 'Unknown') - - def subject(self): - return self.headers.get('subject', '(no subject)') - - def is_first_line(self): - return len(self.headers) == 1 and (self.body == '' or self.body is None) - - - - - - @staticmethod def parse(text: str): message = Message()