changeset 953:3b18afe14e46

Message consistency.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 28 Nov 2014 08:57:41 +0200
parents ef0d8615ec06
children 24f155a2e501
files faptool.php
diffstat 1 files changed, 8 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/faptool.php	Fri Nov 28 08:50:50 2014 +0200
+++ b/faptool.php	Fri Nov 28 08:57:41 2014 +0200
@@ -142,7 +142,7 @@
 function wtUnpackArchiveTo($atype, $filename, $path)
 {
   // Check file type before doing anything
-  echo "Preparing to unpack archive file '".$filename."' ...\n";
+  echo "INFO: Preparing to unpack archive file '".$filename."' ...\n";
   switch ($atype)
   {
     case "LHA":
@@ -171,7 +171,7 @@
 
   if (!is_dir($path) || chdir($path) === false)
   {
-    echo "Failed to chdir to '".$path."', can't unpack archive.\n";
+    echo "ERROR: Failed to chdir to '".$path."', can't unpack archive.\n";
     return FALSE;
   }
 
@@ -220,7 +220,7 @@
   }
   else
   if ($mode != "upd")
-    die("Unsupported previews mode ".$mode."\n");
+    die("ERROR: Unsupported previews mode ".$mode."\n");
 
   // Check validity of previews
   if ($pdata["valid"])
@@ -255,7 +255,7 @@
       // Entry is an archive file ..
       $path = stMakePath(FALSE, FALSE, array($setEntryPath, "UNPACKS", $filename));
 
-      echo "Attempting to scan archive file '".$filename."' ...\n";
+      echo "INFO: Entry file is an ".$efile["filetype"]." archive, scanning '".$filename."' ...\n";
 
       if (wtUnpackArchiveTo($efile["filetype"], $filename, $path) === false)
         return FALSE;
@@ -333,12 +333,12 @@
 //
 function wtExec($exe, $args, $expect = 0)
 {
-  echo "@@EXEC: ".$exe." ".$args."\n";
+  echo "EXEC: ".$exe." ".$args."\n";
   exec(escapeshellcmd($exe)." ".$args, $output, $code);
   if ($code !== $expect)
   {
     echo
-      "Error executing ".$exe.": ".$code."\n".$args."\n".
+      "ERROR: Executing ".$exe.": ".$code."\n".$args."\n".
       "------------------------------------------------\n".
       implode("\n", $output).
       "------------------------------------------------\n";
@@ -381,7 +381,7 @@
 {
   if (!file_exists($path))
   {
-    echo " - Creating ".$path."\n";
+    echo "INFO: Creating ".$path."\n";
     if (mkdir($path, $perm, TRUE) === false)
       die("Could not create directory '".$path."'\n");
   }
@@ -503,6 +503,7 @@
     //
     // Initialize the data directories etc
     //
+    echo "INFO: Checking for missing directories ...\n";
     wtInitializeDirs();
     break;