some cleanup

[flac-archive] / fa-flacd

diff --git a/fa-flacd b/fa-flacd
index e291b75a8b66439abda1fad0cc929048e6f5b021..5e93e1f16965b7cb3f9bb1452b1e44324f925122 100755 (executable)
--- a/fa-flacd
+++ b/fa-flacd
@@ -1,4 +1,4 @@
-#! /usr/bin/env python2.4
+#! /usr/bin/python

 
 """
 =head1 NAME
 
 """
 =head1 NAME


@@ -109,7 +109,8 @@ def run_flac(infile, cue, outfile, tags):
         argv.extend(['-T', i])
     argv.append(infile)
     # flac 1.1.3 PICTURE support
         argv.extend(['-T', i])
     argv.append(infile)
     # flac 1.1.3 PICTURE support

-    argv.extend(['--picture', '3|image/jpeg|||cover.front'])
+    if os.path.exists('cover.front'):
+        argv.extend(['--picture', '3|image/jpeg|||cover.front'])

 
     spew('Running flac\n')
     status = os.spawnvp(os.P_WAIT, argv[0], argv)
 
     spew('Running flac\n')
     status = os.spawnvp(os.P_WAIT, argv[0], argv)


@@ -125,7 +126,11 @@ def flac(dir, tracknum, tags):
     flac files represent individual tracks or whole discs."""
 
     separator = ' '
     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')
 
     album = (tags.gets('ALBUM', separator=separator) or '').replace('/', '_')
     discnum = tags.gets('DISCNUMBER')
 


@@ -189,7 +194,10 @@ def flac(dir, tracknum, tags):
     ld = os.listdir(dir)
     if ld == ['using-tags'] or sorted(ld) == ['cover.front', 'using-tags']:
         try:
     ld = os.listdir(dir)
     if ld == ['using-tags'] or sorted(ld) == ['cover.front', 'using-tags']:
         try:

-            os.unlink(dir + '/cover.front')
+            try:
+                os.unlink(dir + '/cover.front')
+            except OSError:
+                pass

             os.unlink(dir + '/using-tags')
             os.rmdir(dir)
         except EnvironmentError:
             os.unlink(dir + '/using-tags')
             os.rmdir(dir)
         except EnvironmentError: