Fixing caching and access to webdav and dropbox

pydio · Jun 24, 2016 · d1f09f5 · d1f09f5
1 parent f946643
commit d1f09f5
Show file tree

Hide file tree

Showing 20 changed files with 406 additions and 494 deletions.
diff --git a/core/src/plugins/access.dropbox/src/Driver.php b/core/src/plugins/access.dropbox/src/Driver.php
@@ -96,9 +96,12 @@ public function switchAction(ServerRequestInterface &$request, ResponseInterface
 
     /********************************************************
      * Static functions used in the JSON service description
-     ********************************************************/
-    public static function convertPath($value) {
-        $node = new AJXP_Node($value);
+     *******************************************************
+     * @param AJXP_Node $node
+     * @return string
+     */
+
+    public static function convertPath(AJXP_Node $node) {
         $path = $node->getPath();
 
         if (isset($path)) {

diff --git a/core/src/plugins/access.dropbox/src/Resources/dropbox.json b/core/src/plugins/access.dropbox/src/Resources/dropbox.json
@@ -10,7 +10,7 @@
       "parameters" : {
         "path" : {
           "required" : true,
-          "type" : "string",
+          "type" : "object",
           "location" : "json",
           "sentAs": "path",
           "filters": [{
@@ -28,7 +28,7 @@
       "parameters" : {
         "path" : {
           "required" : true,
-          "type" : "string",
+          "type" : "object",
           "location" : "header",
           "sentAs": "Dropbox-API-Arg",
           "filters": [{
@@ -47,7 +47,7 @@
       "parameters" : {
         "path" : {
           "required" : true,
-          "type" : "string",
+          "type" : "object",
           "location" : "json",
           "sentAs": "path",
           "filters": [{
@@ -63,7 +63,7 @@
       "parameters" : {
         "path" : {
           "required" : true,
-          "type" : "string",
+          "type" : "object",
           "location" : "json",
           "sentAs": "path",
           "filters": [{
@@ -79,7 +79,7 @@
       "parameters" : {
         "path" : {
           "required" : true,
-          "type" : "string",
+          "type" : "object",
           "location" : "json",
           "sentAs": "path",
           "filters": [{

diff --git a/core/src/plugins/access.webdav/src/Client.php b/core/src/plugins/access.webdav/src/Client.php
diff --git a/core/src/plugins/access.webdav/src/Driver.php b/core/src/plugins/access.webdav/src/Driver.php
@@ -26,11 +26,11 @@
 
 require_once(__DIR__ . '/../vendor/autoload.php');
 
+use GuzzleHttp\Command\Guzzle\Parameter;
 use Pydio\Access\Core\Model\AJXP_Node;
-use Pydio\Access\Core\Stream\Listener\PathListener;
+use Pydio\Access\Core\Stream\Listener\PathSubscriber;
 use Pydio\Access\Core\Stream\Stream;
 use Pydio\Access\Driver\StreamProvider\FS\FsAccessDriver;
-use Pydio\Access\DropBox\Listener\DropBoxSubscriber;
 use Pydio\Access\WebDAV\Listener\WebDAVSubscriber;
 use Pydio\Core\Model\ContextInterface;
 
@@ -69,7 +69,7 @@ protected function initRepository(ContextInterface $context)
 
         Stream::addContextOption($context, [
             "subscribers" => [
-                new PathListener(),
+                new PathSubscriber(),
                 new WebDAVSubscriber()
             ]
         ]);
@@ -79,11 +79,10 @@ protected function initRepository(ContextInterface $context)
 
     /********************************************************
      * Static functions used in the JSON service description
-     *******************************************************
+     ******************************************************
      * @param AJXP_Node $node
+     * @return string
      */
-
-
     public static function convertPath($node) {
 
         $ctx = $node->getContext();
@@ -99,10 +98,10 @@ public static function convertPath($node) {
         return $basePath;
     }
 
-    public static function convertToJSON($key, $value) {
-        $key = '' . $key->getName();
-        $value = '' . $value;
-        $arr = [$key => $value];
-        return json_encode($arr);
+    public static function convertTime($date) {
+        $date = date_create($date);
+
+        return date_timestamp_get($date);
     }
+
 }