projects
/
phpfspot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /var/cache/git/phpfspot
[phpfspot.git]
/
phpfspot.class.php
diff --git
a/phpfspot.class.php
b/phpfspot.class.php
index ea91b011ce3f2ae67bc4a1fc81ea41b700f52c26..5e641172d6c0157cb0ec1d2a3892cb3961bc5a8a 100644
(file)
--- a/
phpfspot.class.php
+++ b/
phpfspot.class.php
@@
-1290,6
+1290,8
@@
class PHPFSPOT {
$this->_debug("Image [". $idx ."] ". $this->shrink_text($this->parse_uri($details['uri'], 'filename'), 20) ." Thumbnails:");
$this->_debug("Image [". $idx ."] ". $this->shrink_text($this->parse_uri($details['uri'], 'filename'), 20) ." Thumbnails:");
+ $changes = false;
+
foreach($resolutions as $resolution) {
$thumb_sub_path = substr($file_md5, 0, 2);
foreach($resolutions as $resolution) {
$thumb_sub_path = substr($file_md5, 0, 2);
@@
-1305,6
+1307,8
@@
class PHPFSPOT {
$this->_debug(" ". $resolution ."px");
if(!$this->create_thumbnail($full_path, $thumb_path, $resolution))
$error = 1;
$this->_debug(" ". $resolution ."px");
if(!$this->create_thumbnail($full_path, $thumb_path, $resolution))
$error = 1;
+
+ $changes = true;
}
/* if the file hasn't changed there is no need to regen the thumb */
elseif($file_md5 != $this->getMD5($idx) || $force) {
}
/* if the file hasn't changed there is no need to regen the thumb */
elseif($file_md5 != $this->getMD5($idx) || $force) {
@@
-1313,9
+1317,14
@@
class PHPFSPOT {
if(!$this->create_thumbnail($full_path, $thumb_path, $resolution))
$error = 1;
if(!$this->create_thumbnail($full_path, $thumb_path, $resolution))
$error = 1;
+ $changes = true;
}
}
}
}
+ if(!$changes) {
+ $this->_debug(" already exist");
+ }
+
/* set the new/changed MD5 sum for the current photo */
if(!$error) {
$this->setMD5($idx, $file_md5);
/* set the new/changed MD5 sum for the current photo */
if(!$error) {
$this->setMD5($idx, $file_md5);