Backup_Repos/FanFicFare
1
0
Fork 0
mirror of https://github.com/JimmXinu/FanFicFare.git synced 2026-05-09 05:21:13 +02:00
Code Issues Projects Releases Wiki Activity

Fixed a problem where an html comment was detected as a valid tag, and crashed

Browse source 
the soup processing.
This commit is contained in:
asbjorn grandt 2013-11-10 19:47:28 +01:00
parent d89a5132ce
commit 4208f4ae6e
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fanficdownloader/htmlheuristics.py
View file

@ -226,7 +226,7 @@ def replace_br_with_p(body):
return body
def is_valid_block(block):
return str(block).find('<') == 0
return str(block).find('<') == 0 and str(block).find('<!') != 0
def soup_up_div(body):
blockTags = ['address', 'blockquote', 'del', 'div', 'dl', 'fieldset', 'form', 'ins', 'noscript', 'ol', 'p', 'pre', 'table', 'ul']
@ -245,7 +245,7 @@ def soup_up_div(body):
for i in soup.contents[0]:
if str(i).strip().__len__() > 0:
s = str(i)
if is_valid_block(i):
if type(i) == bs.Tag:
if i.name in blockTags:
if lastElement > 1:
body = body.strip(r'\s*(\[br\ \/\]\s*)*\s*')
@ -264,6 +264,8 @@ def soup_up_div(body):
lastElement = 2
body += s
elif type(i) == bs.Comment:
body += s
else:
if lastElement == 1:
body = body.strip(r'\s*(\[br\ \/\]\s*)*\s*')