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

Fix a bug where we were not properly locating the parent album when

Browse Source 
adding a new album or photo.

Simplify the data structure that we pass down to
server_add_tree.html.php so that we just pass a file list and let it
do whatever it wants with it.
This commit is contained in:
Bharat Mediratta
2009-07-10 08:01:32 -07:00
parent de39dcbce6
commit 5cf267cc4c
2 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,7 +21,7 @@ class Server_Add_Controller extends Admin_Controller {
public function browse($id) {
$paths = unserialize(module::get_var("server_add", "authorized_paths"));
foreach (array_keys($paths) as $path) {
$files[$path] = basename($path);
$files[] = $path;
}
$item = ORM::factory("item", $id);
@@ -54,7 +54,7 @@ class Server_Add_Controller extends Admin_Controller {
}
}
$tree->files[$file] = basename($file);
$tree->files[] = $file;
}
print $tree;
}
@@ -119,8 +119,8 @@ class Server_Add_Controller extends Admin_Controller {
case "init":
$task->set("mode", "build-file-list");
$task->set("queue", array_keys($selections));
$task->status = t("Starting up");
$task->percent_complete = 0;
$task->status = t("Starting up");
batch::start();
break;
@@ -132,6 +132,11 @@ class Server_Add_Controller extends Admin_Controller {
while ($queue && microtime(true) - $start < 0.5) {
$file = array_shift($queue);
if (is_dir($file)) {
$entry = ORM::factory("server_add_file");
$entry->task_id = $task->id;
$entry->file = $file;
$entry->save();
$children = empty($selections[$file]) ? glob("$file/*") : $selections[$file];
} else {
$children = array($file);
@@ -187,6 +192,7 @@ class Server_Add_Controller extends Admin_Controller {
$item = model_cache::get("item", $item_id);
foreach ($entries as $entry) {
Kohana::log("alert",print_r($albums,1));
if (microtime(true) - $start > 0.5) {
break;
}
@@ -195,19 +201,33 @@ class Server_Add_Controller extends Admin_Controller {
$name = basename($relative_path);
$title = item::convert_filename_to_title($name);
if (is_dir($entry->file)) {
if (isset($albums[$relative_path]) && $parent_id = $albums[$relative_path]) {
$parent_path = dirname($relative_path);
Kohana::log("alert",print_r("rp: $relative_path -> $parent_path",1));
if (isset($albums[$parent_path]) && $parent_id = $albums[$parent_path]) {
$parent = ORM::factory("item", $parent_id);
} else {
$album = album::create($item, $name, $title, null, user::active()->id);
$albums[$relative_path] = $album->id;
$task->set("albums", $albums);
}
} else {
if (strpos($relative_path, "/") !== false) {
$parent = ORM::factory("item", $albums[dirname($relative_path)]);
} else {
$parent = $item;
}
$album = album::create($parent, $name, $title, null, user::active()->id);
$albums[$relative_path] = $album->id;
$task->set("albums", $albums);
} else {
// Find the nearest selected parent. We check to see if any of the candidate parents
// were selected in the UI and if so, we use that. Otherwise, we fall back to making
// the parent the current item.
$parent_path = $relative_path;
$parent = null;
do {
if (strpos($parent_path, "/") !== false) {
if (array_key_exists($parent_path, $albums)) {
$parent = ORM::factory("item", $albums[$parent_path]);
} else {
$parent_path = dirname($parent_path);
}
} else {
$parent = $item;
}
} while (!$parent);
$extension = strtolower(pathinfo($name, PATHINFO_EXTENSION));
if (in_array($extension, array("gif", "png", "jpg", "jpeg"))) {