From d87b204e577f0449fcb7034b6f0150b0e4a8d853 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <debian@mcmillan.net.nz>
Date: Sat, 29 May 2010 10:45:01 +1200
Subject: [PATCH] Clean coding style.

---
 scripts/add_subtree.pl | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/scripts/add_subtree.pl b/scripts/add_subtree.pl
index 665731e..333dd4d 100755
--- a/scripts/add_subtree.pl
+++ b/scripts/add_subtree.pl
@@ -12,16 +12,16 @@ use MP3::Info;
 use Ogg::Vorbis::Header;
 
 my %opts = (
-             database => 'adorno',
-             dbuser   => 'general',
-             force    => 0,
-             remove   => 0,
-             clean    => 0,
-             update   => 0,
-             quiet    => 0,
-             sleep    => 20,
-             duration => 0,
-             debug    => 0 );
+             'database' => 'adorno',
+             'dbuser'   => 'general',
+             'force'    => 0,
+             'remove'   => 0,
+             'clean'    => 0,
+             'update'   => 0,
+             'quiet'    => 0,
+             'sleep'    => 20,
+             'duration' => 0,
+             'debug'    => 0 );
 
 my @file_list;
 my $processed_count = 0;  # Count the files we actually process.
@@ -184,11 +184,12 @@ sub one_file {
 
       foreach my $key ($ogghdr->comment_tags) {
         foreach my $value ( $ogghdr->comment($key) ) {
-          if    ( $key =~ /artist/i   ) { $tartist = $value; }
-          elsif ( $key =~ /album/i    ) { $talbum  = $value; }
-          elsif ( $key =~ /title/i    ) { $ttitle  = $value; }
-          elsif ( $key =~ /tracknum/i ) { $tnum    = $value; }
-          elsif ( $key =~ /date/i     ) { $tyear   = $value; }
+          printf( "[%s] = [%s]\n", $key, $value ) if ( $opts{'debug'} );
+          if    ( $key =~ /^artist$/i   ) { $tartist = $value; }
+          elsif ( $key =~ /^album$/i    ) { $talbum  = $value; }
+          elsif ( $key =~ /^title$/i    ) { $ttitle  = $value; }
+          elsif ( $key =~ /^tracknum(ber)?$/i ) { $tnum    = $value; }
+          elsif ( $key =~ /^date$/i     ) { $tyear   = $value; }
         }
       }
     }
@@ -200,7 +201,10 @@ sub one_file {
     $tnum = int($tnum);
     $setpart = int($setpart);
 
-    $insert_track->execute( $hashkey, $safe_path, $ttitle, $tartist, $talbum, $tnum, $setpart, $tlength, $tquality) or
+    my @query_args = ( $tartist, $talbum, $tnum, $ttitle, $tyear );
+    printf( "[%s]\n", join( '], [', @query_args )) if ( $opts{'debug'} );
+
+    $insert_track->execute( $hashkey, $safe_path, $ttitle, $tartist, $talbum, $tnum, $setpart, $tlength, $tquality ) or
         die $dbh->errstr;
 
   }
-- 
2.11.4.GIT