From e90f51519201c18b976f4aa4a35b827d2ac8436e Mon Sep 17 00:00:00 2001
From: tomash <tomash@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Mon, 5 Jun 2006 13:35:01 +0000
Subject: [PATCH] #1693 bash script bug fixed for directory names containing
 spaces   and minor changes

---
 livesupport/src/modules/storageAdmin/bin/import.sh  | 6 +++---
 livesupport/src/modules/storageAdmin/var/import.php | 9 ++++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/livesupport/src/modules/storageAdmin/bin/import.sh b/livesupport/src/modules/storageAdmin/bin/import.sh
index 19ba3c7b3..6a6d420c3 100755
--- a/livesupport/src/modules/storageAdmin/bin/import.sh
+++ b/livesupport/src/modules/storageAdmin/bin/import.sh
@@ -74,16 +74,16 @@ while true; do
     case "$1" in
         -d|--directory)
             srcdir=$2;
-            test -d $srcdir || { echo "Directory not found ($srcdir)."; exit 1;  }
+            test -d "$srcdir" || { echo "Directory not found ($srcdir)."; exit 1;  }
             srcabsdir=`cd "$srcdir"; pwd`
             shift; shift;;
         -l|--list)
             filelist=$2;
-            test -f $filelist || { echo "File not found ($filelist)."; exit 1;  }
+            test -f "$filelist" || { echo "File not found ($filelist)."; exit 1;  }
             filelistbasename=`basename "$filelist"`
             filelistdir=`dirname "$filelist"`
             filelistabsdir=`cd "$filelistdir"; pwd`
-            filelistpathname=$filelistabsdir/$filelistbasename
+            filelistpathname="$filelistabsdir/$filelistbasename"
             shift; shift;;
         -h|--help)
             printUsage;
diff --git a/livesupport/src/modules/storageAdmin/var/import.php b/livesupport/src/modules/storageAdmin/var/import.php
index 4bb17cc76..23a62e650 100644
--- a/livesupport/src/modules/storageAdmin/var/import.php
+++ b/livesupport/src/modules/storageAdmin/var/import.php
@@ -51,9 +51,11 @@ $testonly = (isset($argv[1]) && $argv[1] == '-n');
 
 $errors=0;
 $filecount=0;
-function _err($r, $fn){
+function _err($r, $fn, $txt=''){
     global $errors;
-    echo "ERROR\n ".$r->getMessage()." ".$r->getUserInfo()."\n";
+    if(PEAR::isError($r)) $msg = $r->getMessage()." ".$r->getUserInfo();
+    else $msg = $txt;
+    echo "ERROR\n $msg\n";
     $errors++;
 }
 
@@ -137,7 +139,8 @@ while($filename = fgets($stdin, 2048)){
     //$getID3 = new getID3;
     //$infoFromFile = $getID3->analyze("$filename");
     if(PEAR::isError($infoFromFile)){ _err($infoFromFile, $filename); continue; }
-    if(!$infoFromFile['fileformat']){ echo "???\n"; continue; }
+    if(isset($infoFromFile['error'])){ _err(NULL, $filename, $infoFromFile['error']); continue; }
+    #if(!$infoFromFile['fileformat']){ echo "???\n"; continue; }
     if(!$infoFromFile['bitrate']){ echo "not audio?\n"; continue; }
     
     $mdata = array();