add insertDirectory -- filename helper

diff --git a/ipf/utils.php b/ipf/utils.php
index 9eec1ff972e7749fe391a57578c848144c351ea7..e0c08269bcd874f052d2951a589479b22c492e83 100644 (file)
--- a/ipf/utils.php
+++ b/ipf/utils.php
@@ -142,6 +142,15 @@ class IPF_Utils
         return '';
     }
 
+    public static function insertDirectory($path, $directory)
+    {
+        $parts = pathinfo($path);
+        if ($parts['dirname'] && $parts['dirname'] !== '.')
+            return $parts['dirname'] . DIRECTORY_SEPARATOR . $directory . DIRECTORY_SEPARATOR . $parts['basename'];
+        else
+            return $directory . DIRECTORY_SEPARATOR . $parts['basename'];
+    }
+
     public static function makeDirectories($path, $mode=0777)
     {
         if (!$path)

diff --git a/t/UtilsTest.php b/t/UtilsTest.php
new file mode 100644 (file)
index 0000000..a91c4ff
--- /dev/null
+++ b/t/UtilsTest.php
@@ -0,0 +1,11 @@
+<?php
+
+class Utils_Test extends PHPUnit_Framework_TestCase
+{
+    public function testInsertDirectory()
+    {
+        $this->assertEquals('goods/thumbs/image.gif', IPF_Utils::insertDirectory('goods/image.gif', 'thumbs'));
+        $this->assertEquals('thumbs/image.gif', IPF_Utils::insertDirectory('image.gif', 'thumbs'));
+    }
+}
+