Hmm, some standardization sitting around in a working copy since November...

[flac-archive] / rewrite-tags

diff --git a/rewrite-tags b/rewrite-tags
index c44a27b5a93f7e304ffc6894aa863cd0d2050f71..1d4b41242b481d0a8fc66f2423b3cd9437516224 100755 (executable)
--- a/rewrite-tags
+++ b/rewrite-tags
@@ -4,7 +4,6 @@ import os, sys
 import subprocess
 import tempfile
 from errno import EEXIST
-from subprocess import Popen, PIPE
 
 from flac_archive.tags import Tags
 
@@ -21,18 +20,19 @@ class SubprocessError(Exception):
         Exception.__init__(self, msg % (abs(status), command_msg))
         self.status = status
         self.command = command
-        self.stderr = stderr
+        self.stderr = ''.join(stderr)
 
 def get_tags(fn):
     tags = Tags()
 
     command = ['metaflac', '--no-utf8-convert', '--export-tags-to=-', fn]
-    p = Popen(command, stdout=PIPE)
+    p = subprocess.Popen(command, stdout=subprocess.PIPE,
+                         stderr=subprocess.STDOUT)
     tags.load(p.stdout)
 
     status = p.wait()
     if status != 0:
-        raise SubprocessError(status, command=command, stderr=p.stderr)
+        raise SubprocessError(status, command=command, stderr=p.stdout)
 
     return tags
 
@@ -41,11 +41,11 @@ def rewrite_track_tags(track, tags, fn, tmp):
     tmp.close()
     command = ['metaflac', '--no-utf8-convert', '--dont-use-padding',
                '--remove-all-tags', '--import-tags-from', tmp.name, fn]
-    p = Popen(command, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-    stdout, stderr = p.communicate()
+    p = subprocess.Popen(command, stdout=subprocess.PIPE,
+                         stderr=subprocess.STDOUT)
     status = p.wait()
     if status != 0:
-        raise SubprocessError(status, command=command, stderr=stdout)
+        raise SubprocessError(status, command=command, stderr=p.stdout)
 
 def do_read(filenames):
     # Use this mapping of tag names to sets of tag values to detect global tags.
@@ -60,7 +60,7 @@ def do_read(filenames):
         # this check belongs in Tags
         if len(track_tags) != 1:
             sys.stderr.write('bogus TRACKNUMBER %s: %s\n' % (track_tags, fn))
-            return 3
+            return 4
         track = int(track_tags[0])
         for tag, values in tags._global.iteritems():
             # Makes no sense to save TRACKNUMBER in coll_tags.
@@ -88,7 +88,7 @@ def do_write(args):
     if len(args) != len(tags):
         sys.stderr.write('expected %d flac files, got %d\n'
                          % (len(tags), len(args)))
-        return 4
+        return 2
     artist = tags.get_path_safe('ARTIST')
     album = tags.get_path_safe('ALBUM')
     try:
@@ -120,10 +120,14 @@ def do_write(args):
 def main(args):
     if len(args) < 3:
         return usage()
-    if args[1] == 'read':
-        return do_read(args[2:])
-    if args[1] == 'write':
-        return do_write(args[2:])
+    try:
+        if args[1] == 'read':
+            return do_read(args[2:])
+        if args[1] == 'write':
+            return do_write(args[2:])
+    except SubprocessError, e:
+        sys.stderr.write('%s\n%s\n' % (e.stderr, e))
+        return 3
     return usage()
 
 def usage():