issue43, fixed on-the-fly thumbnail generation

git-svn-id: file:///var/lib/svn/phpfspot/trunk@207 fa6a889d-dae6-447d-9e79-4ba9a3039384

diff --git a/phpfspot.class.php b/phpfspot.class.php
index 579054d6ebd70a18caba3abd46612723c6e5474f..7d58ffed9a38d558ea2f3fa9bd05a9e38dd8387d 100644 (file)
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -191,6 +191,12 @@ class PHPFSPOT {
       }
 
       $details = $this->get_photo_details($photo);
+
+      if(!$details) {
+         print "error";
+         return;
+      }
+
       $orig_path = $this->translate_path($details['directory_path']) ."/". $details['name'];
       $thumb_path = $this->cfg->base_path ."/thumbs/". $this->cfg->photo_width ."_". $this->getMD5($photo);
 
@@ -205,6 +211,7 @@ class PHPFSPOT {
       /* If the thumbnail doesn't exist yet, try to create it */
       if(!file_exists($thumb_path)) {
          $this->gen_thumb($photo, true);
+         $thumb_path = $this->cfg->base_path ."/thumbs/". $this->cfg->photo_width ."_". $this->getMD5($photo);
       }
 
       $meta = $this->get_meta_informations($orig_path);
@@ -254,6 +261,7 @@ class PHPFSPOT {
       }
       else {
          $this->_warning("Can't open file ". $thumb_path ."\n");
+         return;
       }
 
       if($previous_img) {

diff --git a/phpfspot_img.php b/phpfspot_img.php
index 052a45f4099c686bdc0cd561cf482ce6ee8ded90..de677e558c56fe3ae76cbfcadd9d266520f17f11 100644 (file)
--- a/phpfspot_img.php
+++ b/phpfspot_img.php
@@ -28,23 +28,29 @@ class PHPFSPOT_IMG {
          return;
       }
 
-      /* show original photo */
+      /* no width specified - show photo in its original size */
       if($width == 0) {
          $fullpath = $this->parent->translate_path($details['directory_path'])  ."/". $details['name'];
       }
       /* show thumbnail */
       else {
+         /* if no entry for this photo is yet in the database, create thumb */
+         if(!$this->parent->getMD5($idx)) {
+            $this->parent->gen_thumb($idx);
+         }
          $fullpath = $this->parent->cfg->base_path ."/thumbs/". $width ."_". $this->parent->getMD5($idx);
-         if(!file_exists($fullpath)) 
-            $this->parent->gen_thumb($idx, 0, 1);
+         /* if the thumb file does not exist, create it */
+         if(!file_exists($fullpath)) {
+            $this->parent->gen_thumb($idx);
+         }
       }
 
       if(!file_exists($fullpath)) {
-         $this->parent->showTextImage("File ". $fullpath ." does not exist");
+         $this->parent->showTextImage("File ". basename($fullpath) ." does not exist");
          return;
       }
       if(!is_readable($fullpath)) {
-         $this->parent->showTextImage("File ". $fullpath ." is not readable. Check the permissions");
+         $this->parent->showTextImage("File ". basename($fullpath) ." is not readable. Check the permissions");
          return;
       }
 
@@ -58,10 +64,10 @@ class PHPFSPOT_IMG {
 
       Header("Content-Type: ". $mime);
       Header("Content-Length: ". filesize($fullpath));
-      Header("Content-Transfer-Encoding: binary\n");              
+      Header("Content-Transfer-Encoding: binary\n");
       Header("Content-Disposition: inline; filename=\"". $details['name'] ."\"");
-      Header("Accept-Ranges: bytes");                             
-      Header("Connection: close");                                
+      Header("Accept-Ranges: bytes");
+      Header("Connection: close");
    
       $file = fopen($fullpath, "rb");
       fpassthru($file);
@@ -73,13 +79,12 @@ class PHPFSPOT_IMG {
 
 if(isset($_GET['idx']) && is_numeric($_GET['idx'])) {
 
+   $img = new PHPFSPOT_IMG;
+
    if(isset($_GET['width']) && is_numeric($_GET['width'])) 
-      $width = $_GET['width'];
+      $img->show($_GET['idx'], $_GET['width']);
    else
-      $width = "";
-
-   $img = new PHPFSPOT_IMG;
-   $img->show($_GET['idx'], $width);
+      $img->show($_GET['idx']);
 }
 
 ?>