X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=e0fba5f8cb5bc7a06b00c5f83b4f6c3f8b57472e;hp=c783939f894519dd00cbabdd07c44403e71763c1;hb=c54dcf670a6ea58d885eb143c0eac8d90d3020f7;hpb=37a17e20128c27bb4e56ef2f020ece577703de4f

diff --git a/phpfspot.class.php b/phpfspot.class.php
index c783939..e0fba5f 100644
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -19,7 +19,10 @@ class PHPFSPOT {
       $this->cfg = new PHPFSPOT_CFG;
 
       $this->db = new PHPFSPOT_DB(&$this, $this->cfg->fspot_db);
+
       $this->cfg_db = new PHPFSPOT_DB(&$this, $this->cfg->phpfspot_db);
+      $this->check_config_table();
+
       $this->tmpl = new PHPFSPOT_TMPL($this);
 
       $this->get_tags();
@@ -103,11 +106,15 @@ class PHPFSPOT {
 
       $details = $this->get_photo_details($photo);
       $meta = $this->get_meta_informations($this->translate_path($details['directory_path']) ."/". $details['name']);
+      $info = getimagesize($this->translate_path($details['directory_path']) ."/thumbs/". $this->cfg->photo_width ."_". $details['name']);
 
+      $this->tmpl->assign('width', $info[0]);
+      $this->tmpl->assign('height', $info[1]);
       $this->tmpl->assign('c_date', $meta['DateTime']);
       $this->tmpl->assign('madewith', $meta['Make'] ." ". $meta['Model']);
       $this->tmpl->assign('image_name', $details['name']);
       $this->tmpl->assign('image_url', 'phpfspot_img.php?idx='. $photo ."&width=". $this->cfg->photo_width);
+      $this->tmpl->assign('image_url_full', 'phpfspot_img.php?idx='. $photo);
 
       if($previous_img) {
          $this->tmpl->assign('previous_url', "javascript:showImage(". $previous_img .");");
@@ -255,7 +262,7 @@ class PHPFSPOT {
 
       $details = $this->get_photo_details($photo);
 
-      $image_url = "phpfspot_img.php?idx=". $photo ."&width=200";
+      $image_url = "phpfspot_img.php?idx=". $photo ."&width=". $this->cfg->bubble_width;
 
       $filesize = filesize($this->translate_path($details['directory_path'])  ."/". $details['name']);
       $filesize = rand($filesize/1024, 2);
@@ -280,7 +287,7 @@ class PHPFSPOT {
 
    } // showCredits()
 
-   public function resize_image($image, $width)
+   public function create_thumbnail($image, $width)
    {  
       // if thumbnail already exists, don't recreate it
       if(file_exists(dirname($image) ."/thumbs/". $width ."_". basename($image)))
@@ -330,7 +337,7 @@ class PHPFSPOT {
          imagedestroy($src_img);
       }
 
-   } // resize_image()
+   } // create_thumbnail()
 
    public function get_meta_informations($file)
    {
@@ -339,6 +346,89 @@ class PHPFSPOT {
 
    } // get_meta_informations()
 
+   public function check_config_table()
+   {
+      // if the config table doesn't exist yet, create it
+      if(!$this->cfg_db->db_check_table_exists("images")) {
+         $this->cfg_db->db_exec("
+            CREATE TABLE images (
+               img_idx int primary key,
+               img_md5 varchar(32)
+            )
+            ");
+      }
+
+   } // check_config_table
+
+   public function gen_thumbs($idx = 0, $fromcmd = 0)
+   {
+      if(!$idx) {
+         /* get all available photos */
+         $all = $this->getAllTagPhotos();
+      }
+      else
+         $all = Array($idx);
+      
+      foreach($all as $photo) {
+
+         $full_path = $this->translate_path($details['directory_path'])  ."/". $details['name'];
+         $file_md5 = md5_file($full_path);
+
+         $details = $this->get_photo_details($photo);
+         if($fromcmd) print "Image ". $details['name'] ." Thumbnails:";
+
+         /* if the file hasn't changed there is no need to regen the thumb */
+         if($file_md5 == $this->getMD5($photo)) {
+            if($fromcmd) print " file has not changed - skipping\n";
+            continue;
+         }
+
+         /* set the new/changed MD5 sum for the current photo */
+         $this->setMD5($photo, $file_md5);
+
+         $resolutions = Array(
+                           $this->cfg->thumb_width,
+                           $this->cfg->bubble_width,
+                           $this->cfg->photo_width
+                        );
+
+         /* create thumbnails for the requested resolutions */
+         foreach($resolutions as $resolution) {
+            if($fromcmd) print " ". $resolution ."px";
+            $this->create_thumbnail($full_path, $resolution);
+         }
+
+         if($fromcmd) print "\n";
+
+      }
+
+   } // gen_thumbs()
+
+   private function getMD5($idx)
+   {
+      $result = $this->cfg_db->db_query("
+         SELECT img_md5 
+         FROM images
+         WHERE img_idx='". $idx ."'
+      ");
+
+      if(!$result)
+         return 0;
+
+      $img = $this->cfg_db->db_fetch_object($result);
+      return $img['img_md5'];
+      
+   } // getMD5()
+
+   private function setMD5($idx, $md5)
+   {
+      $result = $this->cfg_db->db_exec("
+         REPLACE INTO images (img_idx, img_md5)
+         VALUES ('". $idx ."', '". $md5 ."')
+      ");
+
+   } // setMD5()
+
 }
 
 ?>