Changeset 5675

Timestamp:

10/25/07 03:11:28 (6 years ago)

Author:

Jonathan.Todd

Message:

sfThumbnailCache: Added cache lifetime, made cache mtime aware

Files:

• plugins/sfThumbnailCachePlugin/config/app.yml.dist (modified) (1 diff)
• plugins/sfThumbnailCachePlugin/lib/sfThumbnailCache.class.php (modified) (8 diffs)

plugins/sfThumbnailCachePlugin/config/app.yml.dist

@@ -1 +1 @@
-all:
-
-
+
+
+
+

plugins/sfThumbnailCachePlugin/lib/sfThumbnailCache.class.php

@@ -100 +100 @@
-  function __construct($file_master = null, $width = null, $height = null,
-                       $scale = true, $inflate = true, $type = null,
-
+, $mtime = null, $create_thumb = true
-  {
-    if(!$file_master)
@@ -125 +125 @@
-    $this->cache_url_path = '/uploads/sfThumbnailCache';
-    
-
-
+
+
+
+
+
+
+
+
+
+
-  }
-  
@@ -134 +142 @@
-  public static function getInstance($file_master = null, $width = null, $height = null,
-                                     $scale = true, $inflate = true, $type = null,
-
+mtime = null, $
-  {
-    static $sfThumbnailCache;
@@ -142 +150 @@
-      // Get instance
-      $className = 'sfThumbnailCache';
-
+mtime, $
-    }
-
@@ -153 +161 @@
-  public static function getNewInstance($file_master = null, $width = null, $height = null,
-                                     $scale = true, $inflate = true, $type = null,
-
+mtime = null, $
-  {
-    // Get instance
-    $className = 'sfThumbnailCache';
-
+mtime, $
-    return $sfThumbnailCache;
-  }
-  
+  /**
+   * Instantiates and returns a new sfThumbnailCache object without trying to create thumbnail
+   */
+  public static function getNewInstanceNoMaster($file_thumb = null,$width = null, $height = null,
+                                     $scale = true, $inflate = true, $type = null, $mtime = null)
+  {
+    // Get instance
+    $className = 'sfThumbnailCache';
+    $sfThumbnailCache = new $className('none', $width, $height, $scale, $inflate, $type, $file_thumb, $mtime, false); 
+    return $sfThumbnailCache;
+  }
-  
-  public function exists()
@@ -217 +236 @@
-  
-  /**
+   * Is the cached file still valid based on mtime and cache time limit
+   * 
+   * If mtime is set and is older or equal to cached file then cache is valid
+   * If mtime is not set and cache life is less than cache time limit then cache is valid
+   */
+  public function cacheIsValid()
+  {
+
+    if(!$this->exists())
+      return false;
+
+    // Use mtime if it's set
+    if($this->mtime)
+    {
+      // File requested is newer than cache
+      if($this->mtime > $this->getMTime())
+        return false;
+
+      // File requested is older or same as cache
+      return true ; 
+    }
+
+    // Use cache life time
+    $cache_life = time() - $this->getMTime();
+    $valid_cache_life = sfConfig::get('app_thumbnail_cache_cache_file_life');
+    return ($cache_life > $valid_cache_life) ? false : true;
+
+  }
+
+  public function getMTime()
+  {
+    return filemtime($this->getPath());
+  }
+  
+  /**
-   * Get name of thumbnail file
-   */
@@ -232 +286 @@
-  private function createThumbnail()
-  {
-    
-    // Do we already have thumb of the given size
-    if($this->exists())
-      return $this->getPath();
-
-    // Create thumb dir if it doesn't exist
@@ -242 +292 @@
-    // We need to create a thumbnail
-    $thumb = new sfThumbnail($this->width, $this->height, $this->scale, $this->inflate, $this->quality);
-image_magick_convert'), 'identify' => sfConfig::get('app
+thumbnail_cache_image_magick_convert'), 'identify' => sfConfig::get('app_thumbnail_cache
-    $thumb->loadFile($this->file_master);
-    $thumb->save($this->getPath(), $this->type);
-    $thumb->freeAll();
+    
+    // Set the access and modification to match S3 time
+    if($this->mtime)
+    {
+      if(!touch($this->getPath(),$this->mtime))
+        throw new Exception("Could not set last modification time");
+    }
-    
-    return $this->getPath();