finish refactoring AudioFile

[id3fs.git] / lib / ID3FS / AudioFile / Mp3.pm

diff --git a/lib/ID3FS/AudioFile/Mp3.pm b/lib/ID3FS/AudioFile/Mp3.pm
index d6597d0..8ac84c4 100644 (file)
--- a/lib/ID3FS/AudioFile/Mp3.pm
+++ b/lib/ID3FS/AudioFile/Mp3.pm
@@ -41,7 +41,6 @@ sub choose
        warn("$self->{path}: no $func defined in ID3 tags\n") if($verbose);
        return undef;
     }
-    $thing=~s/\//-/g; # drop slashes
     return $thing;
 }
 
@@ -55,36 +54,15 @@ sub v1genre
 {
     my($self)=@_;
     my $genre=undef;
-    if(defined($self->{v1}))
-    {
-       $genre=$self->{v1}->genre();
-       $genre =~ s/\//-/g if(defined($genre));
-    }
+    $genre=$self->{v1}->genre() if(defined($self->{v1}));
     return $genre;
 }
 
 sub tags
 {
     my $self=shift;
-    return({}) unless(exists($self->{mp3}->{ID3v2}) && defined($self->{mp3}->{ID3v2}));
-    my $genre=$self->{mp3}->{ID3v2}->genre();
-    return({}) unless(defined($genre) && length($genre));
-    my @tags=split(/\s*,\s*/, $genre);
-    for my $tag (@tags)
-    {
-       if($tag=~/([^\/]+)\/(.*)/)
-       {
-           my $tagname=$1;
-           my $tagval=$2;
-           $tagval=~s/\//-/g;
-           $self->{tags}->{$tagname}=$tagval;
-       }
-       else
-       {
-           $self->{tags}->{$tag}=undef;
-       }
-    }
-    return $self->{tags};
+    return() unless(exists($self->{mp3}->{ID3v2}) && defined($self->{mp3}->{ID3v2}));
+    return($self->{mp3}->{ID3v2}->genre());
 }
 
 sub get_tags
@@ -108,4 +86,3 @@ sub get_tags
 }
 
 1;
-