X-Git-Url: https://diplodocus.org/git/flac-archive/blobdiff_plain/cbfd1b29112cd8ab5540c1019f2a400f4bf20410..ee9d8a3653ab259b0716fe801c0067956d235e49:/flac2mp3

diff --git a/flac2mp3 b/flac2mp3
index 3f0ef90..f862062 100755
--- a/flac2mp3
+++ b/flac2mp3
@@ -55,9 +55,9 @@ from optparse import OptionParser
 from subprocess import Popen, PIPE
 
 import org.diplodocus.jobs
-from org.diplodocus import flac, taglib
 from org.diplodocus.util import run_or_die
 
+from flac_archive import flac, taglib
 from flac_archive.tags import Tags
 
 ################################################################################
@@ -185,6 +185,7 @@ def main(argv):
         traceback.print_exc()
         return 2
 
+    separator = ' '
     try:
         global debug, flac_options, lame_options, quiet, verbose
         debug = options.debug
@@ -198,7 +199,7 @@ def main(argv):
                 args = get_decode_args(fn)
 
                 tags = get_tags(fn)
-                album = tags.gets('ALBUM')
+                album = tags.gets('ALBUM', separator=separator)
                 discnum = tags.gets('DISCNUMBER')
                 track = tags.gets('TRACKNUMBER')
 
@@ -218,12 +219,14 @@ def main(argv):
                 pics = flac.get_pictures(fn)
 
                 for i in range(len(tags)):
-                    title = tags.gets('TITLE', track)
+                    title = tags.gets('TITLE', track, separator)
                     part = tags.gets('PART', track)
                     if part != None:
                         title = '%s - %s' % (title, part)
+                    artist = tags.get('ARTIST', track)
+                    artist.extend(tags.get('FEATURING', track))
                     jobs.append([fn, title,
-                                 tags.gets('ARTIST', track),
+                                 ', '.join(artist),
                                  album,
                                  tags.gets('DATE', track),
                                  track, args[i], pics])