83410d9954
Full upstream release announcement:
https://github.com/beetbox/beets/releases/tag/v1.4.1
I had to rebase the keyfinder-default-bin.patch in order to apply with
the new release.
Other than that I didn't test whether beets works on my machine, as I
have a more or less temporary setup at the moment.
However, since the bump of mutagen to version 1.34 in commit
555928c228
, the mediafile tests fail and
thus this commit unbreaks beets.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
diff --git a/beetsplug/keyfinder.py b/beetsplug/keyfinder.py
|
|
index 34a4abc..59e8539 100644
|
|
--- a/beetsplug/keyfinder.py
|
|
+++ b/beetsplug/keyfinder.py
|
|
@@ -30,7 +30,7 @@ class KeyFinderPlugin(BeetsPlugin):
|
|
def __init__(self):
|
|
super(KeyFinderPlugin, self).__init__()
|
|
self.config.add({
|
|
- u'bin': u'KeyFinder',
|
|
+ u'bin': u'keyfinder-cli',
|
|
u'auto': True,
|
|
u'overwrite': False,
|
|
})
|
|
@@ -59,8 +59,7 @@ class KeyFinderPlugin(BeetsPlugin):
|
|
continue
|
|
|
|
try:
|
|
- output = util.command_output([bin, '-f',
|
|
- util.syspath(item.path)])
|
|
+ output = util.command_output([bin, util.syspath(item.path)])
|
|
except (subprocess.CalledProcessError, OSError) as exc:
|
|
self._log.error(u'execution failed: {0}', exc)
|
|
continue
|
|
diff --git a/test/test_keyfinder.py b/test/test_keyfinder.py
|
|
index 57e2bcd..c1ee916 100644
|
|
--- a/test/test_keyfinder.py
|
|
+++ b/test/test_keyfinder.py
|
|
@@ -44,7 +44,7 @@ class KeyFinderTest(unittest.TestCase, TestHelper):
|
|
item.load()
|
|
self.assertEqual(item['initial_key'], 'C#m')
|
|
command_output.assert_called_with(
|
|
- ['KeyFinder', '-f', util.syspath(item.path)])
|
|
+ ['keyfinder-cli', util.syspath(item.path)])
|
|
|
|
def test_add_key_on_import(self, command_output):
|
|
command_output.return_value = 'dbm'
|