Changeset 6

Timestamp:

05/16/07 04:56:59

Author:

ed

Message:

adding support of playlist with audio (xspf format)

Files:

• xmlautoindex/trunk/Apache/XmlAutoIndex/Audio.pm (modified) (3 diffs)
• xmlautoindex/trunk/Apache/XmlAutoIndex/Default.pm (modified) (1 diff)
• xmlautoindex/trunk/Apache/XmlAutoIndex/core.pm (modified) (1 diff)

xmlautoindex/trunk/Apache/XmlAutoIndex/Audio.pm

@@ -29 +29 @@
-                return Apache2::Const::OK();
-        }
+        elsif($format eq 'audioPlaylist')
+        {
+                $this->request->content_type( "text/xml");
+                $this->request->print( $this->getAudioPlayList( ) );
+                return Apache2::Const::OK();
+        }
-        else
-        {
@@ -35 +41 @@
-}
-
+# TODO: migrate audioPlaylist into RSS...
-sub allowedFormat
-{
-        my $this = shift;
-
+audioPlaylist 
-}
-                
@@ -84 +91 @@
-EOF
-}
+
+sub getAudioPlayList
+{
+        my $this = shift;
+        my $uri = $this->request->uri();
+        
+        my $directory = $this->request()->filename();
+
+        my @files;
+        my @directories;
+        my @xml;
+
+        $directory =~ s/\/([^\/]*)$//;
+        my $selected = $1;
+
+
+        my $dir=IO::Dir->new( $directory);
+        unless ($dir) 
+        {
+                $this->request->warn( "unable to read $directory: $!");
+                return undef;
+        }
+        while ($_ = $dir->read())
+        {
+                next if /^\./; #ignore hidden files
+                
+                if    ( -f "$directory/$_" )
+                {
+                        push @files, $_;
+                }
+        }
+        $dir->close();
+
+        @files      = sort @files;
+
+        my $count = 0;
+
+        FILE: foreach my $file (@files, @files) 
+        {
+
+                last if ($count == scalar @files); # terminates once we have reached made the entire loop
+
+                next if ($count == 0 and $file ne $selected); # next until we reached the selected file
+
+                $count++; # count next file
+                
+
+                #XXX: need to use lookup_dirent, but this method is not supported at this time
+                my $subrequest  = $this->request()->lookup_file($file);
+                my $file_status = $subrequest->status();
+
+                #if forbidden, ignore this file #TODO: should not put a warn in logs...
+                next if ($file_status >= 400 and $file_status < 500);
+        
+                my $object = Apache::XmlAutoIndex::core->new( 
+                                request    => $subrequest, 
+                                cgi        => $this->cgi,
+                                type       => $subrequest->content_type(),
+                                selected   => ($file eq $selected),
+                );
+                
+                # XXX /!\ XXX order is important because first match is taken...
+                foreach my $class ( 'Apache::XmlAutoIndex::Audio' )
+                {
+                        bless( $object, $class); #perl pseudo OO tip: change class without copying data...
+                        next FILE if $object->hidden();
+                        last if $object->match();
+                }
+
+                push @xml, $object->xmlTrack();
+        }
+
+
+        return 
+                "<?xml version='1.0' encoding='iso-8859-1' ?>\n".
+                "<playlist version='1' xmlns='http://xspf.org/ns/0/'>\n".
+                "  <trackList>\n".
+                join("\n", @xml).
+                "  </trackList>\n".
+                "</playlist>";
+
+}
-# ------------------------- 
-
+sub xmlTrack 
+{
+        my $this = shift;
+        my $uri    = $this->request->uri();
+        my $title  = $this->request->filename();# TODO
+        $title =~ s/.*\///;
+        my $artist = ""; # TODO
+        my $id = $title;
+        
+        $id = 'selected' if $this->selected();
+
+        return <<EOF;
+                <track>
+                        <title>$title</title>
+                        <!-- creator>Artist</creator -->
+                        <location>$uri</location>
+                        <identifier>$id</identifier>
+                </track>
+EOF
+}
-return 1;

xmlautoindex/trunk/Apache/XmlAutoIndex/Default.pm

@@ -27 +27 @@
-        my $icon;
-
- $this->type =~ /directory/ 
+$format eq 'thumb'
-        {
-request->uri =~ /\/(photo|image|picture)s?$
+type =~ /directory
-                {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                $thumb = $this->type;
-.*$/
+/\-
-                $thumb .= ".png";
-                if (not -e $this->getIconsLocalPath()."/".$thumb) 
-                {
-
+
+
+
+
+
+
+
-                }
+                return $this->getIconsUri()."/".$thumb;
-        }
-
+
+
+
+
-}
-

xmlautoindex/trunk/Apache/XmlAutoIndex/core.pm

@@ -349 +349 @@
-
-        require utf8;   
-deco
+upgra
-
-        require HTML::Entities;