Changeset 6857

Timestamp:

Apr 30, 2008, 4:09:16 AM (11 years ago)

Author:

ebihara

Message:

OpenPNE_Img::create_cache_subdir()をOpenPNE_Img_Generator::createCacheSubdir()として引き上げ

Location:

OpenPNE/branches/work/ebihara/prj_renew_OpenPNE_Img/webapp/lib/OpenPNE

Files:

• Img.php (modified) (2 diffs)
• Img/Generator.php (modified) (3 diffs)

OpenPNE/branches/work/ebihara/prj_renew_OpenPNE_Img/webapp/lib/OpenPNE/Img.php

@@ -258 +258 @@
     function create_cache($output_gdimg)
     {
-        $this->create_cache_subdir($this->cache_fullpath, $this->cache_dir);
-        $this->generator->createCache($this->cache_fullpath, $output_gdimg);
+        $this->generator->createCache($this->cache_fullpath, $this->cache_dir, $output_gdimg);
     }
 
@@ -267 +266 @@
     function create_cache_from_raw_img()
     {
-        $this->create_cache_subdir($this->cache_fullpath, $this->cache_dir);
-        $this->generator->createCacheFromRawImage($this->cache_fullpath, $this->raw_img);
-    }
-
-    /**
-     * キャッシュ用サブディレクトリの作成
-     * @access protected
-     */
-    function create_cache_subdir($cache_fullpath, $cache_dir)
-    {
-        $subdir = dirname($cache_fullpath);
-        if (!is_dir($subdir)) {
-            // mkdir recursive
-            $_dir = $cache_dir;
-            if (!is_dir($_dir) && !mkdir($_dir)) {
-                return false;
-            }
-            $relative_path = substr($subdir, strlen($cache_dir)+1);
-            $parts = explode('/', $relative_path);
-            foreach ($parts as $part) {
-                $_dir .=  '/' . $part;
-                if (!is_dir($_dir) && !mkdir($_dir)) {
-                    return false;
-                }
-            }
-        }
+        $this->generator->createCacheFromRawImage($this->cache_fullpath, $this->cache_dir, $this->raw_img);
     }
 

OpenPNE/branches/work/ebihara/prj_renew_OpenPNE_Img/webapp/lib/OpenPNE/Img/Generator.php

@@ -97 +97 @@
     }
 
-    function createCacheFromRawImage($cache_fullpath, $raw_img)
+    function createCacheFromRawImage($cache_fullpath, $cache_dir, $raw_img)
     {
+        $this->createCacheSubdir($cache_fullpath, $cache_dir);
+
         if ($this->getOutputFormat() == 'png') {
             touch($cache_fullpath);
@@ -110 +112 @@
     }
 
-    function createCache($cache_fullpath, $output_gdimg)
+    function createCache($cache_fullpath, $cache_dir, $output_gdimg)
     {
+        $this->createCacheSubdir($cache_fullpath, $cache_dir);
+
         touch($cache_fullpath);
         switch ($this->getOutputFormat()) {
@@ -125 +129 @@
             imagepng($output_gdimg, $cache_fullpath);
             break;
+        }
+    }
+
+    function createCacheSubdir($cache_fullpath, $cache_dir)
+    {
+        $subdir = dirname($cache_fullpath);
+        if (!is_dir($subdir)) {
+            // mkdir recursive
+            $_dir = $cache_dir;
+            if (!is_dir($_dir) && !mkdir($_dir)) {
+                return false;
+            }
+            $relative_path = substr($subdir, strlen($cache_dir)+1);
+            $parts = explode('/', $relative_path);
+            foreach ($parts as $part) {
+                $_dir .=  '/' . $part;
+                if (!is_dir($_dir) && !mkdir($_dir)) {
+                    return false;
+                }
+            }
         }
     }