summaryrefslogtreecommitdiffstats
path: root/phpfspot.class.php
diff options
context:
space:
mode:
Diffstat (limited to 'phpfspot.class.php')
-rw-r--r--phpfspot.class.php32
1 files changed, 21 insertions, 11 deletions
diff --git a/phpfspot.class.php b/phpfspot.class.php
index 33f3b5b..391589a 100644
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -147,7 +147,7 @@ class PHPFSPOT {
/* If the thumbnail doesn't exist yet, try to create it */
if(!file_exists($thumb_path)) {
- $this->gen_thumb($photo, 0, 1);
+ $this->gen_thumb($photo, true);
}
$meta = $this->get_meta_informations($orig_path);
@@ -624,21 +624,24 @@ class PHPFSPOT {
* 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)
+ public function gen_thumb($idx = 0, $force = 0)
{
+ $error = 0;
+
$resolutions = Array(
$this->cfg->thumb_width,
$this->cfg->bubble_width,
$this->cfg->photo_width,
);
+ /* get details from F-Spot's database */
$details = $this->get_photo_details($idx);
+
+ /* calculate file MD5 sum */
$full_path = $this->translate_path($details['directory_path']) ."/". $details['name'];
$file_md5 = md5_file($full_path);
- if($fromcmd) print "Image [". $idx ."] ". $details['name'] ." Thumbnails:";
-
- $error = 0;
+ $this->_debug("Image [". $idx ."] ". $details['name'] ." Thumbnails:");
foreach($resolutions as $resolution) {
@@ -647,16 +650,15 @@ class PHPFSPOT {
/* if the thumbnail file doesn't exist, create it */
if(!file_exists($thumb_path)) {
- if($fromcmd) print " ". $resolution ."px";
+ $this->_debug(" ". $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";
+ $this->_debug(" ". $resolution ."px");
if(!$this->create_thumbnail($full_path, $thumb_path, $resolution))
$error = 1;
@@ -664,10 +666,11 @@ class PHPFSPOT {
}
/* set the new/changed MD5 sum for the current photo */
- if(!$error)
+ if(!$error) {
$this->setMD5($idx, $file_md5);
+ }
- if($fromcmd) print "\n";
+ $this->_debug("\n");
} // gen_thumb()
@@ -856,7 +859,14 @@ class PHPFSPOT {
return true;
} // checkRequirements()
-
+
+ private function _debug($text)
+ {
+ if($this->fromcmd) {
+ print $text;
+ }
+
+ } // _debug()
}