aaron/cmdasana
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '52ee057924a162ed423f5ef1592e4230e76e15b7'

Browse Source
This commit is contained in:
Aaron Gutierrez
2018-06-05 14:26:41 -07:00
parent 47eff82d3f 52ee057924
commit 364a69fb3b
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
models/models.py
View File

@@ -139,14 +139,15 @@ class List(object):
self.body = body self.body = body
def text_format(self): def text_format(self):
return self.body.text_format() + '\n' return self.body.text_format()
class ListItem(object): class ListItem(object):
def __init__(self, body): def __init__(self, body, indent):
self.body = body self.body = body
self.indent = indent
def text_format(self): def text_format(self):
return ' • ' + self.body.text_format() + '\n' return ('', [(' ' * self.indent), '• ', self.body.text_format(), '\n'])
class Text(object): class Text(object):
def __init__(self, body): def __init__(self, body):
@@ -159,6 +160,7 @@ class HTMLTextParser(HTMLParser):
def __init__(self): def __init__(self):
self.text = [] self.text = []
self.tag_stack = [] self.tag_stack = []
self.indent = 0
super().__init__() super().__init__()
def handle_starttag(self, tag, attrs): def handle_starttag(self, tag, attrs):
@@ -171,6 +173,7 @@ class HTMLTextParser(HTMLParser):
elif tag == 'a': elif tag == 'a':
self.tag_stack.append(Link) self.tag_stack.append(Link)
elif tag == 'ul' or tag == 'ol': elif tag == 'ul' or tag == 'ol':
self.indent += 2
self.tag_stack.append(List) self.tag_stack.append(List)
elif tag == 'li': elif tag == 'li':
self.tag_stack.append(ListItem) self.tag_stack.append(ListItem)
@@ -182,9 +185,15 @@ class HTMLTextParser(HTMLParser):
def handle_endtag(self, tag): def handle_endtag(self, tag):
data = self.text.pop() data = self.text.pop()
tag = self.tag_stack.pop() Class = self.tag_stack.pop()
self.text.append(tag(data)) if tag == 'ul' or tag =='ol':
self.indent -= 2
if tag == 'li':
self.text.append(Class(data, self.indent))
else:
self.text.append(Class(data))
def get_formatted_text(self): def get_formatted_text(self):
formatted = [t.text_format() for t in self.text] formatted = [t.text_format() for t in self.text]