Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2025-12-29 03:52:51 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #37 from nidico/master

Browse source 
Allow unicode in rewrite items
This commit is contained in:
Adrian Sampson 2012-05-08 16:13:18 -07:00
commit fc06ded87b
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
beets/ui/__init__.py
View file

@ -27,6 +27,7 @@ import logging
import sqlite3
import errno
import re
import codecs
from beets import library
from beets import plugins
@ -673,7 +674,7 @@ def main(args=None, configfh=None):
if configpath:
configpath = util.syspath(configpath)
if os.path.exists(util.syspath(configpath)):
configfh = open(configpath)
configfh = codecs.open(configpath, 'r', encoding='utf-8')
else:
configfh = None
if configfh:

4
beetsplug/rewrite.py
View file

@ -33,7 +33,7 @@ def rewriter(field, rules):
def fieldfunc(item):
value = getattr(item, field)
for pattern, replacement in rules:
if pattern.match(value):
if pattern.match(value.lower()):
# Rewrite activated.
return replacement
# Not activated; return original value.
@ -59,7 +59,7 @@ class RewritePlugin(BeetsPlugin):
raise ui.UserError("invalid field name (%s) in rewriter" %
fieldname)
log.debug(u'adding template field %s' % key)
pattern = re.compile(pattern, re.I)
pattern = re.compile(pattern.lower())
rules[fieldname].append((pattern, value))
if fieldname == 'artist':
# Special case for the artist field: apply the same