pictuga
/
morss
1
1
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

feeds: make "rule" split clearer 

"rrule" var name to tell appart the original "rule" from the parsed one
master
pictuga 2020-03-16 17:46:04 +01:00
parent 3fb6ff891c
commit ce30952fa2
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
morss/feeds.py
View File

@ -278,14 +278,14 @@ class ParserXML(ParserBase):
def rule_create(self, rule): def rule_create(self, rule):
# duplicate, copy from template or create from scratch # duplicate, copy from template or create from scratch
rule, key = self._rule_parse(rule) rrule, key = self._rule_parse(rule)
# try recreating based on the rule (for really basic rules, ie. plain RSS) # try recreating based on the rule (for really basic rules, ie. plain RSS) `/feed/item`
if re.search(r'^[a-zA-Z0-9/:]+$', rule): if re.search(r'^[a-zA-Z0-9/:]+$', rrule):
chain = rule.strip('/').split('/') chain = rrule.strip('/').split('/')
current = self.root current = self.root
if rule[0] == '/': if rrule[0] == '/':
chain = chain[1:] chain = chain[1:]
for (i, node) in enumerate(chain): for (i, node) in enumerate(chain):
@ -304,7 +304,7 @@ class ParserXML(ParserBase):
return current return current
# try duplicating from existing (works well with fucked up structures) # try duplicating from existing (works well with fucked up structures)
match = self.rule_search_last(rule) match = self.rule_search_last(rrule)
if match: if match:
element = deepcopy(match) element = deepcopy(match)
match.getparent().append(element) match.getparent().append(element)
@ -317,9 +317,9 @@ class ParserXML(ParserBase):
return None return None
def rule_remove(self, rule): def rule_remove(self, rule):
rule, key = self._rule_parse(rule) rrule, key = self._rule_parse(rule)
match = self.rule_search(rule) match = self.rule_search(rrule)
if match is None: if match is None:
return return
@ -331,9 +331,9 @@ class ParserXML(ParserBase):
match.getparent().remove(match) match.getparent().remove(match)
def rule_set(self, rule, value): def rule_set(self, rule, value):
rule, key = self._rule_parse(rule) rrule, key = self._rule_parse(rule)
match = self.rule_search(rule) match = self.rule_search(rrule)
if key is not None: if key is not None:
match.attrib[key] = value match.attrib[key] = value