Merge pull request #229 from appwrite/fix-cli-issues

eldadfux · web-flow · commit dafc5fabf113 · 2021-07-06T16:30:16.000+03:00
feat(cli): move services from app/Appwrite/services to app/
diff --git a/src/SDK/Language/CLI.php b/src/SDK/Language/CLI.php
@@ -192,26 +192,26 @@ public function getFiles()
             ],
             [
                 'scope'         => 'service',
-                'destination'   => '/app/{{ spec.title | caseUcfirst}}/services/{{service.name | caseDash}}.php',
-                'template'      => 'cli/app/services/service.php.twig',
+                'destination'   => '/app/{{service.name | caseDash}}.php',
+                'template'      => 'cli/app/service.php.twig',
                 'minify'        => false,
             ],
             [
                 'scope'         => 'default',
-                'destination'   => 'app/{{ spec.title | caseUcfirst}}/services/client.php',
-                'template'      => 'cli/app/services/client.php.twig',
+                'destination'   => 'app/client.php',
+                'template'      => 'cli/app/client.php.twig',
                 'minify'        => false,
             ],
             [
                 'scope'         => 'default',
-                'destination'   => 'app/{{ spec.title | caseUcfirst}}/services/help.php',
-                'template'      => 'cli/app/services/help.php.twig',
+                'destination'   => 'app/help.php',
+                'template'      => 'cli/app/help.php.twig',
                 'minify'        => false,
             ],
             [
                 'scope'         => 'default',
-                'destination'   => 'app/{{ spec.title | caseUcfirst}}/services/init.php',
-                'template'      => 'cli/app/services/init.php.twig',
+                'destination'   => 'app/init.php',
+                'template'      => 'cli/app/init.php.twig',
                 'minify'        => false,
             ],
             [
diff --git a/templates/cli/app/client.php.twig b/templates/cli/app/client.php.twig
diff --git a/templates/cli/app/help.php.twig b/templates/cli/app/help.php.twig
diff --git a/templates/cli/app/init.php.twig b/templates/cli/app/init.php.twig
@@ -10,7 +10,7 @@ use Utopia\Validator\Wildcard;
 use Utopia\CLI\Console;
 use {{ spec.title | caseUcfirst }}\Parser;
 
-const USER_PREFERENCES_FILE = __DIR__."/../../.preferences/.prefs.json";
+const USER_PREFERENCES_FILE = __DIR__."/.preferences/.prefs.json";
 const PREFERENCE_ENDPOINT = "endpoint";
 
 /**
diff --git a/templates/cli/app/service.php.twig b/templates/cli/app/service.php.twig
@@ -63,20 +63,20 @@ $cli
 {% for parameter in method.parameters.body %}
 {% if parameter.type == 'file' and method.packaging %}
         ${{ parameter.name | caseCamel }} = \urldecode(${{ parameter.name | caseCamel }});
-        $cloudFunctionPath = realpath(__DIR__.'/../../../files/'.${{ parameter.name | caseCamel }});
+        $cloudFunctionPath = realpath(__DIR__.'/../files/'.${{ parameter.name | caseCamel }});
         $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));
         $params['{{ parameter.name }}'] = $cFile;
 {% elseif parameter.type == 'file' %}
-        ${{ parameter.name | caseCamel }} = realpath(__DIR__.'/../../../files/'.\urldecode(${{ parameter.name | caseCamel }}));
+        ${{ parameter.name | caseCamel }} = realpath(__DIR__.'/../files/'.\urldecode(${{ parameter.name | caseCamel }}));
         if (file_exists(${{ parameter.name | caseCamel }}) === false ) {
             throw new Exception("Path doesn't exist. Please ensure that the path is within the current directory. "); 
         }
diff --git a/templates/cli/bin/client.twig b/templates/cli/bin/client.twig
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [[ $# -eq 0 ]]; then
-   php /usr/local/code/app/{{ spec.title | caseUcfirst}}/services/client.php help
+   php /usr/local/code/app/client.php help
 else
-   php /usr/local/code/app/{{ spec.title | caseUcfirst}}/services/client.php $@
+   php /usr/local/code/app/client.php $@
 fi
diff --git a/templates/cli/bin/help.twig b/templates/cli/bin/help.twig
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-php /usr/local/code/app/{{ spec.title | caseUcfirst}}/services/help.php $@
+php /usr/local/code/app/help.php $@
diff --git a/templates/cli/bin/init.twig b/templates/cli/bin/init.twig
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-php /usr/local/code/app/{{ spec.title | caseUcfirst}}/services/init.php init $@
+php /usr/local/code/app/init.php init $@
diff --git a/templates/cli/bin/service.twig b/templates/cli/bin/service.twig
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [[ $# -eq 0 ]]; then
-   php /usr/local/code/app/{{ spec.title | caseUcfirst}}/services/{{service.name | caseDash}}.php help
+   php /usr/local/code/app/{{service.name | caseDash}}.php help
 else
-   php /usr/local/code/app/{{ spec.title | caseUcfirst}}/services/{{service.name | caseDash}}.php $@
+   php /usr/local/code/app/{{service.name | caseDash}}.php $@
 fi
diff --git a/templates/cli/bin/version.twig b/templates/cli/bin/version.twig
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-php /usr/local/code/app/{{ spec.title | caseUcfirst}}/services/client.php version
+php /usr/local/code/app/client.php version
diff --git a/templates/cli/src/Client.php.twig b/templates/cli/src/Client.php.twig
@@ -261,7 +261,13 @@ class Client
         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/templates/cli/src/Parser.php.twig b/templates/cli/src/Parser.php.twig
@@ -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 @@ class Parser {
         $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
`@@ -1,3 +1,3 @@`
`1`	`1`	`#!/bin/sh`
`2`	`2`
`3`		`-php /usr/local/code/app/{{ spec.title \| caseUcfirst}}/services/help.php $@`
	`3`	`+php /usr/local/code/app/help.php $@`