mirror of
https://github.com/Pathduck/gallery3.git
synced 2026-04-20 20:49:18 -04:00
Rework server_add. It's smaller and leaner now, storing the list of
files out in a separate model for scalability. Removed the "pause" functionality. - Server_Add_Controller extends Admin_Controller so that we don't have to check for admin every time. - Task completion time now factors in the time it takes to walk the arbitrarily deep trees - Moved checkbox management entirely into JS using jQuery - Simplified the JS considerably
This commit is contained in:
@@ -17,13 +17,8 @@
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
class Server_Add_Controller extends Controller {
|
||||
class Server_Add_Controller extends Admin_Controller {
|
||||
public function browse($id) {
|
||||
if (!user::active()->admin) {
|
||||
access::forbidden();
|
||||
}
|
||||
|
||||
|
||||
$paths = unserialize(module::get_var("server_add", "authorized_paths"));
|
||||
foreach (array_keys($paths) as $path) {
|
||||
$files[$path] = basename($path);
|
||||
@@ -37,29 +32,12 @@ class Server_Add_Controller extends Controller {
|
||||
print $view;
|
||||
}
|
||||
|
||||
private function _validate_path($path) {
|
||||
if (!is_readable($path) || is_link($path)) {
|
||||
public function children() {
|
||||
$path = $this->input->get("path");
|
||||
if (!server_add::is_valid_path($path)) {
|
||||
throw new Exception("@todo BAD_PATH");
|
||||
}
|
||||
|
||||
$authorized_paths = unserialize(module::get_var("server_add", "authorized_paths"));
|
||||
foreach (array_keys($authorized_paths) as $valid_path) {
|
||||
if (strpos($path, $valid_path) === 0) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
throw new Exception("@todo BAD_PATH");
|
||||
}
|
||||
|
||||
public function children() {
|
||||
if (!user::active()->admin) {
|
||||
access::forbidden();
|
||||
}
|
||||
|
||||
$path = $this->input->get("path");
|
||||
$this->_validate_path($path);
|
||||
|
||||
$tree = new View("server_add_tree.html");
|
||||
$tree->files = array();
|
||||
$tree->tree_id = substr(md5($path), 10);
|
||||
@@ -81,196 +59,194 @@ class Server_Add_Controller extends Controller {
|
||||
print $tree;
|
||||
}
|
||||
|
||||
public function add() {
|
||||
if (!user::active()->admin) {
|
||||
access::forbidden();
|
||||
}
|
||||
public function start() {
|
||||
access::verify_csrf();
|
||||
|
||||
$authorized_paths = unserialize(module::get_var("server_add", "authorized_paths"));
|
||||
$item = ORM::factory("item", Input::instance()->get("item_id"));
|
||||
// We're an admin so this isn't necessary, but we'll eventually open this up to non-admins and
|
||||
// this also verifies that the item was loaded properly.
|
||||
access::required("edit", $item);
|
||||
|
||||
// The paths we receive are full pathnames. Convert that into a tree structure to save space
|
||||
// in our task.
|
||||
foreach (Input::instance()->post("path") as $path) {
|
||||
// Gather up all the paths and associate them by directory, so that we can locate any empty
|
||||
// directories for the next round.
|
||||
foreach (Input::instance()->post("paths") as $path) {
|
||||
if (is_dir($path)) {
|
||||
$dirs[$path] = array();
|
||||
$selections[$path] = array();
|
||||
} else if (is_file($path)) {
|
||||
$dir = dirname($path);
|
||||
$file = basename($path);
|
||||
$dirs[$dir][] = $file;
|
||||
$selections[dirname($path)][] = $path;
|
||||
}
|
||||
}
|
||||
|
||||
Kohana::log("alert",print_r($dirs,1));
|
||||
}
|
||||
|
||||
/* ================================================================================ */
|
||||
|
||||
function start($id) {
|
||||
if (!user::active()->admin) {
|
||||
access::forbidden();
|
||||
}
|
||||
access::verify_csrf();
|
||||
|
||||
$item = ORM::factory("item", $id);
|
||||
$paths = unserialize(module::get_var("server_add", "authorized_paths"));
|
||||
$input_files = $this->input->post("path");
|
||||
$collapsed = $this->input->post("collapsed");
|
||||
$files = array();
|
||||
$total_count = 0;
|
||||
foreach (array_keys($paths) as $valid_path) {
|
||||
$path_length = strlen($valid_path);
|
||||
foreach ($input_files as $key => $path) {
|
||||
if (!empty($path)) {
|
||||
if ($valid_path != $path && strpos($path, $valid_path) === 0) {
|
||||
$relative_path = substr(dirname($path), $path_length);
|
||||
$name = basename($path);
|
||||
$files[$valid_path][] = array("path" => $relative_path,
|
||||
"parent_id" => $id, "name" => basename($path),
|
||||
"type" => is_dir($path) ? "album" : "file");
|
||||
$total_count++;
|
||||
}
|
||||
if ($collapsed[$key] === "true") {
|
||||
$total_count += $this->_select_children($id, $valid_path, $path, $files[$valid_path]);
|
||||
}
|
||||
unset($input_files[$key]);
|
||||
unset($collapsed[$key]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ($total_count == 0) {
|
||||
print json_encode(array("result" => "success",
|
||||
"url" => "",
|
||||
"task" => array(
|
||||
"id" => -1, "done" => 1, "percent_complete" => 100,
|
||||
"status" => t("No eligible files, import cancelled"))));
|
||||
return;
|
||||
}
|
||||
|
||||
$task_def = Task_Definition::factory()
|
||||
->callback("server_add_task::add_from_server")
|
||||
->callback("Server_Add_Controller::add")
|
||||
->description(t("Add photos or movies from the local server"))
|
||||
->name(t("Add from server"));
|
||||
$task = task::create($task_def, array("item_id" => $id, "next_path" => 0, "files" => $files,
|
||||
"counter" => 0, "position" => 0, "total" => $total_count));
|
||||
$task = task::create(
|
||||
$task_def, array("item_id" => $item->id, "selections" => $selections));
|
||||
|
||||
batch::start();
|
||||
print json_encode(array("result" => "started",
|
||||
"url" => url::site("server_add/add_photo/{$task->id}?csrf=" .
|
||||
access::csrf_token()),
|
||||
"task" => array(
|
||||
"id" => $task->id,
|
||||
"percent_complete" => $task->percent_complete,
|
||||
"status" => $task->status,
|
||||
"done" => $task->done)));
|
||||
print json_encode(
|
||||
array("result" => "started",
|
||||
"url" => url::site("server_add/run/$task->id?csrf=" . access::csrf_token())));
|
||||
}
|
||||
|
||||
function add_photo($task_id) {
|
||||
if (!user::active()->admin) {
|
||||
function run($task_id) {
|
||||
access::verify_csrf();
|
||||
|
||||
$task = ORM::factory("task", $task_id);
|
||||
if (!$task->loaded || $task->owner_id != user::active()->id) {
|
||||
access::forbidden();
|
||||
}
|
||||
access::verify_csrf();
|
||||
|
||||
$task = task::run($task_id);
|
||||
// @todo the task is already run... its a little late to check the access
|
||||
if (!$task->loaded || $task->owner_id != user::active()->id) {
|
||||
access::forbidden();
|
||||
}
|
||||
|
||||
if ($task->done) {
|
||||
switch ($task->state) {
|
||||
case "success":
|
||||
message::success(t("Add from server completed"));
|
||||
break;
|
||||
|
||||
case "error":
|
||||
message::warning(t("Add from server completed with errors"));
|
||||
break;
|
||||
}
|
||||
print json_encode(array("result" => "success",
|
||||
"task" => array(
|
||||
"id" => $task->id,
|
||||
"percent_complete" => $task->percent_complete,
|
||||
"status" => $task->status,
|
||||
"done" => $task->done)));
|
||||
|
||||
} else {
|
||||
print json_encode(array("result" => "in_progress",
|
||||
"task" => array(
|
||||
"id" => $task->id,
|
||||
"percent_complete" => $task->percent_complete,
|
||||
"status" => $task->status,
|
||||
"done" => $task->done)));
|
||||
}
|
||||
print json_encode(array("done" => $task->done,
|
||||
"percent_complete" => $task->percent_complete));
|
||||
}
|
||||
|
||||
public function finish($id, $task_id) {
|
||||
if (!user::active()->admin) {
|
||||
access::forbidden();
|
||||
}
|
||||
access::verify_csrf();
|
||||
$task = ORM::factory("task", $task_id);
|
||||
/**
|
||||
* This is the task code that adds photos and albums. It first examines all the target files
|
||||
* and creates a set of Server_Add_File_Models, then runs through the list of models and adds
|
||||
* them one at a time.
|
||||
*/
|
||||
static function add($task) {
|
||||
$selections = $task->get("selections");
|
||||
$mode = $task->get("mode", "init");
|
||||
$start = microtime(true);
|
||||
$item_id = $task->get("item_id");
|
||||
|
||||
if (!$task->loaded || $task->owner_id != user::active()->id) {
|
||||
access::forbidden();
|
||||
}
|
||||
switch ($mode) {
|
||||
case "init":
|
||||
$task->set("mode", "build-file-list");
|
||||
$task->set("queue", array_keys($selections));
|
||||
$task->percent_complete = 0;
|
||||
batch::start();
|
||||
break;
|
||||
|
||||
if (!$task->done) {
|
||||
message::warning(t("Add from server was cancelled prior to completion"));
|
||||
}
|
||||
case "build-file-list": /* 0% to 10% */
|
||||
// We can't fit an arbitrary number of paths in a task, so store them in a separate table.
|
||||
// Don't use an iterator here because we can't get enough control over it when we're dealing
|
||||
// with a deep hierarchy and we don't want to go over our time quota.
|
||||
$queue = $task->get("queue");
|
||||
Kohana::log("alert",print_r($queue,1));
|
||||
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();
|
||||
|
||||
batch::stop();
|
||||
print json_encode(array("result" => "success"));
|
||||
}
|
||||
|
||||
public function pause($id, $task_id) {
|
||||
if (!user::active()->admin) {
|
||||
access::forbidden();
|
||||
}
|
||||
access::verify_csrf();
|
||||
$task = ORM::factory("task", $task_id);
|
||||
if (!$task->loaded || $task->owner_id != user::active()->id) {
|
||||
access::forbidden();
|
||||
}
|
||||
|
||||
message::warning(t("Add from server was cancelled prior to completion"));
|
||||
batch::stop();
|
||||
print json_encode(array("result" => "success"));
|
||||
}
|
||||
|
||||
private function _select_children($id, $valid_path, $path, &$files) {
|
||||
$count = 0;
|
||||
$children = new RecursiveIteratorIterator(
|
||||
new RecursiveDirectoryIterator($path),
|
||||
RecursiveIteratorIterator::SELF_FIRST);
|
||||
|
||||
$path_length = strlen($valid_path);
|
||||
foreach($children as $name => $file){
|
||||
if ($file->isLink()) {
|
||||
continue;
|
||||
}
|
||||
$filename = $file->getFilename();
|
||||
if ($filename[0] != ".") {
|
||||
if ($file->isDir()) {
|
||||
$relative_path = substr(dirname($file->getPathname()), $path_length);
|
||||
$files[] = array("path" => $relative_path,
|
||||
"parent_id" => $id, "name" => $filename, "type" => "album");
|
||||
$count++;
|
||||
} else {
|
||||
$extension = strtolower(substr(strrchr($filename, '.'), 1));
|
||||
if ($file->isReadable() &&
|
||||
in_array($extension, array("gif", "jpeg", "jpg", "png", "flv", "mp4"))) {
|
||||
$relative_path = substr(dirname($file->getPathname()), $path_length);
|
||||
$files[] = array("path" => $relative_path,
|
||||
"parent_id" => $id, "name" => $filename, "type" => "file");
|
||||
$count++;
|
||||
}
|
||||
if (is_dir($file)) {
|
||||
$queue = array_merge(
|
||||
$queue, empty($selections[$file]) ? glob("$file/*") : $selections[$file]);
|
||||
}
|
||||
}
|
||||
// We have no idea how long this can take because we have no idea how deep the tree
|
||||
// hierarchy rabbit hole goes. Leave ourselves room here for 100 iterations and don't go
|
||||
// over 10% in percent_complete.
|
||||
$task->set("queue", $queue);
|
||||
$task->percent_complete = min($task->percent_complete + 0.1, 10);
|
||||
|
||||
if (!$queue) {
|
||||
$task->set("mode", "add-files");
|
||||
$task->set(
|
||||
"total_files", database::instance()->count_records(
|
||||
"server_add_files", array("task_id" => $task->id)));
|
||||
$task->set("albums", array());
|
||||
$task->set("completed", 0);
|
||||
$task->percent_complete = 10;
|
||||
}
|
||||
break;
|
||||
|
||||
case "add-files": /* 10% to 100% */
|
||||
$completed_files = $task->get("completed_files");
|
||||
$total_files = $task->get("total_files");
|
||||
$albums = $task->get("albums");
|
||||
|
||||
// Ordering by id ensures that we add them in the order that we created the entries, which
|
||||
// will create albums first.
|
||||
$entries = ORM::factory("server_add_file")
|
||||
->where("task_id", $task->id)
|
||||
->orderby("id", "ASC")
|
||||
->limit(10)
|
||||
->find_all();
|
||||
if ($entries->count() == 0) {
|
||||
$task->set("mode", "done");
|
||||
}
|
||||
|
||||
$item = model_cache::get("item", $item_id);
|
||||
foreach ($entries as $entry) {
|
||||
if (microtime(true) - $start > 0.5) {
|
||||
break;
|
||||
}
|
||||
|
||||
$relative_path = self::_relative_path($entry->file);
|
||||
$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 = 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;
|
||||
}
|
||||
|
||||
$extension = strtolower(pathinfo($name, PATHINFO_EXTENSION));
|
||||
if (in_array($extension, array("gif", "png", "jpg", "jpeg"))) {
|
||||
photo::create($parent, $entry->file, $name, $title, null, user::active()->id);
|
||||
} else if (in_array($extension, array("flv", "mp4"))) {
|
||||
movie::create($parent, $entry->file, $name, $title, null, user::active()->id);
|
||||
} else {
|
||||
// Unsupported type
|
||||
// @todo: $task->log this
|
||||
}
|
||||
}
|
||||
|
||||
$completed_files++;
|
||||
$entry->delete();
|
||||
}
|
||||
$task->set("completed_files", $completed_files);
|
||||
$task->percent_complete = 10 + 100 * ($completed_files / $total_files);
|
||||
Kohana::log("alert",print_r($task->as_array(),1));
|
||||
break;
|
||||
|
||||
case "done":
|
||||
batch::stop();
|
||||
$task->done = true;
|
||||
$task->state = "success";
|
||||
$task->percent_complete = 100;
|
||||
message::info(t2("Successfully added one photo",
|
||||
"Successfully added %count photos",
|
||||
$task->get("completed_files")));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Given a path that's somewhere in our authorized_paths list, return just the part that's
|
||||
* relative to the nearest authorized path.
|
||||
*/
|
||||
static function _relative_path($path) {
|
||||
static $authorized_paths;
|
||||
// @todo this doesn't deal well with overlapping authorized paths, it'll just use the first one
|
||||
// that matches. If we sort $authorized_paths by length in descending order, that should take
|
||||
// care of the problem.
|
||||
if (!$authorized_paths) {
|
||||
$authorized_paths =
|
||||
array_keys(unserialize(module::get_var("server_add", "authorized_paths")));
|
||||
}
|
||||
|
||||
return $count;
|
||||
foreach ($authorized_paths as $candidate) {
|
||||
$candidate = dirname($candidate);
|
||||
if (strpos($path, $candidate) === 0) {
|
||||
return substr($path, strlen($candidate) + 1);
|
||||
}
|
||||
}
|
||||
|
||||
throw new Exception("@todo BAD_PATH");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -31,4 +31,19 @@ class server_add_Core {
|
||||
site_status::clear("server_add_configuration");
|
||||
}
|
||||
}
|
||||
|
||||
static function is_valid_path($path) {
|
||||
if (!is_readable($path) || is_link($path)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$authorized_paths = unserialize(module::get_var("server_add", "authorized_paths"));
|
||||
foreach (array_keys($authorized_paths) as $valid_path) {
|
||||
if (strpos($path, $valid_path) === 0) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,10 +19,30 @@
|
||||
*/
|
||||
class server_add_installer {
|
||||
static function install() {
|
||||
module::set_version("server_add", 1);
|
||||
$db = Database::instance();
|
||||
$db->query("CREATE TABLE {server_add_files} (
|
||||
`id` int(9) NOT NULL auto_increment,
|
||||
`task_id` int(9) NOT NULL,
|
||||
`file` varchar(255) NOT NULL,
|
||||
PRIMARY KEY (`id`))
|
||||
ENGINE=InnoDB DEFAULT CHARSET=utf8;");
|
||||
module::set_version("server_add", 2);
|
||||
server_add::check_config();
|
||||
}
|
||||
|
||||
static function upgrade($version) {
|
||||
$db = Database::instance();
|
||||
if ($version == 1) {
|
||||
$db->query("CREATE TABLE {server_add_files} (
|
||||
`id` int(9) NOT NULL auto_increment,
|
||||
`task_id` int(9) NOT NULL,
|
||||
`file` varchar(255) NOT NULL,
|
||||
PRIMARY KEY (`id`))
|
||||
ENGINE=InnoDB DEFAULT CHARSET=utf8;");
|
||||
module::set_version("server_add", $version = 2);
|
||||
}
|
||||
}
|
||||
|
||||
static function deactivate() {
|
||||
site_status::clear("server_add_configuration");
|
||||
}
|
||||
|
||||
@@ -1,85 +0,0 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2009 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or (at
|
||||
* your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
class server_add_task_Core {
|
||||
static function available_tasks() {
|
||||
// Return empty array so nothing appears in the maintenance screen
|
||||
return array();
|
||||
}
|
||||
|
||||
static function add_from_server($task) {
|
||||
$context = unserialize($task->context);
|
||||
try {
|
||||
$paths = array_keys(unserialize(module::get_var("server_add", "authorized_paths")));
|
||||
$path = $paths[$context["next_path"]];
|
||||
if (!empty($context["files"][$path])) {
|
||||
$file = $context["files"][$path][$context["position"]];
|
||||
$parent = ORM::factory("item", $file["parent_id"]);
|
||||
access::required("add", $parent);
|
||||
if (!$parent->is_album()) {
|
||||
throw new Exception("@todo BAD_ALBUM");
|
||||
}
|
||||
|
||||
$name = $file["name"];
|
||||
if ($file["type"] == "album") {
|
||||
$album = ORM::factory("item")
|
||||
->where("name", $name)
|
||||
->where("parent_id", $parent->id)
|
||||
->find();
|
||||
if (!$album->loaded) {
|
||||
$album = album::create($parent, $name, $name, null, user::active()->id);
|
||||
}
|
||||
// Now that we have a new album. Go through the remaining files to import and change the
|
||||
// parent_id of any file that has the same relative path as this album's path.
|
||||
$album_path = "{$file['path']}/$name";
|
||||
for ($idx = $context["position"] + 1; $idx < count($context["files"][$path]); $idx++) {
|
||||
if (strpos($context["files"][$path][$idx]["path"], $album_path) === 0) {
|
||||
$context["files"][$path][$idx]["parent_id"] = $album->id;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
$extension = strtolower(substr(strrchr($name, '.'), 1));
|
||||
$source_path = "$path{$file['path']}/$name";
|
||||
$title = item::convert_filename_to_title($name);
|
||||
if (in_array($extension, array("flv", "mp4"))) {
|
||||
$movie = movie::create($parent, $source_path, $name, $title,
|
||||
null, user::active()->id);
|
||||
} else {
|
||||
$photo = photo::create($parent, $source_path, $name, $title,
|
||||
null, user::active()->id);
|
||||
}
|
||||
}
|
||||
|
||||
$context["counter"]++;
|
||||
if (++$context["position"] >= count($context["files"][$path])) {
|
||||
$context["next_path"]++;
|
||||
$context["position"] = 0;
|
||||
}
|
||||
} else {
|
||||
$context["next_path"]++;
|
||||
}
|
||||
} catch(Exception $e) {
|
||||
$context["errors"][$path] = $e->getMessage();
|
||||
}
|
||||
$task->context = serialize($context);
|
||||
$task->state = "success";
|
||||
$task->percent_complete = ($context["counter"] / (float)$context["total"]) * 100;
|
||||
$task->done = $context["counter"] == (float)$context["total"];
|
||||
}
|
||||
}
|
||||
@@ -12,13 +12,13 @@ function open_close_branch(path, id) {
|
||||
$.ajax({
|
||||
url: GET_CHILDREN_URL.replace("__PATH__", path),
|
||||
success: function(data, textStatus) {
|
||||
children.html(data);
|
||||
parent.removeClass("gLoadingSmall");
|
||||
children.html(data);
|
||||
parent.removeClass("gLoadingSmall");
|
||||
|
||||
// Propagate checkbox value
|
||||
children.find("input[type=checkbox]").attr(
|
||||
"checked", parent.find("input[type=checkbox]:first").attr("checked"));
|
||||
},
|
||||
// Propagate checkbox value
|
||||
children.find("input[type=checkbox]").attr(
|
||||
"checked", parent.find("input[type=checkbox]:first").attr("checked"));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -54,202 +54,38 @@ function click_node(checkbox) {
|
||||
}
|
||||
}
|
||||
|
||||
/* ================================================================================ */
|
||||
|
||||
/*
|
||||
var paused = false;
|
||||
var task = null;
|
||||
|
||||
$("#gServerAdd").ready(function() {
|
||||
init_server_add_form();
|
||||
});
|
||||
|
||||
function init_server_add_form() {
|
||||
$("#gServerAdd #gServerAddButton").click(function(event) {
|
||||
do_add(this, event);
|
||||
function start_add() {
|
||||
var paths = [];
|
||||
$.each($("#gServerAdd :checkbox[checked]"), function () {
|
||||
paths.push(this.value);
|
||||
});
|
||||
$("#gServerAdd #gServerPauseButton").click(function(event) {
|
||||
event.preventDefault();
|
||||
paused = true;
|
||||
});
|
||||
$(".gProgressBar").progressbar();
|
||||
$("#gServerAddTree ul").css("display", "block");
|
||||
$("#gServerAdd form").bind("form_closing", function(target) {
|
||||
if (task != null && !task.done) {
|
||||
$.ajax({async: false,
|
||||
success: function(data, textStatus) {
|
||||
document.location.reload();
|
||||
},
|
||||
dataType: "json",
|
||||
type: "POST",
|
||||
url: get_url("server_add/pause", task.id)
|
||||
});
|
||||
} else {
|
||||
document.location.reload();
|
||||
}
|
||||
});
|
||||
set_click_events();
|
||||
}
|
||||
|
||||
function set_click_events() {
|
||||
$(".ui-icon").unbind("click");
|
||||
$(":checkbox").unbind("click");
|
||||
$(".ui-icon").click(function(event) {
|
||||
open_close_branch(this, event);
|
||||
});
|
||||
|
||||
$("input[type=checkbox]").click(function(event) {
|
||||
checkbox_click(this);
|
||||
});
|
||||
}
|
||||
|
||||
function open_close_branch(icon, event) {
|
||||
var parent = icon.parentNode;
|
||||
var closed = $(icon).hasClass("ui-icon-plus");
|
||||
var children = $(parent).find(".gCheckboxTree");
|
||||
|
||||
if (closed) {
|
||||
if (children.length == 0) {
|
||||
load_children(icon);
|
||||
} else {
|
||||
toggle_branch("open", icon);
|
||||
}
|
||||
} else {
|
||||
toggle_branch("close", icon);
|
||||
}
|
||||
}
|
||||
|
||||
function toggle_branch(direction, icon) {
|
||||
var parent = icon.parentNode;
|
||||
var branch = $(parent).children(".gServerAddChildren");
|
||||
$(branch).slideToggle("fast", function() {
|
||||
if (direction == "open") {
|
||||
$(icon).addClass("ui-icon-minus");
|
||||
$(icon).removeClass("ui-icon-plus");
|
||||
$(parent).removeClass("gCollapsed");
|
||||
} else {
|
||||
$(icon).addClass("ui-icon-plus");
|
||||
$(icon).removeClass("ui-icon-minus");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function get_url(uri, task_id) {
|
||||
var url = $("#gServerAdd form").attr("action");
|
||||
url = url.replace("__ARGS__", uri);
|
||||
url = url.replace("__TASK_ID__", !task_id ? "" : "/" + task_id);
|
||||
return url;
|
||||
}
|
||||
|
||||
function load_children(icon) {
|
||||
$("#gDialog").addClass("gDialogLoadingLarge");
|
||||
var parent = icon.parentNode;
|
||||
var checkbox = $(parent).find("input[type=checkbox]");
|
||||
var parms = "&path=" + $(checkbox).attr("value");
|
||||
parms += "&checked=" + $(checkbox).is(":checked");
|
||||
parms += "&collapsed=" + $(parent).hasClass("gCollapsed");
|
||||
|
||||
$.ajax({success: function(data, textStatus) {
|
||||
$(parent).children(".gServerAddChildren").html(data);
|
||||
set_click_events();
|
||||
$("#gDialog").removeClass("gDialogLoadingLarge");
|
||||
toggle_branch("open", icon);
|
||||
},
|
||||
data: parms,
|
||||
dataType: "html",
|
||||
type: "POST",
|
||||
url: get_url("server_add/children")
|
||||
});
|
||||
}
|
||||
|
||||
function do_add(submit, event) {
|
||||
event.preventDefault();
|
||||
|
||||
$("#gServerAdd #gServerAddButton").hide();
|
||||
$("#gServerAdd #gServerPauseButton").show();
|
||||
|
||||
var parms = "";
|
||||
if (!paused) {
|
||||
$(".gProgressBar").progressbar("value", 0);
|
||||
$(".gProgressBar").css("visibility", "visible");
|
||||
var check_list = $("#gServerAdd :checkbox[checked]");
|
||||
|
||||
var paths = "";
|
||||
var collapsed = "";
|
||||
$.each(check_list, function () {
|
||||
var parent = $(this).parents("li")[0];
|
||||
paths += "&path[]=" + this.value;
|
||||
collapsed += "&collapsed[]=" + $(parent).hasClass("gCollapsed");
|
||||
});
|
||||
parms = paths + collapsed;
|
||||
}
|
||||
paused = false;
|
||||
|
||||
$.ajax({async: false,
|
||||
data: parms,
|
||||
$.ajax({
|
||||
url: START_URL,
|
||||
type: "POST",
|
||||
async: false,
|
||||
data: { "paths[]": paths },
|
||||
dataType: "json",
|
||||
success: function(data, textStatus) {
|
||||
var done = data.task.done;
|
||||
if (done) {
|
||||
task = null;
|
||||
$("body").append("<div id='gNoFilesDialog'>" + data.task.status + "</div>");
|
||||
|
||||
$("#gNoFilesDialog").dialog({modal: true,
|
||||
autoOpen: true,
|
||||
title: FILE_IMPORT_WARNING});
|
||||
$(".gProgressBar").css("visibility", "hidden");
|
||||
$("#gServerAdd #gServerAddButton").show();
|
||||
$("#gServerAdd #gServerPauseButton").hide();
|
||||
return;
|
||||
}
|
||||
task = data.task;
|
||||
var url = data.url;
|
||||
while (!done && !paused) {
|
||||
$.ajax({async: false,
|
||||
success: function(data, textStatus) {
|
||||
$(".gProgressBar").progressbar("value", data.task.percent_complete);
|
||||
done = data.task.done;
|
||||
},
|
||||
error: function(XMLHttpRequest, textStatus, errorThrown) {
|
||||
paused = true;
|
||||
display_upload_error(XMLHttpRequest.responseText);
|
||||
},
|
||||
dataType: "json",
|
||||
type: "POST",
|
||||
url: url
|
||||
});
|
||||
}
|
||||
if (!paused) {
|
||||
$.ajax({async: false,
|
||||
success: function(data, textStatus) {
|
||||
document.location.reload();
|
||||
},
|
||||
dataType: "json",
|
||||
type: "POST",
|
||||
url: get_url("server_add/finish", task.id)
|
||||
});
|
||||
} else {
|
||||
$("#gServerAdd #gServerAddButton").show();
|
||||
$("#gServerAdd #gServerPauseButton").hide();
|
||||
}
|
||||
},
|
||||
type: "POST",
|
||||
url: get_url("server_add/start")
|
||||
$("#gServerAdd .gProgressBar").progressbar("value", data.percent_complete);
|
||||
setTimeout(function() { run_add(data.url); }, 0);
|
||||
}
|
||||
});
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
function display_upload_error(error) {
|
||||
$("body").append("<div id=\"gServerAddError\" title=\"" + FATAL_ERROR + "\">" + error + "</div>");
|
||||
$("#gServerAddError").dialog({
|
||||
autoOpen: true,
|
||||
autoResize: false,
|
||||
modal: true,
|
||||
resizable: true,
|
||||
width: 610,
|
||||
height: $("#gDialog").height()
|
||||
});
|
||||
function run_add(url) {
|
||||
$.ajax({
|
||||
url: url,
|
||||
async: false,
|
||||
dataType: "json",
|
||||
success: function(data, textStatus) {
|
||||
$("#gServerAdd .gProgressBar").progressbar("value", data.percent_complete);
|
||||
if (data.done) {
|
||||
$("#gServerAdd .gProgressBar").slideUp();
|
||||
} else {
|
||||
setTimeout(function() { run_add(url); }, 0);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
*/
|
||||
|
||||
21
modules/server_add/models/server_add_file.php
Normal file
21
modules/server_add/models/server_add_file.php
Normal file
@@ -0,0 +1,21 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.");
|
||||
/**
|
||||
* Gallery - a web based photo album viewer and editor
|
||||
* Copyright (C) 2000-2009 Bharat Mediratta
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or (at
|
||||
* your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
class Server_Add_File_Model extends ORM {
|
||||
}
|
||||
@@ -1,3 +1,3 @@
|
||||
name = Server Add
|
||||
description = Allows authorized users to load images directly from your web server
|
||||
version = 1
|
||||
version = 2
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<?php defined("SYSPATH") or die("No direct script access.") ?>
|
||||
<script type="text/javascript">
|
||||
var GET_CHILDREN_URL = "<?= url::site("server_add/children?path=__PATH__") ?>";
|
||||
var START_URL = "<?= url::site("server_add/start?item_id={$item->id}&csrf=$csrf") ?>";
|
||||
</script>
|
||||
|
||||
<div id="gServerAdd">
|
||||
@@ -18,18 +19,28 @@
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<?= form::open(url::abs_site("server_add/add"), array("method" => "post")) ?>
|
||||
<?= form::open(url::abs_site("server_add/start/$item->id"), array("method" => "post")) ?>
|
||||
<?= access::csrf_form_field(); ?>
|
||||
<ul id="gServerAddTree" class="gCheckboxTree">
|
||||
<?= $tree ?>
|
||||
</ul>
|
||||
|
||||
<div class="gProgressBar" style="display: none"></div>
|
||||
|
||||
<span>
|
||||
<input id="gServerAddPauseButton" class="submit ui-state-disabled" disabled="disabled" type="submit"
|
||||
value="<?= t("Pause") ?>" style="display: none">
|
||||
<input id="gServerAddAddButton" class="submit ui-state-disabled" disabled="disabled" type="submit"
|
||||
value="<?= t("Add") ?>">
|
||||
<input id="gServerAddAddButton" class="submit ui-state-disabled" disabled="disabled"
|
||||
type="submit" value="<?= t("Add") ?>">
|
||||
</span>
|
||||
<?= form::close() ?>
|
||||
<div class="gProgressBar" style="visibility: hidden" ></div>
|
||||
<script type="text/javascript">
|
||||
$("#gServerAddAddButton").ready(function() {
|
||||
$("#gServerAddAddButton").click(function(event) {
|
||||
event.preventDefault();
|
||||
$("#gServerAdd .gProgressBar").
|
||||
progressbar().
|
||||
progressbar("value", 0).
|
||||
slideDown("fast", function() { start_add() });
|
||||
});
|
||||
});
|
||||
</script>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user