Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-08-05 08:40:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tag mapper: Prevent cycles in the replacement rules from causing the tag mapper to hang

Browse Source
This commit is contained in:
Kovid Goyal 2015-11-05 11:57:51 +05:30
parent 8832143e14
commit bdab1296a5
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/calibre/ebooks/metadata/tag_mapper.py
View File

@ -36,8 +36,10 @@ def apply_rules(tag, rules):
ans = []
tags = deque()
tags.append(tag)
while tags:
maxiter = 20
while tags and maxiter > 0:
tag = tags.popleft()
maxiter -= 1
for rule, matches in rules:
ltag = icu_lower(tag)
if matches(ltag):
@ -98,3 +100,10 @@ def test():
{'action':'remove', 'query':'t2', 'match_type':'one_of'},
]
assert map_tags(['t1', 'x1'], rules) == ['t3', 'x1']
rules = [{'action':'replace', 'query':'t1', 'match_type':'one_of', 'replace':'t1'}]
assert map_tags(['t1', 'x1'], rules) == ['t1', 'x1']
rules = [
{'action':'replace', 'query':'t1', 'match_type':'one_of', 'replace':'t2'},
{'action':'replace', 'query':'t2', 'match_type':'one_of', 'replace':'t1'},
]
assert set(map_tags(['t1', 't2'], rules)) == {'t1', 't2'}