===================================================================
RCS file: /cvs/mp3/bin/showall.pl,v
retrieving revision 1.1
retrieving revision 1.4
diff -u -r1.1 -r1.4
--- mp3/bin/showall.pl 2006/03/02 23:20:47 1.1
+++ mp3/bin/showall.pl 2007/02/08 23:03:15 1.4
@@ -1,4 +1,5 @@
#!/usr/bin/perl -w
+# $RedRiver: showall.pl,v 1.3 2007/02/08 20:04:03 andrew Exp $
########################################################################
# showall.pl *** Displays all MP3's in all subdirs
#
@@ -12,7 +13,6 @@
#my qw/ %mp3s %dirs /;
my $basedir = '/home/mp3/Sorted';
-my $subdir = $ENV{'QUERY_STRING'};
my $addurl = 'addmp3playlist.pl';
my $countdir = 0;
@@ -21,12 +21,19 @@
# *** MAIN ***
#######################################################################
-if ($subdir) {
- $subdir =~ s/%(..)/pack("c",hex($1))/ge;
+my ($prefix, $subdir) = split /\&/, $ENV{'QUERY_STRING'};
+if ($subdir) {
+ $subdir =~ s/%(..)/pack("c",hex($1))/ge;
} else {
- $subdir ='';
+ $subdir ='';
}
+if ($prefix) {
+ $prefix =~ s/%(..)/pack("c",hex($1))/ge;
+} else {
+ $prefix ='';
+}
+
#$basedir = $basedir . "/" . $subdir;
print "Content-Type: text/html\n\n";
@@ -38,8 +45,10 @@
if ($subdir) {
print "
";
SplitDir($subdir);
- print " - All";
- print " - Add
";
+ print " - Show";
+ print " - Play";
+ print " - Approve" if $prefix;
+ print "
";
print "
\n";
print "
\n";
}
@@ -60,7 +69,7 @@
# my $count;
# my @sorted = sort { lc($dirs{$a}) cmp lc($dirs{$b}) } (keys %dirs);
# foreach my $dir (@sorted) {
-# print "$dirs{$dir}
";
+# print "$dirs{$dir}
";
# $count++;
# }
# print "Total dirs displayed: $count\n";
@@ -72,7 +81,7 @@
# my $count;
# foreach my $mp3dir (sort keys %mp3s) {
# foreach $mp3 (@{ $mp3s{$mp3dir} }) {
-# print "\t
Song: $mp3\n";
+# print "\tSong: $mp3\n";
# $count++;
# }
# }
@@ -105,9 +114,11 @@
print "\n";
foreach my $directory (@directories) {
# $dirs{"$DIR/$directory"} = $directory;
- print "- $directory";
- print " - All";
- print " - Add
";
+ print "- $directory";
+ print " - Show";
+ print " - Play";
+ print " - Approve";
+ print "
";
$countdir++;
my @curdir = GetDirListing("$DIR/$directory");
@@ -115,7 +126,7 @@
# push @dirs, @curdir;
-# print "$directory
";
+# print "$directory
";
}
opendir DIR, "$basedir/$DIR" or bail("Unable to opendir $$!");
my @temp = grep /\.(mp3|ogg)$/i, readdir(DIR);
@@ -138,7 +149,9 @@
print "OGG: ";
}
$songtitle =~ s/\.(mp3|ogg)$//i;
- print "$songtitle\n";
+ print "$songtitle\n";
+ print " - Approve\n" if $prefix;
+ print "";
$countmp3++;
}
print "
\n";
@@ -207,7 +220,7 @@
for ($j=0;$j<=$i;$j++) {
$url = "$url/$filename[$j]";
}
- print "/$filename[$i]";
+ print "/$filename[$i]";
}
} else {