stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-07-11 01:33:51 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid blowing the task data column by only adding directories to the queue instead of directories and files.

Browse Source
This commit is contained in:
Bharat Mediratta
2009-07-09 14:03:07 -07:00
parent fad6c4783e
commit 6fbb1e2daf
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
modules/server_add/controllers/server_add.php
View File

@@ -131,14 +131,21 @@ class Server_Add_Controller extends Admin_Controller {
$queue = $task->get("queue");
while ($queue && microtime(true) - $start < 0.5) {
$file = array_shift($queue);
$entry = ORM::factory("server_add_file");
$entry->task_id = $task->id;
$entry->file = $file;
$entry->save();
if (is_dir($file)) {
$queue = array_merge(
$queue, empty($selections[$file]) ? glob("$file/*") : $selections[$file]);
$children = empty($selections[$file]) ? glob("$file/*") : $selections[$file];
} else {
$children = array($file);
}
foreach ($children as $child) {
$entry = ORM::factory("server_add_file");
$entry->task_id = $task->id;
$entry->file = $child;
$entry->save();
if (is_dir($child)) {
$queue[] = $child;
}
}
}
// We have no idea how long this can take because we have no idea how deep the tree
@@ -218,7 +225,7 @@ class Server_Add_Controller extends Admin_Controller {
$entry->delete();
}
$task->set("completed_files", $completed_files);
$task->status = t("Adding photos (%completed of %total)",
$task->status = t("Adding photos and albums (%completed of %total)",
array("completed" => $completed_files,
"total" => $total_files));
$task->percent_complete = 10 + 100 * ($completed_files / $total_files);