X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=0fa174016b5cd299c344c3a51adc680f588be8bb;hp=9c426a30ce20f678d9daa95eb2c141305d491faa;hb=ad377d5c58e8baba2e495f431d00da7ec17ecc0a;hpb=836e04ea5fc6b0d32d4d57f1af66d1a9aaf423a1
diff --git a/phpfspot.class.php b/phpfspot.class.php
index 9c426a3..0fa1740 100644
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -117,25 +117,39 @@ 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']);
+ $orig_path = $this->translate_path($details['directory_path']) ."/". $details['name'];
+ $thumb_path = $this->cfg->base_path ."/thumbs/". $this->cfg->photo_width ."_". $this->getMD5($photo);
+
+ /* If the thumbnail doesn't exist yet, try to create it */
+ if(!file_exists($thumb_path)) {
+ $this->gen_thumb($photo, 0, 1);
+ }
+
+ $meta = $this->get_meta_informations($orig_path);
- $this->tmpl->assign('description', $details['description']);
- $this->tmpl->assign('image_name', $details['name']);
+ if(file_exists($thumb_path)) {
- $this->tmpl->assign('width', $info[0]);
- $this->tmpl->assign('height', $info[1]);
- $this->tmpl->assign('ExifMadeOn', strftime("%a %x %X", $meta['FileDateTime']));
- $this->tmpl->assign('ExifMadeWith', $meta['Make'] ." ". $meta['Model']);
- $this->tmpl->assign('ExifOrigResolution', $meta['ExifImageWidth'] ."x". $meta['ExifImageLength']);
- $this->tmpl->assign('ExifFileSize', round($meta['FileSize']/1024, 1));
-
- $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);
+ $info = getimagesize($thumb_path);
- $this->tmpl->assign('tags', $this->get_photo_tags($photo));
+ $this->tmpl->assign('description', $details['description']);
+ $this->tmpl->assign('image_name', $details['name']);
+
+ $this->tmpl->assign('width', $info[0]);
+ $this->tmpl->assign('height', $info[1]);
+ $this->tmpl->assign('ExifMadeOn', strftime("%a %x %X", $meta['FileDateTime']));
+ $this->tmpl->assign('ExifMadeWith', $meta['Make'] ." ". $meta['Model']);
+ $this->tmpl->assign('ExifOrigResolution', $meta['ExifImageWidth'] ."x". $meta['ExifImageLength']);
+ $this->tmpl->assign('ExifFileSize', round($meta['FileSize']/1024, 1));
+
+ $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);
+
+ $this->tmpl->assign('tags', $this->get_photo_tags($photo));
+ }
+ else {
+ print "Can't open file ". $thumb_path ."\n";
+ }
if($previous_img) {
$this->tmpl->assign('previous_url', "javascript:showImage(". $previous_img .");");
@@ -154,8 +168,10 @@ class PHPFSPOT {
$result = $this->db->db_query("
SELECT tag_id as id, count(tag_id) as quantity
FROM photo_tags
+ INNER JOIN tags t
+ ON t.id = tag_id
GROUP BY tag_id
- ORDER BY tag_id ASC
+ ORDER BY t.name ASC
");
$tags = Array();
@@ -196,7 +212,7 @@ class PHPFSPOT {
// uncomment if you want sizes in whole %:
$size = ceil($size);
- print "". $this->tags[$key] ." ";
+ print "". $this->tags[$key] .", ";
}
@@ -406,9 +422,12 @@ class PHPFSPOT {
} // showCredits()
- public function create_thumbnail($image, $width)
+ public function create_thumbnail($orig_image, $thumb_image, $width)
{
- $meta = $this->get_meta_informations($image);
+ if(!file_exists($orig_image))
+ return false;
+
+ $meta = $this->get_meta_informations($orig_image);
$rotate = 0;
$flip = false;
@@ -416,104 +435,85 @@ class PHPFSPOT {
switch($meta['Orientation']) {
case 1:
- $rotate = 0;
- $flip = false;
- break;
-
+ $rotate = 0; $flip = false; break;
case 2:
- $rotate = 0;
- $flip = true;
- break;
-
+ $rotate = 0; $flip = true; break;
case 3:
- $rotate = 180;
- $flip = false;
- break;
-
+ $rotate = 180; $flip = false; break;
case 4:
- $rotate = 180;
- $flip = true;
- break;
-
+ $rotate = 180; $flip = true; break;
case 5:
- $rotate = 90;
- $flip = true;
- break;
-
+ $rotate = 90; $flip = true; break;
case 6:
- $rotate = 90;
- $flip = false;
- break;
-
+ $rotate = 90; $flip = false; break;
case 7:
- $rotate = 270;
- $flip = true;
- break;
-
+ $rotate = 270; $flip = true; break;
case 8:
- $rotate = 270;
- $flip = false;
- break;
+ $rotate = 270; $flip = false; break;
}
- $src_img = @imagecreatefromjpeg($image);
+ $src_img = @imagecreatefromjpeg($orig_image);
- if($src_img)
- {
- /* grabs the height and width */
- $new_w = imagesx($src_img);
- $new_h = imagesy($src_img);
+ if(!$src_img) {
+ print "Can't load image from ". $orig_image ."\n";
+ return false;
+ }
- // If requested width is more then the actual image width,
- // do not generate a thumbnail
+ /* grabs the height and width */
+ $new_w = imagesx($src_img);
+ $new_h = imagesy($src_img);
- if($width >= $new_w) {
- imagedestroy($src_img);
- return;
- }
+ // If requested width is more then the actual image width,
+ // do not generate a thumbnail
- /* calculates aspect ratio */
- $aspect_ratio = $new_h / $new_w;
+ if($width >= $new_w) {
+ imagedestroy($src_img);
+ return true;
+ }
- /* sets new size */
- $new_w = $width;
- $new_h = abs($new_w * $aspect_ratio);
+ /* calculates aspect ratio */
+ $aspect_ratio = $new_h / $new_w;
- /* creates new image of that size */
- $dst_img = imagecreatetruecolor($new_w,$new_h);
+ /* sets new size */
+ $new_w = $width;
+ $new_h = abs($new_w * $aspect_ratio);
- imagefill($dst_img, 0, 0, ImageColorAllocate($dst_img, 255, 255, 255));
+ /* creates new image of that size */
+ $dst_img = imagecreatetruecolor($new_w, $new_h);
- /* copies resized portion of original image into new image */
- imagecopyresampled($dst_img,$src_img,0,0,0,0,$new_w,$new_h,imagesx($src_img),imagesy($src_img));
+ imagefill($dst_img, 0, 0, ImageColorAllocate($dst_img, 255, 255, 255));
- /* needs the image to be flipped horizontal? */
- if($flip) {
- print "(FLIP)";
- $image = $dst_img;
- for($x = 0; $x < $new_w; $x++) {
- imagecopy($dst_img, $image, $x, 0, $w - $x - 1, 0, 1, $h);
- }
- }
+ /* copies resized portion of original image into new image */
+ imagecopyresampled($dst_img,$src_img,0,0,0,0,$new_w,$new_h,imagesx($src_img),imagesy($src_img));
- if($rotate) {
- print "(ROTATE)";
- $dst_img = $this->rotateImage($dst_img, $rotate);
+ /* needs the image to be flipped horizontal? */
+ if($flip) {
+ print "(FLIP)";
+ $image = $dst_img;
+ for($x = 0; $x < $new_w; $x++) {
+ imagecopy($dst_img, $image, $x, 0, $w - $x - 1, 0, 1, $h);
}
+ }
- /* write down new generated file */
+ if($rotate) {
+ print "(ROTATE)";
+ $dst_img = $this->rotateImage($dst_img, $rotate);
+ }
- if(!file_exists(dirname($image) ."/thumbs"))
- mkdir(dirname($image) ."/thumbs");
+ /* write down new generated file */
+ $result = imagejpeg($dst_img, $thumb_image, 75);
- $newfile = dirname($image) ."/thumbs/". $width ."_". basename($image);
- imagejpeg($dst_img, $newfile, 75);
+ /* free your mind */
+ imagedestroy($dst_img);
+ imagedestroy($src_img);
- /* free your mind */
- imagedestroy($dst_img);
- imagedestroy($src_img);
+ if($result === false) {
+ print "Can't write thumbnail ". $thumb_image ."\n";
+ return false;
}
+ return true;
+
} // create_thumbnail()
public function get_meta_informations($file)
@@ -536,41 +536,65 @@ class PHPFSPOT {
} // check_config_table
+ /**
+ * Generates a thumbnail from photo idx
+ *
+ * This function will generate JPEG thumbnails from provided F-Spot photo
+ * indizes.
+ *
+ * 1. Check if all thumbnail generations (width) are already in place and
+ * readable
+ * 2. Check if the md5sum of the original file has changed
+ * 3. Generate the thumbnails if needed
+ */
public function gen_thumb($idx = 0, $fromcmd = 0, $force = 0)
{
- $details = $this->get_photo_details($idx);
+ $resolutions = Array(
+ $this->cfg->thumb_width,
+ $this->cfg->bubble_width,
+ $this->cfg->photo_width,
+ );
+ $details = $this->get_photo_details($idx);
$full_path = $this->translate_path($details['directory_path']) ."/". $details['name'];
$file_md5 = md5_file($full_path);
if($fromcmd) print "Image [". $idx ."] ". $details['name'] ." Thumbnails:";
- /* if the file hasn't changed there is no need to regen the thumb */
- if(!$force && $file_md5 == $this->getMD5($idx)) {
- if($fromcmd) print " file has not changed - skipping\n";
- return;
- }
+ $error = 0;
- /* set the new/changed MD5 sum for the current photo */
- $this->setMD5($idx, $file_md5);
+ foreach($resolutions as $resolution) {
- $resolutions = Array(
- $this->cfg->thumb_width,
- $this->cfg->bubble_width,
- $this->cfg->photo_width
- );
+ $thumb_path = $this->cfg->base_path ."/thumbs/". $resolution ."_". $file_md5;
- /* create thumbnails for the requested resolutions */
- foreach($resolutions as $resolution) {
- if($fromcmd) print " ". $resolution ."px";
- $this->create_thumbnail($full_path, $resolution);
+ /* if the thumbnail file doesn't exist, create it */
+ if(!file_exists($thumb_path)) {
+
+ if($fromcmd) print " ". $resolution ."px";
+ if(!$this->create_thumbnail($full_path, $thumb_path, $resolution))
+ $error = 1;
+
+ }
+
+ /* if the file hasn't changed there is no need to regen the thumb */
+ elseif($file_md5 != $this->getMD5($idx) || $force) {
+
+ if($fromcmd) print " ". $resolution ."px";
+ if(!$this->create_thumbnail($full_path, $thumb_path, $resolution))
+ $error = 1;
+
+ }
}
+ /* set the new/changed MD5 sum for the current photo */
+ if(!$error)
+ $this->setMD5($idx, $file_md5);
+
if($fromcmd) print "\n";
} // gen_thumb()
- private function getMD5($idx)
+ public function getMD5($idx)
{
$result = $this->cfg_db->db_query("
SELECT img_md5