Refresh patches, remove keyfinder patch as upstream seems to use the correct keyfinder-cli path, since: https://github.com/beetbox/beets/pull/3467/files Remove the doing nothing `imagemagick` in `buildInputs` and add a patch that makes `beets` use `magick` from Nix' path. The patch can be disabled along with the reference to imagemagick if it's set to `null`. Formatting: use 1 line per input. Remove the unevaluated externalTestArgs.beets - it was moved to `all-packages.nix`.main
parent
1da3af6bec
commit
5b12a5ea1a
@ -1,43 +1,34 @@ |
||||
diff --git i/beetsplug/convert.py w/beetsplug/convert.py
|
||||
index 70363f6e..2962aa4f 100644
|
||||
index 6bc07c28..039fb452 100644
|
||||
--- i/beetsplug/convert.py
|
||||
+++ w/beetsplug/convert.py
|
||||
@@ -81,7 +81,7 @@ def get_format(fmt=None):
|
||||
command = config['convert']['command'].as_str()
|
||||
elif 'opts' in keys:
|
||||
# Undocumented option for backwards compatibility with < 1.3.1.
|
||||
- command = u'ffmpeg -i $source -y {0} $dest'.format(
|
||||
+ command = u'@ffmpeg@/bin/ffmpeg -i $source -y {0} $dest'.format(
|
||||
config['convert']['opts'].as_str()
|
||||
)
|
||||
if 'extension' in keys:
|
||||
@@ -121,22 +121,22 @@ class ConvertPlugin(BeetsPlugin):
|
||||
u'id3v23': u'inherit',
|
||||
u'formats': {
|
||||
u'aac': {
|
||||
- u'command': u'ffmpeg -i $source -y -vn -acodec aac '
|
||||
+ u'command': u'@ffmpeg@/bin/ffmpeg -i $source -y -vn -acodec aac '
|
||||
u'-aq 1 $dest',
|
||||
u'extension': u'm4a',
|
||||
@@ -118,22 +118,22 @@ class ConvertPlugin(BeetsPlugin):
|
||||
'id3v23': 'inherit',
|
||||
'formats': {
|
||||
'aac': {
|
||||
- 'command': 'ffmpeg -i $source -y -vn -acodec aac '
|
||||
+ 'command': '@ffmpeg@/bin/ffmpeg -i $source -y -vn -acodec aac '
|
||||
'-aq 1 $dest',
|
||||
'extension': 'm4a',
|
||||
},
|
||||
u'alac': {
|
||||
- u'command': u'ffmpeg -i $source -y -vn -acodec alac $dest',
|
||||
+ u'command': u'@ffmpeg@/bin/ffmpeg -i $source -y -vn -acodec alac $dest',
|
||||
u'extension': u'm4a',
|
||||
'alac': {
|
||||
- 'command': 'ffmpeg -i $source -y -vn -acodec alac $dest',
|
||||
+ 'command': '@ffmpeg@/bin/ffmpeg -i $source -y -vn -acodec alac $dest',
|
||||
'extension': 'm4a',
|
||||
},
|
||||
- u'flac': u'ffmpeg -i $source -y -vn -acodec flac $dest',
|
||||
- u'mp3': u'ffmpeg -i $source -y -vn -aq 2 $dest',
|
||||
+ u'flac': u'@ffmpeg@/bin/ffmpeg -i $source -y -vn -acodec flac $dest',
|
||||
+ u'mp3': u'@ffmpeg@/bin/ffmpeg -i $source -y -vn -aq 2 $dest',
|
||||
u'opus':
|
||||
- u'ffmpeg -i $source -y -vn -acodec libopus -ab 96k $dest',
|
||||
+ u'@ffmpeg@/bin/ffmpeg -i $source -y -vn -acodec libopus -ab 96k $dest',
|
||||
u'ogg':
|
||||
- u'ffmpeg -i $source -y -vn -acodec libvorbis -aq 3 $dest',
|
||||
+ u'@ffmpeg@/bin/ffmpeg -i $source -y -vn -acodec libvorbis -aq 3 $dest',
|
||||
u'wma':
|
||||
- u'ffmpeg -i $source -y -vn -acodec wmav2 -vn $dest',
|
||||
+ u'@ffmpeg@/bin/ffmpeg -i $source -y -vn -acodec wmav2 -vn $dest',
|
||||
- 'flac': 'ffmpeg -i $source -y -vn -acodec flac $dest',
|
||||
- 'mp3': 'ffmpeg -i $source -y -vn -aq 2 $dest',
|
||||
+ 'flac': '@ffmpeg@/bin/ffmpeg -i $source -y -vn -acodec flac $dest',
|
||||
+ 'mp3': '@ffmpeg@/bin/ffmpeg -i $source -y -vn -aq 2 $dest',
|
||||
'opus':
|
||||
- 'ffmpeg -i $source -y -vn -acodec libopus -ab 96k $dest',
|
||||
+ '@ffmpeg@/bin/ffmpeg -i $source -y -vn -acodec libopus -ab 96k $dest',
|
||||
'ogg':
|
||||
- 'ffmpeg -i $source -y -vn -acodec libvorbis -aq 3 $dest',
|
||||
+ '@ffmpeg@/bin/ffmpeg -i $source -y -vn -acodec libvorbis -aq 3 $dest',
|
||||
'wma':
|
||||
- 'ffmpeg -i $source -y -vn -acodec wmav2 -vn $dest',
|
||||
+ '@ffmpeg@/bin/ffmpeg -i $source -y -vn -acodec wmav2 -vn $dest',
|
||||
},
|
||||
u'max_bitrate': 500,
|
||||
u'auto': False,
|
||||
'max_bitrate': 500,
|
||||
'auto': False,
|
||||
|
@ -0,0 +1,20 @@ |
||||
diff --git i/beets/util/artresizer.py w/beets/util/artresizer.py
|
||||
index 8683e228..2f38b4d6 100644
|
||||
--- i/beets/util/artresizer.py
|
||||
+++ w/beets/util/artresizer.py
|
||||
@@ -334,13 +334,8 @@ class ArtResizer(metaclass=Shareable):
|
||||
# not, fall back to the older, separate convert and identify
|
||||
# commands.
|
||||
if self.method[0] == IMAGEMAGICK:
|
||||
- self.im_legacy = self.method[2]
|
||||
- if self.im_legacy:
|
||||
- self.im_convert_cmd = ['convert']
|
||||
- self.im_identify_cmd = ['identify']
|
||||
- else:
|
||||
- self.im_convert_cmd = ['magick']
|
||||
- self.im_identify_cmd = ['magick', 'identify']
|
||||
+ self.im_convert_cmd = ['@imagemagick@/bin/magick']
|
||||
+ self.im_identify_cmd = ['@imagemagick@/bin/magick', 'identify']
|
||||
|
||||
def resize(
|
||||
self, maxwidth, path_in, path_out=None, quality=0, max_filesize=0
|
@ -1,26 +0,0 @@ |
||||
diff --git a/beetsplug/keyfinder.py b/beetsplug/keyfinder.py
|
||||
index 702003f0..08689cd8 100644
|
||||
--- a/beetsplug/keyfinder.py
|
||||
+++ b/beetsplug/keyfinder.py
|
||||
@@ -31,7 +31,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,
|
||||
})
|
||||
diff --git a/test/test_keyfinder.py b/test/test_keyfinder.py
|
||||
index c8735e47..d7d670a4 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 = util.CommandOutput(b"dbm", b"")
|
@ -1,26 +1,26 @@ |
||||
diff --git i/beetsplug/replaygain.py w/beetsplug/replaygain.py
|
||||
index 9d6fa23c..c5800039 100644
|
||||
index b6297d93..5c1cbbc0 100644
|
||||
--- i/beetsplug/replaygain.py
|
||||
+++ w/beetsplug/replaygain.py
|
||||
@@ -391,7 +391,7 @@ class FfmpegBackend(Backend):
|
||||
@@ -139,7 +139,7 @@ class FfmpegBackend(Backend):
|
||||
|
||||
def __init__(self, config, log):
|
||||
super(FfmpegBackend, self).__init__(config, log)
|
||||
super().__init__(config, log)
|
||||
- self._ffmpeg_path = "ffmpeg"
|
||||
+ self._ffmpeg_path = "@ffmpeg@/bin/ffmpeg"
|
||||
|
||||
# check that ffmpeg is installed
|
||||
try:
|
||||
@@ -1228,11 +1228,10 @@ class ReplayGainPlugin(BeetsPlugin):
|
||||
@@ -975,11 +975,10 @@ class ReplayGainPlugin(BeetsPlugin):
|
||||
def __init__(self):
|
||||
super(ReplayGainPlugin, self).__init__()
|
||||
super().__init__()
|
||||
|
||||
- # default backend is 'command' for backward-compatibility.
|
||||
self.config.add({
|
||||
'overwrite': False,
|
||||
'auto': True,
|
||||
- 'backend': u'command',
|
||||
+ 'backend': u'ffmpeg',
|
||||
- 'backend': 'command',
|
||||
+ 'backend': 'ffmpeg',
|
||||
'threads': cpu_count(),
|
||||
'parallel_on_import': False,
|
||||
'per_disc': False,
|
||||
|
Loading…
Reference in new issue