finish refactoring AudioFile

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

diff --git a/lib/ID3FS/AudioFile/Flac.pm b/lib/ID3FS/AudioFile/Flac.pm
index 308b8a0..1eebb2c 100644 (file)
--- a/lib/ID3FS/AudioFile/Flac.pm
+++ b/lib/ID3FS/AudioFile/Flac.pm
@@ -27,9 +27,7 @@ sub get
           length($self->{tags}->{$key})   &&
           $self->{tags}->{$key} =~ /\S+/)
        {
-           my $val=$self->{tags}->{$key};
-           $val =~ s/\//-/g; # drop slashes
-           return $val;
+           return $self->{tags}->{$key};
        }
     }
     warn("$self->{path}: no $tag defined in FLAC comments\n") if($complain);
@@ -41,19 +39,8 @@ sub album     { shift->get("ALBUM", 1);  }
 sub audiotype { return "flac";           }
 sub haspic    { return undef;            } # FIXME
 sub v1genre   { return undef;            } # ID3 only
-
 # We don't care if year is not set
-sub year
-{
-    my ($self)=@_;
-    my $date=shift->get("DATE", 0);
-    return undef unless($date);
-    if($date =~/(\d\d\d\d)/)
-    {
-       $date=$1;
-    }
-    return $date;
-}
+sub year      { shift->get("DATE", 0);   }
 
 sub tags
 {
@@ -70,24 +57,7 @@ sub tags
            push(@tags, $self->{tags}->{$key});
        }
     }
-    # combine then split on commas
-    # so multiple comma-delimited tags will work
-    @tags=split(/\s*,\s*/, join(', ', @tags));
-    for my $tag (@tags)
-    {
-       if($tag=~/([^\/]+)\/(.*)/)
-       {
-           my $tagname=$1;
-           my $tagval=$2;
-           $tagval=~s/\//-/g;
-           $tags->{$tagname}=$tagval;
-       }
-       else
-       {
-           $tags->{$tag}=undef;
-       }
-    }
-    return $tags;
+    return(@tags);
 }
 
 1;