Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2026-02-11 18:02:10 +01:00
Code Issues Projects Releases Wiki Activity

use stringed template vars on PY3 in convert plugin

Browse source 
We decode them with `surrogateescape`, so we avoid decoding errors
This commit is contained in:
Johnny Robeson 2016-07-25 03:26:29 -04:00
parent f8049e67b4
commit e5497c7494
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
beetsplug/convert.py
View file

@ -22,6 +22,7 @@ import threading
import subprocess
import tempfile
import shlex
import six
from string import Template
from beets import ui, util, plugins, config
@ -183,6 +184,11 @@ class ConvertPlugin(BeetsPlugin):
self._log.info(u'Encoding {0}', util.displayable_path(source))
# Substitute $source and $dest in the argument list.
if not six.PY2:
command = command.decode(ui._arg_encoding(), 'surrogateescape')
source = source.decode(ui._arg_encoding(), 'surrogateescape')
dest = dest.decode(ui._arg_encoding(), 'surrogateescape')
args = shlex.split(command)
for i, arg in enumerate(args):
args[i] = Template(arg).safe_substitute({