Changeset 7661

Timestamp:

Jul 10, 2008, 2:59:33 AM (13 years ago)

Author:

ebihara

Message:

キャッシュパスの判定処理を OpenPNE_Img_Cache にまとめた

Location:

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

Files:

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

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

@@ -85 +85 @@
         $this->generator->setImageSize($width, $height);
 
-        if (!empty($vars['filename'])) {
-            $this->setFilename($vars['filename']);
-        }
-
         if (!empty($vars['f'])) {
             $this->generator->setOutputFormat($vars['f']);
@@ -94 +90 @@
             $this->generator->setOutputFormat();
         }
+
+        if (!empty($vars['filename'])) {
+            $this->setFilename($vars['filename']);
+        }
     }
 
@@ -107 +107 @@
             $this->filename = $filename;
 
-            $pieces = explode('.', $filename);
-            $this->generator->setSourceFormat(OpenPNE_Img::check_format(array_pop($pieces)));
+            $this->generator->setFilename($filename);
         }
     }
@@ -123 +122 @@
         }
 
-        $this->generator->setCacheFilename($this->filename);
         if ($this->generator->isCacheReadable()) {
             return true;

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

@@ -26 +26 @@
 
     /**
+     * @var string
+     * @access protected
+     */
+    var $suffix;
+
+    /**
      * constructor
      *
@@ -36 +42 @@
             $this->cache_dir = $options['cache_dir'];
         }
+
+        if (!empty($options['suffix'])) {
+            $this->suffix = $options['suffix'];
+        }
     }
 
@@ -43 +53 @@
     }
 
-    function setCacheFullpath($filename)
+    function setCacheFullpath($filename, $format, $width = 0, $height = 0)
     {
-        $this->cache_fullpath = $filename;
+        $path = OpenPNE_Img_Cache::getCachePath($filename, $width, $height, $format, $this->suffix);
+        $this->cache_fullpath = $this->getCacheDir() . '/' . $path;
     }
 

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

@@ -159 +159 @@
 
     /**
-     * キャッシュ画像のファイルパスを設定する
+     * 画像のファイルパスを設定する
      *
      * @param string $filename
      */
-    function setCacheFileName($filename)
-    {
-        $path = OpenPNE_Img::get_cache_path($filename, $this->width, $this->height, $this->getOutputFormat());
-        $this->cache->setCacheFullpath($this->cache->getCacheDir() . '/' . $path);
+    function setFileName($filename)
+    {
+        $ext = array_pop(explode('.', $filename));
+        $format = OpenPNE_Img::check_format($ext);
+        $this->setSourceFormat($format);
+
+        $this->cache->setCacheFullpath($filename, $this->getOutputFormat(), $this->width, $this->height);
     }
 
@@ -176 +179 @@
     function setOutputFormat($output_format = '')
     {
-        if ($output_format) {
-            $this->output_format = $output_format;
-        } else {
-            $this->output_format = $this->getSourceFormat();
-        }
+        $this->output_format = $output_format;
     }
 

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

@@ -15 +15 @@
 class OpenPNE_Img_Generator_ImageMagick extends OpenPNE_Img_Generator
 {
-    var $raw_cache_fullpath;
+    var $raw_cache;
+
+    function OpenPNE_Img_Generator_ImageMagick($options = array())
+    {
+        require_once 'OpenPNE/Img/Cache.php';
+
+        parent::OpenPNE_Img_Generator($options);
+
+        $options['suffix'] = '_raw';
+        $this->raw_cache =& new OpenPNE_Img_Cache($options);
+    }
 
     function getCacheRawImage($filename)
     {
         $this->setRawCacheFullPath($filename);
-        $raw_cache_fullpath = $this->getRawCacheFullPath();
+        $raw_cache_fullpath = $this->raw_cache->getCacheFullpath();
 
         if (is_readable($raw_cache_fullpath)) {
@@ -38 +48 @@
     function setRawCacheFullPath($filename)
     {
-        $prefix = OPENPNE_IMG_CACHE_PREFIX;
-
         $format = $this->getSourceFormat();
-        $file = $prefix . str_replace('.', '_', $filename) . '.' . $format;
-        $path = sprintf('%s/w_h_raw/%s', $format, $file);
-
-        $this->raw_cache_fullpath = $this->cache->getCacheDir() . '/' . $path;
-    }
-
-    function getRawCacheFullPath()
-    {
-        return $this->raw_cache_fullpath;
+        $this->raw_cache->setCacheFullpath($filename, $format);
     }
 
     function createRawCache($raw_img)
     {
-        $raw_cache_fullpath = $this->getRawCacheFullPath();
+        $raw_cache_fullpath = $this->raw_cache->getCacheFullPath();
         $subdir = dirname($raw_cache_fullpath);
         if (!is_dir($subdir)) {
@@ -60 +60 @@
         }
 
-        if ($this->output_format == 'png') {
+        if ($this->getOutputFormat() == 'png') {
             touch($raw_cache_fullpath);
             $output_gdimg = imagecreatefromstring($raw_img);
@@ -89 +89 @@
         $h = intval($this->height);
         $f = escapeshellcmd($this->getOutputFormat());
-        $path = realpath($this->getRawCacheFullPath());
+        $path = realpath($this->raw_cache->getCacheFullPath());
 
         $command = sprintf('%s %s %dx%d %s %s:-', IMGMAGICK_APP, $opt, $w, $h, $path, $f);