Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix tag mapper replace rules when using non-regex expressions

Browse Source
This commit is contained in:
Kovid Goyal 2015-09-24 21:54:36 +05:30
parent c7ddf59cd2
commit 5155b41877
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

@ -40,7 +40,10 @@ def apply_rules(tag, rules):
if ac == 'keep': if ac == 'keep':
return tag return tag
if ac == 'replace': if ac == 'replace':
tag = regex.sub(rule['query'], rule['replace'], tag, flags=REGEX_FLAGS) if 'matches' in rule['match_type']:
tag = regex.sub(rule['query'], rule['replace'], tag, flags=REGEX_FLAGS)
else:
tag = rule['replace']
return tag return tag
def uniq(vals, kmap=icu_lower): def uniq(vals, kmap=icu_lower):
@ -60,3 +63,9 @@ def map_tags(tags, rules=()):
return list(tags) return list(tags)
rules = [(r, matcher(r)) for r in rules] rules = [(r, matcher(r)) for r in rules]
return uniq([x for x in (apply_rules(t, rules) for t in tags) if x]) return uniq([x for x in (apply_rules(t, rules) for t in tags) if x])
def test():
rules = [{'action':'replace', 'query':'t1', 'match_type':'one_of', 'replace':'t2'}]
assert map_tags(['t1', 'x1'], rules) == ['t2', 'x1']
rules = [{'action':'replace', 'query':'(.)1', 'match_type':'matches', 'replace':r'\g<1>2'}]
assert map_tags(['t1', 'x1'], rules) == ['t2', 'x2']