Merge pull request #1 from codebendercc/development

Development

Author: fpapadopou

Symfony/src/Codebender/ApiBundle/Controller/DefaultController.php

@@ -22,49 +22,6 @@ public function statusAction()
         return new Response(json_encode(array("success" => true, "status" => "OK")));
     }
 
-    /**
-     * compileWebsite action
-     *
-     * @return Response Response intance.
-     *
-     */
-    public function compileWebsiteAction($auth_key, $version)
-    {
-
-        if ($auth_key !== $this->container->getParameter('auth_key'))
-        {
-            return new Response(json_encode(array("success" => false, "step" => 0, "message" => "Invalid authorization key.")));
-        }
-
-        if ($version !== $this->container->getParameter('version'))
-        {
-            return new Response(json_encode(array("success" => false, "step" => 0, "message" => "Invalid api version.")));
-        }
-
-        $request = $this->getRequest()->getContent();
-
-        $contents = json_decode($request, true);
-
-        $apihandler = $this->get('codebender_api.handler');
-
-        $personalMatchedLibs = $contents['libraries'];
-
-        $files = $contents["files"];
-
-        $headersArr = $this->checkHeaders($files, $personalMatchedLibs);
-
-        $contents["libraries"] = $headersArr['libraries'];
-        $request_content = json_encode($contents);
-
-        // perform the actual post to the compiler
-        $data = $apihandler->post_raw_data($this->container->getParameter('compiler'), $request_content);
-        $decoded_compiler_data = json_decode($data, true);
-
-        $responsedata = array('success' => true, 'personal' => array_keys($personalMatchedLibs), 'library' => $headersArr['libraries'], 'foundFiles' => $headersArr['foundFiles'], 'notFoundHeaders' => $headersArr['notFoundHeaders'], 'compileResponse' => $decoded_compiler_data);
-
-        return new Response(json_encode($responsedata));
-    }
-
     /**
      * compile action
      *
@@ -76,85 +33,135 @@ public function compileAction($auth_key, $version)
 
         if ($auth_key !== $this->container->getParameter('auth_key'))
         {
-            return new Response(json_encode(array("success" => false, "step" => 0, "message" => "Invalid authorization key.")));
+            return new Response(json_encode(array("success" => false, "message" => "Invalid authorization key.")));
         }
 
         if ($version !== $this->container->getParameter('version'))
         {
-            return new Response(json_encode(array("success" => false, "step" => 0, "message" => "Invalid api version.")));
+            return new Response(json_encode(array("success" => false, "message" => "Invalid api version.")));
         }
 
         $request = $this->getRequest()->getContent();
+        if (empty($request))
+        {
+            return new Response(json_encode(array("success" => false, "message" => "Invalid input.")));
+        }
 
         $contents = json_decode($request, true);
 
         $apihandler = $this->get('codebender_api.handler');
 
         $files = $contents["files"];
 
+        $this->checkForUserProject($files);
+
         $userlibs = array();
+
         if (array_key_exists('libraries', $contents))
             $userlibs = $contents['libraries'];
 
-        $headersArr = $this->checkHeaders($files, $userlibs);
+        $parsedLibs = $this->checkHeaders($files, $userlibs);
 
-        $contents['files'][] = array('filename' => 'user_null.txt', 'content' => '');
-        $contents['files'][] = array('filename' => 'null.txt', 'content' => '');
+        $contents["libraries"] = $parsedLibs['libraries'];
 
-        $contents["libraries"] = $headersArr['libraries'];
         $request_content = json_encode($contents);
 
         // perform the actual post to the compiler
         $data = $apihandler->post_raw_data($this->container->getParameter('compiler'), $request_content);
 
-        return new Response($data);
+        $decoded = json_decode($data, true);
+        if ($decoded == null)
+        {
+            return new Response(json_encode(array("success" => false, "message"=> "Failed to get compiler response.")));
+        }
+
+        if ($decoded["success"] === false && !array_key_exists("step", $decoded))
+            $decoded["step"] = "unknown";
+
+        unset($parsedLibs['libraries']);
+        $decoded['additionalCode'] = $parsedLibs;
+
+        return new Response(json_encode($decoded));
     }
 
     /**
      *
-     * @param type $files
-     * @param array $personalLibs
+     * @param array $files
+     * @param array $userLibs
      *
-     * @return type
+     * @return array
      */
-    protected function checkHeaders($files,  array $personalLibs)
+    protected function checkHeaders($files,  array $userlibs)
     {
         $apiHandler = $this->get('codebender_api.handler');
 
         $headers = $apiHandler->read_libraries($files);
 
         // declare arrays
-        $libraries = $notFoundHeaders = $foundFiles = array();
+        $libraries = $notFoundHeaders = $foundHeaders = $fetchedLibs = $providedLibs = array();
+
+        $providedLibs = array_keys($userlibs);
 
         // get library manager url
         $libmanager_url = $this->container->getParameter('library');
 
-        $libraries = $personalLibs;
+        $libraries = $userlibs;
 
         foreach ($headers as $header) {
-            $foundPersonal = false;
-            foreach ($personalLibs as $plibrary){
-                foreach ($plibrary as $libcontent){
-                    if ($libcontent["filename"] == $header.".h")
-                        $foundPersonal = true;
+
+            $exists_in_request = false;
+            foreach ($userlibs as $lib){
+                foreach ($lib as $libcontent){
+                    if ($libcontent["filename"] == $header.".h") {
+                        $exists_in_request = true;
+                        $foundHeaders[] = $header . ".h";
+                    }
                 }
             }
-            if ($foundPersonal === false) {
+            if ($exists_in_request === false) {
 
                 $data = $apiHandler->get($libmanager_url . "/fetch?library=" . urlencode($header));
                 $data = json_decode($data, true);
 
                 if ($data["success"]) {
+                    $fetchedLibs[] = $header;
+
                     $libraries[$header] = $data["files"];
-                    foreach ($data['files'] as $file) {
-                        $foundFiles[] = $file['filename'];
-                    }
+                    $foundHeaders[] = $header . ".h";
+
                 } elseif (!$data['success']){
                     $notFoundHeaders[] = $header . ".h";
                 }
             }
         }
-        return array('libraries' => $libraries, 'foundFiles' => $foundFiles, 'notFoundHeaders' => $notFoundHeaders);
+
+        return array(
+            'libraries' => $libraries,
+            'providedLibraries' => $providedLibs,
+            'fetchedLibraries' => $fetchedLibs,
+            'detectedHeaders'=> $headers,
+            'foundHeaders' => $foundHeaders,
+            'notFoundHeaders' => $notFoundHeaders);
+    }
+
+    /**
+      *
+      * @param array $files
+      * Checks if project id and user id txt files exist in the request files.
+      * If not, creates these files with null id
+     *
+      */
+    protected function checkForUserProject(&$files)
+    {
+        $foundProj = $foundUsr = false;
+
+        foreach ($files as $file) {
+            if (preg_match('/(?<=user_)[\d]+/', $file['filename'])) $foundUsr = true;
+            if (preg_match('/(?<=project_)[\d]+/', $file['filename'])) $foundProj = true;
+        }
+
+        if (!$foundUsr) $files[] = array('filename' => 'user_null.txt', 'content' => '');
+        if (!$foundProj) $files[] = array('filename' => 'project_null.txt', 'content' => '');
     }
 }
 

Symfony/src/Codebender/ApiBundle/Resources/config/routing.yml

@@ -2,14 +2,8 @@ CodebenderApiBundle_status_check:
     pattern:  /status
     defaults: { _controller: CodebenderApiBundle:Default:status }
 
-CodebenderApiBundle_cb_website_compile:
-    pattern:    /{auth_key}/{version}/website/compile
-    defaults: { _controller: CodebenderApiBundle:Default:compileWebsite }
-    requirements:
-       _method:  POST
-
 CodebenderApiBundle_compile:
     pattern:    /{auth_key}/{version}/compile
     defaults: { _controller: CodebenderApiBundle:Default:compile }
     requirements:
-       _method:  POST
+      _method: POST