Mercurial > hg > fapweb

changeset 987:06e45615b46b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Moar work.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 29 Nov 2014 18:08:34 +0200
parents a8ed8295fcd2
children 7d7bd913649c
files faptool.php
diffstat 1 files changed, 12 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/faptool.php	Sat Nov 29 18:00:03 2014 +0200
+++ b/faptool.php	Sat Nov 29 18:08:34 2014 +0200
@@ -405,7 +405,7 @@
     if (strlen($fext) >= $len)
       $fext = "";
 
-    return substr($filename, 0, $len - strlen($fext)).$fext;
+    return substr($filename, 0, $len - strlen($fext) - 1).$fext;
   }
   else
     return $filename;
@@ -422,17 +422,24 @@
   while (($dentry = readdir($dir)) !== false)
   {
     $fname = $path."/".$dentry;
+    $nname = $path."/".wtCropFilename($dentry, $len);
     if ($dentry != "." && $dentry != "..")
     {
       if (is_dir($fname))
       {
         wtCropFilenamesRec($fname, $len);
-        //rename();
+        if (rename($fname, $nname) === false)
+        {
+          echo "ERROR: Could not rename DIR '".$fname."' -> '".$nname."'.\n";
+          return FALSE;
+        }
       }
       else
-      if (is_file($fname))
-        echo "X: ".$fname."\n";
-        //rename();
+      if (is_file($fname) && rename($fname, $nname) === false)
+      {
+        echo "ERROR: Could not rename FILE '".$fname."' -> '".$nname."'.\n";
+        return FALSE;
+      }
     }
   }
   closedir($dir);