reworked DB::new et al *again*

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

diff --git a/lib/ID3FS/AudioFile.pm b/lib/ID3FS/AudioFile.pm
index 91462ba..cac87d3 100644 (file)
--- a/lib/ID3FS/AudioFile.pm
+++ b/lib/ID3FS/AudioFile.pm
@@ -1,35 +1,122 @@
-package ID3FS::File;
+package ID3FS::AudioFile;
 
 use strict;
 use warnings;
-use ID3FS::File::Mp3;
-use ID3FS::File::Ogg;
-use ID3FS::File::Flac;
+use ID3FS::AudioFile::Mp3;
+use ID3FS::AudioFile::Ogg;
+use ID3FS::AudioFile::Flac;
 
-# omg a factory class, I feel vaguely dirty
 sub new
 {
-    my (undef,$path)=@_;
+    my $proto=shift;
+    my $class=ref($proto) || $proto;
+    my $self={};
+    bless($self,$class);
+
+    my $path=shift;
     my $ext=($path=~/.*\.(.*)/)[0];
     return undef unless($ext);
+    my $me=shift;
     $ext=lc($ext);
     if($ext eq "mp3")
     {
-       return ID3FS::File::Mp3->new($path);
+       $self->{audiofile}=ID3FS::AudioFile::Mp3->new($path);
     }
     elsif($ext eq "ogg")
     {
-       return ID3FS::File::Ogg->new($path);
+       $self->{audiofile}=ID3FS::AudioFile::Ogg->new($path);
     }
     elsif($ext eq "flac")
     {
-       return ID3FS::File::Flac->new($path);
+       $self->{audiofile}=ID3FS::AudioFile::Flac->new($path);
     }
     else
     {
-       print("Unknown extension: $ext\n");
+       print("$me: $path: Unknown extension: $ext\n");
        return undef;
     }
+    return $self;
+}
+
+sub artist
+{
+    my $self=shift;
+    return $self->sanitise($self->stripslashes($self->{audiofile}->artist()));
+}
+
+sub album
+{
+    my $self=shift;
+    return $self->sanitise($self->stripslashes($self->{audiofile}->album()));
+}
+
+sub audiotype
+{
+    my $self=shift;
+    return $self->sanitise($self->stripslashes($self->{audiofile}->audiotype()));
+}
+
+sub haspic
+{
+    return undef; # FIXME
+#    my $self=shift;
+#    return $self->{audiofile}->haspic();
+}
+
+sub v1genre
+{
+    my $self=shift;
+    return $self->sanitise($self->stripslashes($self->{audiofile}->v1genre()));
+}
+
+sub year
+{
+    my $self=shift;
+    my $year=$self->sanitise($self->stripslashes($self->{audiofile}->year()));
+    if(defined($year) && $year =~/(\d{4})/)
+    {
+       $year=$1;
+    }
+    return $year;
+}
+
+sub tags
+{
+    my $self=shift;
+    my @intags=$self->{audiofile}->tags();
+    my @outtags=();
+    return() unless(@intags);
+    @intags = grep { defined($_); } @intags;
+    # combine then split on commas
+    # so multiple comma-delimited tags will work
+    @intags=split(/\s*,\s*/, join(', ', @intags));
+    for my $tag (@intags)
+    {
+       next unless(length($tag));
+       next unless($tag =~ /\S+/);
+       $tag=$self->sanitise($tag);
+       my ($tagname, $tagval)=($tag, undef);
+       if($tag=~/^([^\/]+)\/(.*)/)
+       {
+           ($tagname, $tagval)=($1, $2);
+       }
+       push(@outtags, [ $tagname, $tagval ]);
+    }
+    return @outtags;
+}
+
+sub sanitise
+{
+    my ($self, $text)=@_;
+    $text =~ s/[^[:print:]]//g if(defined($text));
+    return $text;
+}
+
+sub stripslashes
+{
+    my ($self, $text)=@_;
+    $text =~ s/\//-/g if(defined($text));
+    return $text;
 }
 
 1;