mbirth/gcd-parser
1
0
Fork 0
Code Issues 5 Pull Requests Activity

Improved urlencoded HTML handling.

Browse Source
This commit is contained in:
Markus Birth 2019-12-12 23:37:10 +01:00
parent 8100a9e7e8
commit 0341218fc1
Signed by: mbirth
GPG Key ID: A9928D7A098C3A9A
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
grmn/updateserver.py
View File

@ -58,6 +58,14 @@ class UpdateInfo:
rc.append(node.data) rc.append(node.data)
return ''.join(rc) return ''.join(rc)
def urlencodedhtml_to_text(self, urltext):
html = unquote(urltext).replace("+", " ")
txt = html.replace("<br/>", "\n")
txt = txt.replace("<strong>", "").replace("</strong>", "")
#txt = txt.replace("<strong>", u"\u001b[1;37m").replace("</strong>", u"\u001b[0m")
txt = txt.replace("<li>", "\n * ").replace("</li>", "")
return txt
def fill_from_response_dom(self, dom): def fill_from_response_dom(self, dom):
self.source = "WebUpdater" self.source = "WebUpdater"
self.sku = self.dom_get_text(dom.getElementsByTagName("RequestedPartNumber")) self.sku = self.dom_get_text(dom.getElementsByTagName("RequestedPartNumber"))
@ -67,8 +75,8 @@ class UpdateInfo:
if len(version_minor) > 0: if len(version_minor) > 0:
self.fw_version = "{}.{:0>2s}".format(version_major, version_minor) self.fw_version = "{}.{:0>2s}".format(version_major, version_minor)
self.license_url = self.dom_get_text(dom.getElementsByTagName("LicenseLocation")) self.license_url = self.dom_get_text(dom.getElementsByTagName("LicenseLocation"))
self.changelog = unquote(self.dom_get_text(dom.getElementsByTagName("ChangeDescription"))).replace("+", " ") self.changelog = self.urlencodedhtml_to_text(self.dom_get_text(dom.getElementsByTagName("ChangeDescription")))
self.notes = unquote(self.dom_get_text(dom.getElementsByTagName("Notes"))).replace("+", " ") self.notes = self.urlencodedhtml_to_text(self.dom_get_text(dom.getElementsByTagName("Notes")))
self.language_code = self.dom_get_text(dom.getElementsByTagName("RequestedRegionId")) self.language_code = self.dom_get_text(dom.getElementsByTagName("RequestedRegionId"))
self.build_type = self.dom_get_text(dom.getElementsByTagName("BuildType")) self.build_type = self.dom_get_text(dom.getElementsByTagName("BuildType"))
self.additional_info_url = self.dom_get_text(dom.getElementsByTagName("AdditionalInfo")) self.additional_info_url = self.dom_get_text(dom.getElementsByTagName("AdditionalInfo"))