X-Git-Url: http://erislabs.net/gitweb/?p=id3fs.git;a=blobdiff_plain;f=bin%2Fid3fs-tag;h=f4b0df281aa624055f31a87c1c2999ac2e563cec;hp=9b36c214e20c77f155e4acb19687b964bd892415;hb=7e09bd0c9b6191c2b9a9d4aefd3b638de22da6f1;hpb=261cfc3301a9908e34ef38f3f0792b08a4412ff7

diff --git a/bin/id3fs-tag b/bin/id3fs-tag
index 9b36c21..f4b0df2 100755
--- a/bin/id3fs-tag
+++ b/bin/id3fs-tag
@@ -28,9 +28,10 @@ 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, @replace_tags);
+    $delete_genre, $genre, $add_tags, $delete_tags, $overwrite_tagvals,
+    $delete_tagvals);
 
-Configure(qw(no_ignore_case));
+Configure(qw(bundling no_ignore_case));
 my $optret=GetOptions(
     "verbose|v"                      => \$verbose,
     "help|h"                         => \$help,
@@ -52,8 +53,9 @@ my $optret=GetOptions(
     "delete-genre|delete-all-tags|G" => \$delete_genre,
     "genre|g|replace-all-tags|R=s"   => \$genre,
     "add-tags|tags|t=s"              => \$add_tags,
+    "overwrite-tagvals|tagvals|o=s"  => \$overwrite_tagvals,
     "delete-tags|T=s"                => \$delete_tags,
-    "replace-tags|r=s{2}"            => \@replace_tags,
+    "delete-tags-with-values|O=s"    => \$delete_tagvals,
     );
 
 usage() if(!@ARGV || !$optret || $help);
@@ -82,25 +84,29 @@ while(my $filename=shift @ARGV)
 sub do_deletes
 {
     my($file)=@_;
-    $file->delete_artist()           if($delete_artist);
-    $file->delete_album()            if($delete_album);
-    $file->delete_track()            if($delete_track);
-    $file->delete_tracknum()         if($delete_tracknum);
-    $file->delete_year()             if($delete_year);
-    $file->delete_v1genre()          if($delete_v1genre);
-    $file->delete_comment()          if($delete_comment);
-    $file->delete_all()              if($delete_all);
-    $file->delete_genre()            if($delete_genre);
-    $file->delete_tags($delete_tags) if($delete_tags);
-    if(@replace_tags && $replace_tags[0])
+    if($delete_all)
     {
-	$file->delete_tags($replace_tags[0]);
+        $file->delete_all();
+	# we don't want to save the tag if we've deleted it
+	return 0;
     }
-
-    return($delete_artist   || $delete_album  || $delete_track   ||
-	   $delete_tracknum || $delete_year   || $delete_v1genre ||
-	   $delete_comment  || $delete_all    || $delete_genre   ||
-	   $delete_tags     || (@replace_tags && $replace_tags[0]));
+    $file->delete_artist()   if($delete_artist);
+    $file->delete_album()    if($delete_album);
+    $file->delete_track()    if($delete_track);
+    $file->delete_tracknum() if($delete_tracknum);
+    $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_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);
+    return($donesomething ? 1 : 0);
 }
 
 sub do_adds
@@ -115,16 +121,14 @@ sub do_adds
     $file->comment($comment)   if($comment);
     $file->genre($genre)       if($genre);
     $file->add_tags($add_tags) if($add_tags);
-    if(@replace_tags && $replace_tags[0])
-    {
-	$file->add_tags($replace_tags[1]);
-    }
-
-    return(defined($artist)   || defined($album) || defined($track)    ||
-	   defined($tracknum) || defined($year)  || defined($v1genre)  ||
-	   defined($comment)  || defined($genre) || defined($add_tags) ||
-	   (@replace_tags && defined($replace_tags[1])));
-
+    $file->add_tags($overwrite_tagvals) if($overwrite_tagvals);
+
+    my $donesomething=(defined($artist)   || defined($album) ||
+		       defined($track)    || defined($tracknum) ||
+		       defined($year)     || defined($v1genre) ||
+		       defined($comment)  || defined($genre) ||
+		       defined($add_tags) || defined($overwrite_tagvals));
+    return( $donesomething ? 1 : 0 );
 }
 
 sub do_write
@@ -144,16 +148,17 @@ sub do_display
     my $comment=$file->comment();
     my $v1genre=$file->v1genre();
     my @tags=$file->tags();
+    @tags = map { (ref($_) eq "ARRAY") ? join('/', grep {defined;} @{$_}) : $_; } @tags;
     if($verbose)
     {
 	print $file->path(), ":\n";
-	print "tracknum: $tracknum\n" if($tracknum);
-	print "artist: $artist\n"     if($artist);
-	print "album: $album\n"       if($album);
-	print "song: $track\n"        if($track);
-	print "year: $year\n"         if($year);
-	print "v1genre: $v1genre\n"   if($v1genre);
-	print "comment: $comment\n"   if($comment);
+	print "  tracknum: $tracknum\n" if($tracknum);
+	print "  artist: $artist\n"     if($artist);
+	print "  album: $album\n"       if($album);
+	print "  song: $track\n"        if($track);
+	print "  year: $year\n"         if($year);
+	print "  v1genre: $v1genre\n"   if($v1genre);
+	print "  comment: $comment\n"   if($comment);
     }
     else
     {
@@ -161,10 +166,12 @@ sub do_display
 		    $year, $v1genre, $comment);
 	@fields=map { defined($_) ? $_ : ""; } @fields;
 	print join(':', @fields), "\n";
-	if(@tags)
-	{
-	    print "tags:", join(", ", @tags), "\n";
-	}
+    }
+    if(@tags)
+    {
+	if($verbose) { print "  tags: "; }
+	else         { print $file->path() . ":tags:"; }
+	print join(", ", @tags), "\n";
     }
 }