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

Allow the convert plugin to convert to any format, not just mp3.

Browse source
This commit is contained in:
Rowan Lewis 2013-09-12 20:06:36 +10:00
parent fde071eb11
commit 21c9855c4f
1 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
beetsplug/convert.py
View file

@ -19,6 +19,7 @@ import os
import threading
from subprocess import Popen
import tempfile
from string import Template
from beets.plugins import BeetsPlugin
from beets import ui, util
@ -41,17 +42,29 @@ def _destination(lib, dest_dir, item, keep_new, path_formats):
# occurs.
return dest
else:
# Otherwise, replace the extension with .mp3.
return os.path.splitext(dest)[0] + '.mp3'
# Otherwise, replace the extension.
return os.path.splitext(dest)[0] + '.' + config['convert']['extension'].get(unicode)
def encode(source, dest):
log.info(u'Started encoding {0}'.format(util.displayable_path(source)))
opts = config['convert']['opts'].get(unicode).split(u' ')
encode = Popen([config['convert']['ffmpeg'].get(unicode), '-i',
source, '-y'] + opts + [dest],
close_fds=True, stderr=DEVNULL)
command = config['transport']['command'].get(unicode).split(u' ')
opts = []
for arg in command:
opts.append(Template(arg).substitute({
'source': source,
'dest': dest
}))
encode = Popen(opts, close_fds=True, stderr=DEVNULL)
#opts = config['convert']['opts'].get(unicode).split(u' ')
#encode = Popen([config['convert']['ffmpeg'].get(unicode), '-i',
# source, '-y'] + opts + [dest],
# close_fds=True, stderr=DEVNULL)
encode.wait()
if encode.returncode != 0:
# Something went wrong (probably Ctrl+C), remove temporary files
@ -106,7 +119,7 @@ def convert_item(lib, dest_dir, keep_new, path_formats):
else:
if keep_new:
item.path = os.path.splitext(item.path)[0] + '.mp3'
item.path = os.path.splitext(item.path)[0] + '.' + config['convert']['extension'].get(unicode)
encode(dest, item.path)
else:
encode(item.path, dest)
@ -135,7 +148,7 @@ def convert_on_import(lib, item):
library.
"""
if should_transcode(item):
fd, dest = tempfile.mkstemp('.mp3')
fd, dest = tempfile.mkstemp('.' + config['convert']['extension'].get(unicode))
os.close(fd)
_temp_files.append(dest) # Delete the transcode later.
encode(item.path, dest)
@ -180,8 +193,8 @@ class ConvertPlugin(BeetsPlugin):
self.config.add({
u'dest': None,
u'threads': util.cpu_count(),
u'ffmpeg': u'ffmpeg',
u'opts': u'-aq 2',
u'command': u'ffmpeg -i $source -y -aq 2 $dest',
u'extension': u'mp3',
u'max_bitrate': 500,
u'embed': True,
u'auto': False,