added TODO, some fixes to main.shtml

diff --git a/INSTALL b/INSTALL
index 95c18833ce7c60a94bfe52620bc6ac47884481e6..76861c23265d49449b7a93c2b7a9b15eb87e8eb4 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -5,6 +5,8 @@ INSTALL
 
 include main.shtml in your existing webpage.
 it needs physical contact to the mp3 data.
+exchange all entries in main.shtml reading index.shtml 
+to the file sourcing this main.shtml file.
 
 2)
 

diff --git a/README b/README
index 6a96d562d3d436393427f9ec47cfe3d067924bc4..325a69bfe1eafbea06f350cc243af64fb5463f56 100644 (file)
--- a/README
+++ b/README
@@ -13,6 +13,7 @@ hackbard@hackdaworld.dyndns.org
 
 requirements
 ------------
+- insanity to use this
 - SSI supporting webbrowser (actually two times: 1. mp3 server 2.playing host)
 - mplayer installed on playing host
 

diff --git a/TODO b/TODO
new file mode 100644 (file)
index 0000000..1f3ad7c
--- /dev/null
+++ b/TODO
@@ -0,0 +1,7 @@
+TODO
+----
+
+- coding mp3read.c to read out mp3 specific info
+- make it all more clean
+- make it more secure
+- support a local play link (for windowzers)

diff --git a/main.shtml b/main.shtml
index 41feac53b331550014447d93da63d44a3f110f19..43c0c170deb8d2051242994974906716ed646279 100644 (file)
--- a/main.shtml
+++ b/main.shtml
@@ -61,13 +61,13 @@ if [ ! -z \"$QUERY_STRING\" ]; then
 
  echo \"<h4>results:</h4>\";
 
- artist=`echo '$QUERY_STRING' | awk -F\& '{ gsub(\"artist=\",\"\"); print $1 }'`;
+ artist=`echo '$QUERY_STRING' | awk -F\& '{ gsub(\"artist=\",\"\"); print $1 }' | sed 's/+/_/g'`;
  if [ \"`echo '$QUERY_STRING' | awk -F\& '{ gsub(\"und_oder=\",\"\"); print $2 }'`\" = \"oder\" ]; then
   und_oder=\"-o\";
  else 
   und_oder=\"-a\";
  fi;
- song=`echo '$QUERY_STRING' | awk -F\& '{ gsub(\"song=\",\"\"); print $3 }'`;
+ song=`echo '$QUERY_STRING' | awk -F\& '{ gsub(\"song=\",\"\"); print $3 }' | sed 's/+/_/g'`;
  echo \"searching for: $artist $song (mode: $und_oder)<br><br>\";
 
  if [ \"$und_oder\" != \"-a\" ]; then
@@ -78,7 +78,7 @@ if [ ! -z \"$QUERY_STRING\" ]; then
     echo \"<table border=1 cellpadding=5 cellspacing=0>\";
     for dir_song in $mp3_srcdir/$found_artists/*; do
      mp3=`basename $dir_song`;
-     echo \"<tr><td><a href=\"$mp3_http_loc/$found_artists/$mp3\">$mp3</a></td><td><a href=\"http://${local_player_ip}${playerfile_dir}/playsong.shtml\?url=http://${mp3_server_name}${mp3_http_loc}/$found_artists/$mp3\&user=$my_user_name\&passwd=$user_passwd\">play ($local_player_ip)</a></td></tr>\";
+     echo \"<tr><td><a href=\"$mp3_http_loc/$found_artists/$mp3\">$mp3</a></td><td>`du -h $mp3_srcdir/$found_artists/$mp3 | awk '{ print $1 }'`</td><td><a href=\"http://${local_player_ip}${playerfile_dir}/playsong.shtml\?url=http://${mp3_server_name}${mp3_http_loc}/$found_artists/$mp3\&user=$my_user_name\&passwd=$user_passwd\">play ($local_player_ip)</a></td></tr>\";
     done;
    echo \"</table>\";
    done;
@@ -90,7 +90,7 @@ if [ ! -z \"$QUERY_STRING\" ]; then
     if [ ! -z \"`echo $single_song | grep $song`\" ]; then
      dir=`echo $single_song | awk -F/ '{ print $(NF-1) }'`
      s_name=`echo $single_song | awk -F/ '{ print $(NF) }'`
-     echo \"<tr><td><a href=\"$mp3_http_loc/$dir/$s_name\">$s_name</a></td><td><a href=\"http://${local_player_ip}${playerfile_dir}/playsong.shtml\?url=http://${mp3_server_name}${mp3_http_loc}/$dir/$s_name\&user=$my_user_name\&passwd=$user_passwd\">play ($local_player_ip)</a></td></tr>\";
+     echo \"<tr><td><a href=\"$mp3_http_loc/$dir/$s_name\">$s_name</a></td><td>`du -h $mp3_srcdir/$dir/$s_name | awk '{ print $1 }'`</td><td><a href=\"http://${local_player_ip}${playerfile_dir}/playsong.shtml\?url=http://${mp3_server_name}${mp3_http_loc}/$dir/$s_name\&user=$my_user_name\&passwd=$user_passwd\">play ($local_player_ip)</a></td></tr>\";
     fi;
    done;
    echo \"</table>\";
@@ -105,7 +105,7 @@ if [ ! -z \"$QUERY_STRING\" ]; then
    for dir_song in $mp3_srcdir/$search_path/*; do
     mp3=`basename $dir_song`;
     if [ ! -z \"`echo $mp3 | grep $song`\" ]; then
-     echo \"<tr><td><a href=\"$mp3_http_loc/$search_path/$mp3\">$mp3</a></td><td><a href=\"http://${local_player_ip}${playerfile_dir}/playsong.shtml\?url=http://${mp3_server_name}${mp3_http_loc}/$search_path/$mp3\&user=$my_user_name\&passwd=$user_passwd\">play ($local_player_ip)</a></td></tr>\";
+     echo \"<tr><td><a href=\"$mp3_http_loc/$search_path/$mp3\">$mp3</a></td><td>`du -h $mp3_srcdir/$search_path/$mp3 | awk '{ print $1 }'`</td><td><a href=\"http://${local_player_ip}${playerfile_dir}/playsong.shtml\?url=http://${mp3_server_name}${mp3_http_loc}/$search_path/$mp3\&user=$my_user_name\&passwd=$user_passwd\">play ($local_player_ip)</a></td></tr>\";
     fi ;
    done;
   done;