feat(general): updates for 0.9

christyjacob4 · christyjacob4 · commit 90efaa011c7e · 2021-07-07T15:17:57.000+05:30
diff --git a/app/account.php b/app/account.php
diff --git a/app/avatars.php b/app/avatars.php
diff --git a/app/client.php b/app/client.php
diff --git a/app/database.php b/app/database.php
diff --git a/app/functions.php b/app/functions.php
@@ -308,14 +308,15 @@
         $params = [];
         /** Body Params */
         $params['command'] = $command;
-        $cloudFunctionPath = realpath(__DIR__.'/../../../files/'.$code);
-        $cloudFunctionParentDir = dirname($cloudFunctionPath, 1);
-        $cloudFunctionDirName = basename($cloudFunctionPath);
+        $code = \urldecode($code);
+        $cloudFunctionPath = realpath(__DIR__.'/../files/'.$code);
+        $cloudFunctionParentDir = escapeshellarg(dirname($cloudFunctionPath, 1));
+        $cloudFunctionDirName = escapeshellarg(basename($cloudFunctionPath));
         if (file_exists($cloudFunctionPath) === false ) {
             throw new Exception("Path doesn't exist. Please ensure that the path is within the current directory. "); 
         }
         $archiveName = 'code.tar.gz';
-        $volumeMountPoint = realpath(__DIR__.'/../../../files/');
+        $volumeMountPoint = realpath(__DIR__.'/../files/');
         exec("tar -zcvf $archiveName -C $cloudFunctionParentDir $cloudFunctionDirName && mv $archiveName $volumeMountPoint");
         $archivePath = realpath($volumeMountPoint."/$archiveName");
         $cFile = new \CURLFile($archivePath,  'application/x-gzip' , basename($archivePath));
diff --git a/app/health.php b/app/health.php
diff --git a/app/help.php b/app/help.php
diff --git a/app/init.php b/app/init.php
@@ -10,7 +10,7 @@
 use Utopia\CLI\Console;
 use Appwrite\Parser;
 
-const USER_PREFERENCES_FILE = __DIR__."/../../.preferences/.prefs.json";
+const USER_PREFERENCES_FILE = __DIR__."/.preferences/.prefs.json";
 const PREFERENCE_ENDPOINT = "endpoint";
 
 /**
diff --git a/app/locale.php b/app/locale.php
diff --git a/app/storage.php b/app/storage.php
@@ -84,7 +84,7 @@
         $path   = str_replace([], [], '/storage/files');
         $params = [];
         /** Body Params */
-        $file = realpath(__DIR__.'/../../../files/'.$file);
+        $file = realpath(__DIR__.'/../files/'.\urldecode($file));
         if (file_exists($file) === false ) {
             throw new Exception("Path doesn't exist. Please ensure that the path is within the current directory. "); 
         }
diff --git a/app/teams.php b/app/teams.php
diff --git a/app/users.php b/app/users.php
diff --git a/bin/account b/bin/account
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [[ $# -eq 0 ]]; then
-   php /usr/local/code/app/Appwrite/services/account.php help
+   php /usr/local/code/app/account.php help
 else
-   php /usr/local/code/app/Appwrite/services/account.php $@
+   php /usr/local/code/app/account.php $@
 fi
diff --git a/bin/avatars b/bin/avatars
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [[ $# -eq 0 ]]; then
-   php /usr/local/code/app/Appwrite/services/avatars.php help
+   php /usr/local/code/app/avatars.php help
 else
-   php /usr/local/code/app/Appwrite/services/avatars.php $@
+   php /usr/local/code/app/avatars.php $@
 fi
diff --git a/bin/client b/bin/client
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [[ $# -eq 0 ]]; then
-   php /usr/local/code/app/Appwrite/services/client.php help
+   php /usr/local/code/app/client.php help
 else
-   php /usr/local/code/app/Appwrite/services/client.php $@
+   php /usr/local/code/app/client.php $@
 fi
diff --git a/bin/database b/bin/database
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [[ $# -eq 0 ]]; then
-   php /usr/local/code/app/Appwrite/services/database.php help
+   php /usr/local/code/app/database.php help
 else
-   php /usr/local/code/app/Appwrite/services/database.php $@
+   php /usr/local/code/app/database.php $@
 fi
diff --git a/bin/functions b/bin/functions
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [[ $# -eq 0 ]]; then
-   php /usr/local/code/app/Appwrite/services/functions.php help
+   php /usr/local/code/app/functions.php help
 else
-   php /usr/local/code/app/Appwrite/services/functions.php $@
+   php /usr/local/code/app/functions.php $@
 fi
diff --git a/bin/health b/bin/health
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [[ $# -eq 0 ]]; then
-   php /usr/local/code/app/Appwrite/services/health.php help
+   php /usr/local/code/app/health.php help
 else
-   php /usr/local/code/app/Appwrite/services/health.php $@
+   php /usr/local/code/app/health.php $@
 fi
diff --git a/bin/help b/bin/help
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-php /usr/local/code/app/Appwrite/services/help.php $@
+php /usr/local/code/app/help.php $@
diff --git a/bin/init b/bin/init
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-php /usr/local/code/app/Appwrite/services/init.php init $@
+php /usr/local/code/app/init.php init $@
diff --git a/bin/locale b/bin/locale
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [[ $# -eq 0 ]]; then
-   php /usr/local/code/app/Appwrite/services/locale.php help
+   php /usr/local/code/app/locale.php help
 else
-   php /usr/local/code/app/Appwrite/services/locale.php $@
+   php /usr/local/code/app/locale.php $@
 fi
diff --git a/bin/storage b/bin/storage
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [[ $# -eq 0 ]]; then
-   php /usr/local/code/app/Appwrite/services/storage.php help
+   php /usr/local/code/app/storage.php help
 else
-   php /usr/local/code/app/Appwrite/services/storage.php $@
+   php /usr/local/code/app/storage.php $@
 fi
diff --git a/bin/teams b/bin/teams
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [[ $# -eq 0 ]]; then
-   php /usr/local/code/app/Appwrite/services/teams.php help
+   php /usr/local/code/app/teams.php help
 else
-   php /usr/local/code/app/Appwrite/services/teams.php $@
+   php /usr/local/code/app/teams.php $@
 fi
diff --git a/bin/users b/bin/users
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [[ $# -eq 0 ]]; then
-   php /usr/local/code/app/Appwrite/services/users.php help
+   php /usr/local/code/app/users.php help
 else
-   php /usr/local/code/app/Appwrite/services/users.php $@
+   php /usr/local/code/app/users.php $@
 fi
diff --git a/bin/version b/bin/version
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-php /usr/local/code/app/Appwrite/services/client.php version
+php /usr/local/code/app/client.php version
diff --git a/docs/examples/functions/create.md b/docs/examples/functions/create.md
@@ -1 +1 @@
-appwrite functions create --name="[NAME]" --execute="" --runtime="java-11" --vars="{}" --events="" --schedule="" --timeout="1" 
+appwrite functions create --name="[NAME]" --execute="" --runtime="java-11.0" --vars="{}" --events="" --schedule="" --timeout="1" 
diff --git a/install.sh b/install.sh
@@ -147,7 +147,7 @@ for x in "${@}" ; do
     _args=$_args" "$x
 done
 
-bash -c "docker run -i --rm --volume appwrite-cli:/usr/local/code/app/.preferences/ --volume $(pwd):/usr/local/code/files:rw --network host '$APPWRITE_CLI_IMAGE_NAME:$APPWRITE_CLI_IMAGE_VERSION' $_args" ' > $APPWRITE_TEMP_NAME
+bash -c "docker run -i --rm --volume appwrite-cli:/usr/local/code/app/.preferences/ --volume \"$PWD\":/usr/local/code/files:rw --network host '$APPWRITE_CLI_IMAGE_NAME:$APPWRITE_CLI_IMAGE_VERSION' $_args" ' > $APPWRITE_TEMP_NAME
 
     printf "${GREEN}🚧 Setting Permissions ${NC}\n"
     chmod +x $APPWRITE_TEMP_NAME
diff --git a/src/Client.php b/src/Client.php
@@ -274,7 +274,13 @@ public function call($method, $path = '', $headers = array(), array $params = ar
         switch (substr($responseType, 0, strpos($responseType, ';'))) {
             case 'application/json':
                 $responseBody = json_decode($responseBody, true);
-            break;
+                break;
+            default:
+                $responseBody = [
+                    "responseCode" => $responseStatus,
+                    "message" => $responseBody
+                ];
+                break;
         }
 
         if ((curl_errno($ch)/* || 200 != $responseStatus*/)) {
diff --git a/src/Parser.php b/src/Parser.php
@@ -37,24 +37,29 @@ class Parser {
     protected const headerColor = self::colors[2];
 
     /**
-     * Parse the response from the server 
+     * Parse the response body from the server 
      *
-     * @param array $response 
+     * @param $responseBody 
      * @return void
      */
-    public function parseResponse($response)
+    public function parseResponse($responseBody)
     {
-        foreach ($response as $key => $value) {
-            if (is_array($value) && count($value) !== 0 ) {
-                $this->drawKeyValue($key, '');
-                $this->drawTable($value, self::headerColor, self::tableColor);
-            } 
-            else {
-                $this->drawKeyValue($key, $value);
+        if(is_array($responseBody)) {
+            foreach ($responseBody as $key => $value) {
+                if (is_array($value) && count($value) !== 0 ) {
+                    $this->drawKeyValue($key, '');
+                    $this->drawTable($value, self::headerColor, self::tableColor);
+                } 
+                else {
+                    $this->drawKeyValue($key, $value);
+                }
             }
+        } else {
+            printf($responseBody);
         }
     }
 
+
     /**
      * Print a key value pair
      *
@@ -126,6 +131,13 @@ protected function drawTable($data, $headerColor, $tableColor) {
         $table->display();
     }
 
+
+    /**
+     * Formats an associative array of commands and descriptions using a 80 column mask
+     *
+     * @param array $arr
+     * @return void
+     */
     public function formatArray(array $arr) {
         $descriptionColumnLimit = 60;
         $commandNameColumnLimit = 20;

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@`
`84`	`84`	`$path = str_replace([], [], '/storage/files');`
`85`	`85`	`$params = [];`
`86`	`86`	`/** Body Params */`
`87`		`- $file = realpath(__DIR__.'/../../../files/'.$file);`
	`87`	`+ $file = realpath(__DIR__.'/../files/'.\urldecode($file));`
`88`	`88`	`if (file_exists($file) === false ) {`
`89`	`89`	`throw new Exception("Path doesn't exist. Please ensure that the path is within the current directory. ");`
`90`	`90`	`}`