X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=bin%2Fid3fs-tag;h=3037ad903cd731321c53205c43c111c8e833295d;hb=4ad175d74cac04bdf1500887b78753b62a365cdf;hp=c79a5b3c8482e14bb0f142800913afcbf7c6d0da;hpb=08717313d5feba3f77f848b6409ec46263ed548e;p=id3fs.git

diff --git a/bin/id3fs-tag b/bin/id3fs-tag
index c79a5b3..3037ad9 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);
@@ -66,6 +68,7 @@ while(my $filename=shift @ARGV)
 	next;
     }
     my $file=ID3FS::AudioFile->new($filename);
+    next unless($file);
     my $changes=0;
     $changes =  do_deletes($file);
     $changes += do_adds($file);
@@ -82,28 +85,28 @@ 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_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;
     }
-    $file->delete_all()              if($delete_all);
-
-    # we don't want to save the tag if we've deleted it
-    return 0 if($delete_all);
-
-    my $donesomething=($delete_artist   || $delete_album || $delete_track   ||
-		       $delete_tracknum || $delete_year  || $delete_v1genre ||
-		       $delete_comment  || $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 || $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  || defined($genre) || $overwrite_tagvals);
     return($donesomething ? 1 : 0);
 }
 
@@ -117,19 +120,15 @@ 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);
-    if(@replace_tags && $replace_tags[0])
-    {
-	$file->add_tags($replace_tags[1]);
-    }
+    $file->add_tags($genre)    if($genre);
+    $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) ||
-		       (@replace_tags && defined($replace_tags[1])));
+		       defined($add_tags) || defined($overwrite_tagvals));
     return( $donesomething ? 1 : 0 );
 }