Move Tags class into new flac_archive package, fix a bug in it, and

[flac-archive] / fa-flacd

diff --git a/fa-flacd b/fa-flacd
index bef49542aef9d1aa945bf58f2af94ed5d087b1f4..7e455bf2ba60fc9565772992ad02807a203b6caf 100755 (executable)
--- a/fa-flacd
+++ b/fa-flacd
@@ -1,6 +1,6 @@
 #! /usr/bin/env python2.4
 
-'''
+"""
 =head1 NAME
 
 B<fa-flacd> - archive CDs to single FLAC files
@@ -74,7 +74,7 @@ it under the same terms as Perl itself.
 
 =cut
 
-''' #' # python-mode is sucks
+"""
 
 import os
 import re
@@ -107,7 +107,7 @@ def run_flac(infile, cue, outfile, tags):
         argv.extend(['-T', i])
     argv.append(infile)
     # flac 1.1.3 PICTURE support
-    #argv.extend(['--picture', '3|image/jpeg|||cover.front'])
+    argv.extend(['--picture', '3|image/jpeg|||cover.front'])
 
     spew('Running flac\n')
     status = os.spawnvp(os.P_WAIT, argv[0], argv)
@@ -119,8 +119,8 @@ def run_flac(infile, cue, outfile, tags):
     c(os.rename, outfile + '.flac-tmp', outfile + '.flac')
 
 def flac(dir, artist, album, discnum, tracknum, track_tags, disc_artist, tags):
-    '''Encode a single wav file to a single flac file, whether the wav and
-    flac files represent individual tracks or whole discs.'''
+    """Encode a single wav file to a single flac file, whether the wav and
+    flac files represent individual tracks or whole discs."""
 
     (artist, album) = [x.replace('/', '_') for x in (artist, album)]
 
@@ -207,8 +207,8 @@ def flac(dir, artist, album, discnum, tracknum, track_tags, disc_artist, tags):
 # The master process
 
 def get_tags(fn):
-    '''Return the ARTIST, ALBUM, and DATE followed by a list of all the
-    lines in the file FN.'''
+    """Return the ARTIST, ALBUM, and DATE followed by a list of all the
+    lines in the file FN."""
 
     artist = album = discnum = None
     tags = []