X-Git-Url: https://hackdaworld.org/gitweb/?p=my-code%2Fmp3db.git;a=blobdiff_plain;f=main.shtml;fp=main.shtml;h=43c0c170deb8d2051242994974906716ed646279;hp=41feac53b331550014447d93da63d44a3f110f19;hb=bd148eec81f91061deb5895223b3da80a62b8830;hpb=83c9fed9313ceae047cd7279a181691ce01d4bd4

diff --git a/main.shtml b/main.shtml
index 41feac5..43c0c17 100644
--- 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;