(run_flac): Only add --picture option if cover.front exists.

(flac): Keep unlinking even if unlink(cover.front) fails.

Suggested by: Martin Michlmayr

diff --git a/fa-flacd b/fa-flacd
index e291b75a8b66439abda1fad0cc929048e6f5b021..6488ef536e73169f47ac8056ec77d35c285cc2ab 100755 (executable)
--- a/fa-flacd
+++ b/fa-flacd
@@ -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)


@@ -189,7 +190,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: