Fix #465, PLUploader chunking on FTP, S3, SMB & Dropbox

pydio · Jul 31, 2014 · e6bf981 · e6bf981
1 parent 0f78b5e
commit e6bf981
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 7 deletions.
diff --git a/core/src/plugins/access.fs/class.fsAccessDriver.php b/core/src/plugins/access.fs/class.fsAccessDriver.php
@@ -753,7 +753,7 @@ public function switchAction($action, $httpVars, $fileVars)
                     return array("ERROR" => array("CODE" => $errorCode, "MESSAGE" => $errorMessage));
                 } else {
                     $this->logDebug("Return success");
-                    if($already_existed){
+                    if(isSet($already_existed) && $already_existed === true){
                         return array("SUCCESS" => true, "UPDATED_NODE" => $createdNode);
                     }else{
                         return array("SUCCESS" => true, "CREATED_NODE" => $createdNode);

diff --git a/core/src/plugins/access.s3/class.s3AccessDriver.php b/core/src/plugins/access.s3/class.s3AccessDriver.php
@@ -90,6 +90,11 @@ public function isWriteable($dir, $type="dir")
         return true;
     }
 
+    public static function isRemote()
+    {
+        return true;
+    }
+
     public function loadNodeInfo(&$node, $parentNode = false, $details = false)
     {
         parent::loadNodeInfo($node, $parentNode, $details);

diff --git a/core/src/plugins/uploader.plupload/class.PluploadProcessor.php b/core/src/plugins/uploader.plupload/class.PluploadProcessor.php
@@ -60,6 +60,7 @@ public function unifyChunks($action, &$httpVars, &$fileVars)
             }
             $plugin = AJXP_PluginsService::findPlugin("access", $repository->getAccessType());
             $streamData = $plugin->detectStreamWrapper(true);
+            $wrapperName = $streamData["classname"];
             $dir = AJXP_Utils::securePath($httpVars["dir"]);
             $destStreamURL = $streamData["protocol"]."://".$repository->getId().$dir."/";
 
@@ -71,11 +72,19 @@ public function unifyChunks($action, &$httpVars, &$fileVars)
                 // Make tmp folder a bit more unique using secure_token
                 $tmpFolder = $destCopy."/".$httpVars["secure_token"];
                 if(!is_dir($tmpFolder)){
-                    @mkdir($destCopy."/".$httpVars["secure_token"], 0700, true);
+                    @mkdir($tmpFolder, 0700, true);
                 }
                 $target = $tmpFolder.'/'.$filename;
                 $fileVars["file"]["destination"] = base64_encode($dir);
+            }else if(call_user_func(array($wrapperName, "isRemote"))){
+                $remote = true;
+                $tmpFolder = AJXP_Utils::getAjxpTmpDir()."/".$httpVars["secure_token"];
+                if(!is_dir($tmpFolder)){
+                    @mkdir($tmpFolder, 0700, true);
+                }
+                $target = $tmpFolder.'/'.$filename;
             }else{
+
                 $target = $destStreamURL.$filename;
             }
 
@@ -138,10 +147,20 @@ public function unifyChunks($action, &$httpVars, &$fileVars)
                 if(!$remote){
                     AJXP_Controller::applyHook("node.change", array(null, new AJXP_Node($destStreamURL.$filename), false));
                 }else{
-                    $fileVars["file"]["tmp_name"] = $target;
-                    $fileVars["file"]["name"] = $filename;
-                    $driver->storeFileToCopy($fileVars["file"]);
-                    AJXP_Controller::findActionAndApply("next_to_remote", array(), array());
+                    if(method_exists($driver, "storeFileToCopy")){
+                        $fileVars["file"]["tmp_name"] = $target;
+                        $fileVars["file"]["name"] = $filename;
+                        $driver->storeFileToCopy($fileVars["file"]);
+                        AJXP_Controller::findActionAndApply("next_to_remote", array(), array());
+                    }else{
+                        // Remote Driver case: copy temp file to destination
+                        $node = new AJXP_Node($destStreamURL.$filename);
+                        AJXP_Controller::applyHook("node.before_create", array($node, filesize($target)));
+                        AJXP_Controller::applyHook("node.before_change", array(new AJXP_Node($destStreamURL)));
+                        $res = copy($target, $destStreamURL.$filename);
+                        if($res) @unlink($target);
+                        AJXP_Controller::applyHook("node.change", array(null, $node, false));
+                    }
                 }
             }
             // Return JSON-RPC response

diff --git a/core/src/plugins/uploader.plupload/pluploader_tpl.html b/core/src/plugins/uploader.plupload/pluploader_tpl.html
@@ -97,7 +97,7 @@
 		});
 		Uploader.bind('FileUploaded', function(up, file, res) {
 			if(this.total.queued <= 1) {
-				//parent.ajaxplorer.fireContextRefresh();
+				parent.ajaxplorer.fireContextRefresh();
                 parent.document.fire("ajaxplorer:longtask_finished");
 			}
 			$.get(upurl);