Changeset 3858

Timestamp:

04/24/07 09:32:48 (6 years ago)

Author:

francois

Message:

sfMediaLibraryPlugin: Use sfThumbnailPlugin when available

Files:

• plugins/sfMediaLibraryPlugin/README (modified) (3 diffs)
• plugins/sfMediaLibraryPlugin/modules/sfMediaLibrary/lib/BasesfMediaLibraryActions.class.php (modified) (9 diffs)
• plugins/sfMediaLibraryPlugin/modules/sfMediaLibrary/templates/renameSuccess.php (modified) (1 diff)

plugins/sfMediaLibraryPlugin/README

@@ -49 +49 @@
-{{{
-<?php echo image_tag('/uploads/assets/path_to_asset.suffix') ?>
+}}}
+
+== Interface with the `sfThumbnailPlugin` ==
+
+If the [wiki:sfThumbnailPlugin] is installed in your project, `sfMediaLibrary` will automatically use it to create thumbnail images of the images you upload. To deactivate this behavior, change the following setting in the `app.yml`:
+
+{{{
+all:
+  sfMediaLibrary:
+    use_thumbnails: true
+}}}
+
+By default, thumbnail images are stored under a `thumbnail/` subdirectory of the image directory. You can change the name of this directory through another setting of the `app.yml`:
+
+{{{
+all:
+  sfMediaLibrary:
+    thumbnails_dir: thumbnail
-}}}
-
@@ -108 +126 @@
-
- * Add screenshots to the wiki description
- * Use [wiki:sfThumbnailPlugin] when available
- * Improve CSS and design
- * Improve compatibility
@@ -119 +136 @@
-=== Trunk ===
-
+ * francois: Use [wiki:sfThumbnailPlugin] when available
- * Jose.Luis.Di.Biase: Added Spanish translation
-

plugins/sfMediaLibraryPlugin/modules/sfMediaLibrary/lib/BasesfMediaLibraryActions.class.php

@@ -18 +18 @@
-class BasesfMediaLibraryActions extends sfActions
-{
+  public function preExecute()
+  {
+    $this->use_thumbnails = false;
+    if(sfConfig::get('app_sfMediaLibrary_use_thumbnails', true) && class_exists('sfThumbnail'))
+    {
+      $this->use_thumbnails = true;
+      $this->thumbnails_dir = sfConfig::get('app_sfMediaLibrary_thumbnails_dir', 'thumbnail');
+    } 
+  }
+  
-  public function executeIndex()
-  {
@@ -28 +38 @@
-    $this->forward404Unless(is_dir($this->absCurrentDir));
-
-
+
+
+
+
+
+
+
+
+
+
+
-    $files = sfFinder::type('file')->maxdepth(0)->prune('.*')->discard('.*')->relative()->in($this->absCurrentDir);
-
-    sort($dirs);
-    sort($files);
-
-    $this->dirs = $dirs;
-
-    // compute some stats for each file
-    $infos = array();
-    foreach ($files as $file)
-    {
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-    }
-    $this->files = $infos;
@@ -72 +80 @@
-  public function executeRename()
-  {
-_path
-_path
+Dir
+Dir
-    $type = $this->getRequestParameter('type');
-    $this->count = $this->getRequestParameter('count');
-
-
-
+
+
+
+
-
-    $name = $this->getRequestParameter('name');
@@ -85 +94 @@
-    {
-      $new_name = $this->sanitizeDir($new_name);
-this->abs_current_path
+absCurrentDir
-    }
-    else
-    {
-      $new_name = $this->sanitizeFile($new_name);
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    $this->info = array();
-this->abs_current_path
+absCurrentDir
-    {
-      $this->name = $new_name;
-    }
-this->abs_current_path
+absCurrentDir
-    {
-      $this->name = $new_name;
-
+info = $this->
-    }
-    else
-    {
-      $this->name = $name;
-
-
+
+
+
-    $this->type = $type;
-  }
@@ -115 +131 @@
-  protected function getInfo($filename)
-  {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-
@@ -131 +172 @@
-    $fileName = $this->sanitizeFile($this->getRequest()->getFileName('file'));
-
+    if($this->use_thumbnails)
+    {
+      if(!is_dir($absCurrentDir.'/'.$this->thumbnails_dir))
+      {
+        // If the thumbnails directory doesn't exist, create it now
+        $old = umask(0000);
+        @mkdir($absCurrentDir.'/'.$this->thumbnails_dir, 0777);
+        umask($old);
+      }
+      $thumbnail = new sfThumbnail(64, 64);
+      $thumbnail->loadFile($this->getRequest()->getFilePath('file'));
+      $thumbnail->save($absCurrentDir.'/'.$this->thumbnails_dir.'/'.$fileName);
+    }
-    $this->getRequest()->moveFile('file', $absCurrentDir.'/'.$fileName);
-
@@ -145 +199 @@
-
-    unlink($absCurrentFile);
+    
+    if($this->use_thumbnails)
+    {
+      $absThumbnailFile = sfConfig::get('sf_upload_dir').'/assets/'.$currentDir.'/'.$this->thumbnails_dir.'/'.$currentFile;
+      if(is_readable($absThumbnailFile))
+      {
+        unlink($absThumbnailFile);
+      }
+    }
-
-    $this->redirect('sfMediaLibrary/index?dir='.$this->getRequestParameter('current_path'));
@@ -157 +220 @@
-    $old = umask(0000);
-    @mkdir($absCurrentDir, 0777);
+    if($this->use_thumbnails)
+    {
+      @mkdir($absCurrentDir.'/'.$this->thumbnails_dir, 0777);
+    }
-    umask($old);
-
@@ -169 +236 @@
-    $this->forward404Unless(is_dir($absCurrentDir));
-
+    if($this->use_thumbnails && is_readable($absCurrentDir.'/'.$this->thumbnails_dir))
+    {
+      rmdir($absCurrentDir.'/'.$this->thumbnails_dir);
+    }
+    
-    rmdir($absCurrentDir);
-

plugins/sfMediaLibraryPlugin/modules/sfMediaLibrary/templates/renameSuccess.php

@@ -3 +3 @@
-<?php include_partial('sfMediaLibrary/block', array(
-  'name' => $name,
-_path
-_abs_current_path
+Dir
+AbsCurrentDir
-  'type' => $type,
-  'info' => $info,