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

Move graphics::rebuild_dirty_images to core_task::rebuild_dirty_images

Browse Source
This commit is contained in:
Bharat Mediratta
2009-01-16 04:35:35 +00:00
parent 2352dd162a
commit b2e37f20c7
2 changed files with 46 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/helpers/core_task.php
+44 -1
View File
@@ -21,7 +21,7 @@ class core_task_Core {
static function available() {
$dirty_count = graphics::find_dirty_images_query()->count();
return array(Task::factory()
->callback("graphics::rebuild_dirty_images")
->callback("core_task::rebuild_dirty_images")
->name(t("Rebuild Images"))
->description($dirty_count ?
t2("You have one image which is out of date",
@@ -30,4 +30,47 @@ class core_task_Core {
: t("All your images are up to date"))
->severity($dirty_count ? log::WARNING : log::SUCCESS));
}
/**
* Task that rebuilds all dirty images.
* @param Task_Model the task
*/
static function rebuild_dirty_images($task) {
$result = graphics::find_dirty_images_query();
$remaining = $result->count();
$completed = $task->get("completed", 0);
$i = 0;
foreach ($result as $row) {
$item = ORM::factory("item", $row->id);
if ($item->loaded) {
graphics::generate($item);
}
$completed++;
$remaining--;
if (++$i == 2) {
break;
}
}
$task->status = t2("Updated: 1 image. Total: %total_count.",
"Updated: %count images. Total: %total_count.",
$completed,
array("total_count" => ($remaining + $completed)));
if ($completed + $remaining > 0) {
$task->percent_complete = (int)(100 * $completed / ($completed + $remaining));
} else {
$task->percent_complete = 100;
}
$task->set("completed", $completed);
if ($remaining == 0) {
$task->done = true;
$task->state = "success";
site_status::clear("graphics_dirty");
}
}
}
core/helpers/graphics.php
+2 -46
View File
@@ -221,58 +221,14 @@ class graphics_Core {
"%count of your photos are out of date. %link_startClick here to fix them%link_end",
$count,
array("link_start" => "<a href=\"" .
url::site("admin/maintenance/start/graphics::rebuild_dirty_images?csrf=__CSRF__") .
url::site(
"admin/maintenance/start/core_task::rebuild_dirty_images?csrf=__CSRF__") .
"\" class=\"gDialogLink\">",
"link_end" => "</a>")),
"graphics_dirty");
}
}
/**
* Task that rebuilds all dirty images.
* @param Task_Model the task
*/
static function rebuild_dirty_images($task) {
$db = Database::instance();
$result = self::find_dirty_images_query();
$remaining = $result->count();
$completed = $task->get("completed", 0);
$i = 0;
foreach ($result as $row) {
$item = ORM::factory("item", $row->id);
if ($item->loaded) {
self::generate($item);
}
$completed++;
$remaining--;
if (++$i == 2) {
break;
}
}
$task->status = t2("Updated: 1 image. Total: %total_count.",
"Updated: %count images. Total: %total_count.",
$completed,
array("total_count" => ($remaining + $completed)));
if ($completed + $remaining > 0) {
$task->percent_complete = (int)(100 * $completed / ($completed + $remaining));
} else {
$task->percent_complete = 100;
}
$task->set("completed", $completed);
if ($remaining == 0) {
$task->done = true;
$task->state = "success";
site_status::clear("graphics_dirty");
}
}
/**
* Detect which graphics toolkits are available on this system. Return an array of key value
* pairs where the key is one of gd, imagemagick, graphicsmagick and the value is information