X-Git-Url: http://erislabs.net/gitweb/?p=id3fs.git;a=blobdiff_plain;f=bin%2Fid3fs-tag;h=6bff1c4034bf1f1ff26339b22747d60bbe6a6bec;hp=9921b44687a31a4b2ca8aefd72fdfe0c04894b94;hb=9ef40433a1ba4044561f5941b07ba0d90a085942;hpb=d1601af7aa0993a69785157d18d8e3a029b1161a

diff --git a/bin/id3fs-tag b/bin/id3fs-tag
index 9921b44..6bff1c4 100755
--- a/bin/id3fs-tag
+++ b/bin/id3fs-tag
@@ -19,19 +19,23 @@
 use lib '/home/ianb/projects/id3fs/id3fs/lib'; # FIXME: remove
 use strict;
 use Getopt::Long qw(Configure);
+use File::Find;
 use ID3FS::AudioFile;
 use vars qw($me);
 $me=($0=~/(?:.*\/)?(.*)/)[0];
 
+my @extensions=qw(mp3); # FIXME:  flac ogg
+my (%argv_tags, %dir_tags, %file_tags);
+my $current_argv;
 my $verbose=0;
 my $help=0;
 my ($artist, $album, $track, $tracknum, $year, $v1genre, $comment,
     $delete_artist, $delete_album, $delete_track, $delete_tracknum,
     $delete_year, $delete_v1genre, $delete_comment, $delete_all,
     $delete_genre, $genre, $add_tags, $delete_tags, $overwrite_tagvals,
-    $delete_tagvals);
+    $delete_tagvals, $tag_summary);
 
-Configure(qw(no_ignore_case));
+Configure(qw(bundling no_ignore_case));
 my $optret=GetOptions(
     "verbose|v"                      => \$verbose,
     "help|h"                         => \$help,
@@ -56,28 +60,51 @@ my $optret=GetOptions(
     "overwrite-tagvals|tagvals|o=s"  => \$overwrite_tagvals,
     "delete-tags|T=s"                => \$delete_tags,
     "delete-tags-with-values|O=s"    => \$delete_tagvals,
+    "summary|V"                      => \$tag_summary,
     );
 
 usage() if(!@ARGV || !$optret || $help);
 
-while(my $filename=shift @ARGV)
+while(my $path=shift @ARGV)
 {
-    unless(-f $filename)
+    unless(-e $path)
     {
-	warn("$me: $filename: not found\n");
+	warn("$me: $path: not found\n");
 	next;
     }
-    my $file=ID3FS::AudioFile->new($filename);
-    my $changes=0;
-    $changes =  do_deletes($file);
-    $changes += do_adds($file);
-    if($changes)
-    {
-	do_write($file);
-    }
-    else
+    $current_argv=$path; # ick, global nastiness
+    File::Find::find( {wanted => \&wanted, follow => 1, no_chdir => 1}, $path);
+}
+
+summarize_tags() if($tag_summary);
+
+
+sub wanted
+{
+    my $ext='';
+    if(/.*\.(.*)/) { $ext=lc($1); }
+    if(-f && scalar(grep({ $ext eq lc($_);} @extensions)))
     {
-	do_display($file);
+	my $file=ID3FS::AudioFile->new($_);
+	return unless($file);
+	if($tag_summary)
+	{
+	    gather_tags($_, $file);
+	}
+	else
+	{
+	    my $changes=0;
+	    $changes =  do_deletes($file);
+	    $changes += do_adds($file);
+	    if($changes)
+	    {
+		do_write($file);
+	    }
+	    else
+	    {
+		do_display($file);
+	    }
+	}
     }
 }
 
@@ -97,15 +124,15 @@ sub do_deletes
     $file->delete_year()     if($delete_year);
     $file->delete_v1genre()  if($delete_v1genre);
     $file->delete_comment()  if($delete_comment);
-    $file->delete_genre()    if($delete_genre);
+    $file->delete_genre()    if($delete_genre || $genre);
     $file->delete_tags($delete_tags, 0)       if($delete_tags);
     $file->delete_tags($delete_tagvals, 1)    if($delete_tagvals);
     $file->delete_tags($overwrite_tagvals, 1) if($overwrite_tagvals);
 
-    my $donesomething=($delete_artist   || $delete_album || $delete_track   ||
-		       $delete_tracknum || $delete_year  || $delete_v1genre ||
-		       $delete_comment  || $delete_genre || $delete_tags    ||
-		       $delete_tagvals  || $overwrite_tagvals);
+    my $donesomething=($delete_artist   || $delete_album   || $delete_track   ||
+		       $delete_tracknum || $delete_year    || $delete_v1genre ||
+		       $delete_comment  || $delete_genre   || $delete_tags    ||
+		       $delete_tagvals  || defined($genre) || $overwrite_tagvals);
     return($donesomething ? 1 : 0);
 }
 
@@ -119,8 +146,8 @@ sub do_adds
     $file->year($year)         if($year);
     $file->v1genre($v1genre)   if($v1genre);
     $file->comment($comment)   if($comment);
-    $file->genre($genre)       if($genre);
     $file->add_tags($add_tags) if($add_tags);
+    $file->add_tags($genre)    if($genre);
     $file->add_tags($overwrite_tagvals) if($overwrite_tagvals);
 
     my $donesomething=(defined($artist)   || defined($album) ||
@@ -170,11 +197,55 @@ sub do_display
     if(@tags)
     {
 	if($verbose) { print "  tags: "; }
-	else         { print $file->path() . ":tags:"; }
+#	else         { print $file->path() . ":tags:"; }
+	else         { print "tags:"; }
 	print join(", ", @tags), "\n";
     }
 }
 
+sub gather_tags
+{
+    my($path, $file)=@_;
+    my @tags=$file->tags();
+    @tags=map { join('/', grep { defined; } @$_); } @tags;
+    @tags=ID3FS::AudioFile::uniq(@tags);
+    $file_tags{$path}=\@tags;
+    my @argv_tags=();
+    @argv_tags=@{$argv_tags{$current_argv}} if($argv_tags{$current_argv});
+    $argv_tags{$current_argv}=[ ID3FS::AudioFile::uniq(@tags, @argv_tags) ];
+}
+
+sub summarize_tags
+{
+    my @all_tags=ID3FS::AudioFile::uniq(map { @$_; } values(%argv_tags));
+    # find common tags
+    my @common_tags=();
+OUTER: for my $tag (@all_tags)
+    {
+	for my $taglist (values(%argv_tags))
+	{
+	    next OUTER unless(grep { $_ eq $tag; } @$taglist);
+	}
+	push(@common_tags, $tag);
+    }
+    print "ALL: ",    join(', ', @all_tags), "\n";
+    print "COMMON: ", join(', ', @common_tags), "\n";
+
+    use Data::Dumper;
+    # remove common tags from %argv_tags
+    for my $argv (keys(%argv_tags))
+    {
+	next unless(@{$argv_tags{$argv}});
+	$argv_tags{$argv}= [ ID3FS::AudioFile::list_remove(\@common_tags, $argv_tags{$argv}) ];
+    }
+
+    print "PER-DIR: \n";
+    for my $argv (keys(%argv_tags))
+    {
+	print "$argv: ", join(', ', @{$argv_tags{$argv}}), "\n";
+    }
+}
+
 sub usage
 {
     die("Usage: $me [-vhALSNY0CDG] [-a ARTIST] [-l ALBUM] [-s SONG] [-n TRACKNUM] FILES...\n".