From faabae5dae712ebff656abe8ebc493d8e031d4a3 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 7 Jul 2009 21:16:36 -0700
Subject: 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
---
 modules/server_add/helpers/server_add_task.php | 85 --------------------------
 1 file changed, 85 deletions(-)
 delete mode 100644 modules/server_add/helpers/server_add_task.php

(limited to 'modules/server_add/helpers/server_add_task.php')

diff --git a/modules/server_add/helpers/server_add_task.php b/modules/server_add/helpers/server_add_task.php
deleted file mode 100644
index 0482b47c..00000000
--- a/modules/server_add/helpers/server_add_task.php
+++ /dev/null
@@ -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"];
-  }
-}
\ No newline at end of file
-- 
cgit v1.2.3