Rename 'parse' to 'read'
This commit is contained in:
parent
6a8735c833
commit
81aeae005f
2 changed files with 11 additions and 7 deletions
|
@ -86,12 +86,12 @@ class MBoxReader():
|
||||||
ret = self.message
|
ret = self.message
|
||||||
|
|
||||||
self.message = Message()
|
self.message = Message()
|
||||||
self.message.parse_line(line)
|
self.message.read_line(line)
|
||||||
|
|
||||||
return ret
|
return ret
|
||||||
|
|
||||||
if self.message:
|
if self.message:
|
||||||
self.message.parse_line(line)
|
self.message.read_line(line)
|
||||||
|
|
||||||
def messages(self):
|
def messages(self):
|
||||||
while True:
|
while True:
|
||||||
|
|
|
@ -81,11 +81,11 @@ class Message(DatabaseTable):
|
||||||
def __from_row__(row):
|
def __from_row__(row):
|
||||||
message = Message()
|
message = Message()
|
||||||
message.id = row['id']
|
message.id = row['id']
|
||||||
message.parse(row['content'])
|
message.read(row['content'])
|
||||||
|
|
||||||
return message
|
return message
|
||||||
|
|
||||||
def __values__(self):
|
def __values__(self) -> tuple:
|
||||||
return (
|
return (
|
||||||
self.newsgroup_id,
|
self.newsgroup_id,
|
||||||
self.date(),
|
self.date(),
|
||||||
|
@ -120,7 +120,7 @@ class Message(DatabaseTable):
|
||||||
def is_first_line(self):
|
def is_first_line(self):
|
||||||
return len(self.headers) == 1 and (self.body == '' or self.body is None)
|
return len(self.headers) == 1 and (self.body == '' or self.body is None)
|
||||||
|
|
||||||
def parse_line(self, line: str):
|
def read_line(self, line: str):
|
||||||
if self.line is not None:
|
if self.line is not None:
|
||||||
self.content += self.line
|
self.content += self.line
|
||||||
|
|
||||||
|
@ -147,11 +147,15 @@ class Message(DatabaseTable):
|
||||||
|
|
||||||
self.line = line
|
self.line = line
|
||||||
|
|
||||||
|
def read(self, text: str):
|
||||||
|
for line in each_line(text):
|
||||||
|
self.read_line(line)
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def parse(text: str):
|
def from_text(text: str):
|
||||||
message = Message()
|
message = Message()
|
||||||
|
|
||||||
for line in each_line(text):
|
for line in each_line(text):
|
||||||
message.parse_line(line)
|
message.read_line(line)
|
||||||
|
|
||||||
return message
|
return message
|
||||||
|
|
Loading…
Add table
Reference in a new issue