X-Git-Url: https://diplodocus.org/git/flac-archive/blobdiff_plain/b989bba3a1183f9dc004ebf7aeb333469aef392f..bc10ac6298048de2f6c67c9d4d413a54352ccda9:/fa-flacd

diff --git a/fa-flacd b/fa-flacd
index 7e13bd9..5716223 100755
--- a/fa-flacd
+++ b/fa-flacd
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/python2
 
 """
 =head1 NAME
@@ -126,7 +126,11 @@ def flac(dir, tracknum, tags):
     flac files represent individual tracks or whole discs."""
 
     separator = ' '
-    artist = (tags.gets('ARTIST', separator=', ') or '').replace('/', '_')
+    if len(tags.get('ALBUMARTIST')) > 0:
+        artist_tag = tags.gets('ALBUMARTIST', separator=', ')
+    else:
+        artist_tag = tags.gets('ARTIST', separator=', ')
+    artist = (artist_tag or '').replace('/', '_')
     album = (tags.gets('ALBUM', separator=separator) or '').replace('/', '_')
     discnum = tags.gets('DISCNUMBER')
 
@@ -154,7 +158,12 @@ def flac(dir, tracknum, tags):
         run_flac('wav', 'cue', '/'.join(['..', artist, outfile]), tags.all())
         files = ['%s/%s.flac' % (artist, outfile)]
 
-        c(os.unlink, 'cue')
+        try:
+            c(os.unlink, 'cue')
+        except EnvironmentError, error:
+            if error.errno != ENOENT:
+                raise error
+
         outlog = '/'.join(['..', artist, outfile + '.log'])
         c(os.rename, 'log', outlog)
     else: