stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-08-05 06:31:35 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactored the rebuild_dirty_images handler to simplify the counting and end processing. It was getting all confused with trying to figure out the completed and remaining. Now on initiation it sets the total images that are dirty and then counts the completed until it equals the total, then exits. Fixes ticket #771

Browse Source
This commit is contained in:
Tim Almdal
2009-09-24 20:06:14 -07:00
parent 970158f4d9
commit cd240ebaad
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gallery/helpers/gallery_task.php
+12 -9
View File
@@ -48,9 +48,13 @@ class gallery_task_Core {
$errors = array();
try {
$result = graphics::find_dirty_images_query();
$total_count = $task->get("total_count", -1);
if ($total_count < 0) {
$total_count = $result->count();
$task->set("total_count", $total_count);
}
$completed = $task->get("completed", 0);
$ignored = $task->get("ignored", array());
$remaining = $result->count() - count($ignored);
$i = 0;
foreach ($result as $row) {
@@ -62,19 +66,18 @@ class gallery_task_Core {
if ($item->loaded) {
try {
graphics::generate($item);
$ignored[$item->id] = 1;
$completed++;
$errors[] = t("Successfully rebuilt images for '%title'",
array("title" => html::purify($item->title)));
} catch (Exception $e) {
$errors[] = t("Unable to rebuild images for '%title'",
array("title" => html::purify($item->title)));
$errors[] = $e->__toString();
$ignored[$item->id] = 1;
}
}
$completed++;
$remaining--;
if (++$i == 2) {
break;
}
@@ -83,17 +86,17 @@ class gallery_task_Core {
$task->status = t2("Updated: 1 image. Total: %total_count.",
"Updated: %count images. Total: %total_count.",
$completed,
array("total_count" => ($remaining + $completed)));
array("total_count" => $total_count));
if ($completed + $remaining > 0) {
$task->percent_complete = (int)(100 * $completed / ($completed + $remaining));
if ($completed < $total_count) {
$task->percent_complete = (int)(100 * ($completed + count($ignored)) / $total_count);
} else {
$task->percent_complete = 100;
}
$task->set("completed", $completed);
$task->set("ignored", $ignored);
if ($remaining == 0) {
if ($task->percent_complete == 100) {
$task->done = true;
$task->state = "success";
site_status::clear("graphics_dirty");