Changeset 5756

Timestamp:

10/30/07 06:17:27 (6 years ago)

Author:

Jonathan.Todd

Message:

sfThumbnailCache: Added static functions and helper functions to DRY code

Files:

• plugins/sfThumbnailCachePlugin/lib/helper/sfThumbnailCacheHelper.php (modified) (1 diff)
• plugins/sfThumbnailCachePlugin/lib/sfThumbnailCache.class.php (modified) (5 diffs)
• plugins/sfThumbnailCachePlugin/modules/sfThumbnailCache/actions/actions.class.php (modified) (1 diff)

plugins/sfThumbnailCachePlugin/lib/helper/sfThumbnailCacheHelper.php

@@ -1 +1 @@
-<?php
-
+
+
+
+
+
+
+
+
+
+
+
-{
-  $w = $w ? $w : 0;
-  $h = $h ? $h : 0;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  return "<img src='$thumb_url' />";
-}
+
+/**
+ * This function takes a s3fs id and returns the path to a thumbnail of 
+ * the specified size. The thumbnail is automatically generated. If it doesn't
+ * exist the alternate is used.
+ * 
+ * s3fs id's are of the form: 'mtime_MT_/bucket/key' like:
+ * "1193674271_MT_/adventex/c21hs/employee_cma_photos/3603.jpg"
+ * 
+ */
+function sf_thumbnail_s3fs_thumb_path($photo,$w = null,$h = null,$options = null)
+{
+  $w = $w ? $w : 0;
+  $h = $h ? $h : 0;
+  
+  $alt_img = '';
+  if(isset($options['alt_image']))
+    $alt_img = $options['alt_image'];
+        
+  $file = sfAmazonS3File::sfAmazonS3FilePathToArray($photo);
+  $bucket = $file['bucket'];
+  $key = $file['key'];
+  $mtime = $file['mtime'];
+  $file_thumb = '/sfAmazonS3FS/'.$bucket.'/'.$key;
+  $path = sfThumbnailCache::sf_thumbnail_s3_thumbnail($bucket,$key,$file_thumb,$w,$h,$mtime);
+        
+  return $path;
+}
+

plugins/sfThumbnailCachePlugin/lib/sfThumbnailCache.class.php

@@ -181 +181 @@
-  }
-  
+  /**
+   * Does cached thumbnail exist?
+   */
-  public function exists()
-  {
@@ -186 +189 @@
-  }
-
+  /**
+   * Delete thumbnail
+   */
-  public function delete()
-  {
@@ -222 +228 @@
-   * Get thumbnail width
-   */
- 
- 
+
+
-     return $this->width;
-   }
-   
- 
- 
- 
-  
-  
+
+
+
+
+
-      return $this->height;
-    }
@@ -265 +271 @@
-
-  }
-
+
+
+
+
-  public function getCacheMTime()
-  {
@@ -365 +374 @@
-    return substr($f, 0, strrpos($f, '.'));
-  }
+  
+  /**
+   * This function takes a s3fs bucket and key and returns thumbnail path.
+   * If thumb doesn't already exist master is pulled from s3.
+   * 
+   * s3fs id's are of the form: 'mtime_MT_/bucket/key' like:
+   * "1193674271_MT_/adventex/c21hs/employee_cma_photos/3603.jpg"
+   * 
+   */
+  public static function sf_thumbnail_s3_thumbnail($bucket,$key,$file_thumb,$w,$h,$mtime)
+  {
+    $thumb = sfThumbnailCache::getNewInstanceNoMaster($file_thumb,$w,$h,true,true,null,$mtime);
+    // Valid thumb exists
+    if($thumb->cacheIsValid())
+    {
+      return $thumb->getPath();
+    }
+    // Valid thumb doesn't exist
+    else
+    {
+      // Try to get master file   
+      $file = sfAmazonS3File::getNewInstance($key,$bucket,$mtime);      
+
+      // Master exists, create thumbnail
+      if($file->fileExists())
+      {
+        $file_master = $file->getPath();
+        $master_mtime = $file->fileGetMTime();
+        //echo "Mtime: $master_mtime"."<br><br>".print_r($file->s3GetFileMetaData(),1);
+        // Create thumb from master
+        $thumb = sfThumbnailCache::getNewInstance($file_master,$w,$h,true,true,null,
+          $file_thumb,$master_mtime);
+
+        return $thumb->getPath();
+      }
+
+      // Master doesn't exists
+      return false;
+    } 
+  }
+  
+  /**
+   * This function takes a file and returns a path to it's thumb
+   * 
+   */
+  public static function sf_thumbnail_cache_path($photo,$w = null,$h = null,$options = null)
+  {
+    $w = $w ? $w : 0;
+    $h = $h ? $h : 0;
+
+    $thumb = sfThumbnailCache::getNewInstance($photo,$w,$h);
+
+    return $thumb->getPath();
+  }
+
+  
-}
-

plugins/sfThumbnailCachePlugin/modules/sfThumbnailCache/actions/actions.class.php

@@ -55 +55 @@
-    $w = $this->getRequestParameter('w');
-    $h = $this->getRequestParameter('h');
-
+$alt_image = $this->getRequestParameter('alt_image');
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return $this->dispatch($path,"image/jpeg",$mtime);
-  }
-  
-  
-  /**
-   * Returns path to thumbnail or false if thumbnail can't be created
-   */
-  public function getS3FSThumbnail($bucket,$key,$file_thumb,$w,$h,$mtime)
-  {
-    $thumb = sfThumbnailCache::getNewInstanceNoMaster($file_thumb,$w,$h,true,true,null,$mtime);
-    // Valid thumb exists
-    if($thumb->cacheIsValid())
-    {
-      return $thumb->getPath();
-    }
-    // Valid thumb doesn't exist
-    else
-    {
-      // Try to get master file   
-      $file = sfAmazonS3File::getNewInstance($key,$bucket,$mtime);      
-      
-      // Master exists, create thumbnail
-      if($file->fileExists())
-      {
-        $file_master = $file->getPath();
-        $master_mtime = $file->fileGetMTime();
-        //echo "Mtime: $master_mtime"."<br><br>".print_r($file->s3GetFileMetaData(),1);
-        // Create thumb from master
-        $thumb = sfThumbnailCache::getNewInstance($file_master,$w,$h,true,true,null,
-          $file_thumb,$master_mtime);
-        
-        return $thumb->getPath();
-      }
-      
-      // Master doesn't exists
-      return false;
-    } 
-  }
-}