Merge pull request #14 from codebendercc/dev

Merge dev to master

Author: fpapadopou

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

@@ -69,6 +69,114 @@ public function indexAction($auth_key, $version)
 		}
 	}
 
+    public function deleteAllObjectsAction($auth_key, $version)
+    {
+        if ($this->container->getParameter('auth_key') != $auth_key)
+            return new Response(json_encode(array("success" => false, "step" => 0, "message" => "Invalid authorization key.")));
+
+        if ($version != "v1")
+            return new Response(json_encode(array("success" => false, "step" => 0, "message" => "Invalid API version.")));
+
+        $tempDir = $this->container->getParameter('temp_dir');
+        $objectFilesDir = $this->container->getParameter('objdir');
+        $fileCount = 0;
+        $undeletedFiles = "";
+        $deletionStats = array("success_dot_a" => 0,
+            "failure_dot_a" => 0,
+            "success_dot_o" => 0,
+            "failure_dot_o" => 0,
+            "success_dot_d" => 0,
+            "failure_dot_d" => 0,
+            "success_dot_LOCK" => 0,
+            "failure_dot_LOCK" => 0);
+
+        if ($handle = opendir("$tempDir/$objectFilesDir"))
+        {
+
+            while (false !== ($entry = readdir($handle)))
+            {
+                if ($entry != "." && $entry != ".." && $entry != ".DS_Store")
+                {
+                    $fileCount++;
+                    $extension = pathinfo($entry, PATHINFO_EXTENSION);
+
+                    if (!in_array($extension, array("a", "o", "d", "LOCK")))
+                        continue;
+
+                    if (@unlink("$tempDir/$objectFilesDir/$entry") === false)
+                    {
+                        $deletionStats["failure_dot_$extension"]++;
+                        $undeletedFiles .= $entry . "\n";
+                    }
+                    else
+                        $deletionStats["success_dot_$extension"]++;
+                }
+            }
+            closedir($handle);
+        }else
+            return new Response(json_encode(array("success" => false, "step" => 0, "message" => "Failed to access object files directory.")));
+
+        return new Response(json_encode(array_merge(array("success" => true,
+                "message" => "Object files deletion complete. Found $fileCount files."),
+                $deletionStats,
+                array("Files not deleted" => $undeletedFiles))));
+    }
+
+    public function deleteSpecificObjectsAction($auth_key, $version, $option, $to_delete)
+    {
+        if ($this->container->getParameter('auth_key') != $auth_key)
+            return new Response(json_encode(array("success" => false, "step" => 0, "message" => "Invalid authorization key.")));
+
+        if ($version != "v1")
+            return new Response(json_encode(array("success" => false, "step" => 0, "message" => "Invalid API version.")));
+
+        $tempDir = $this->container->getParameter('temp_dir');
+        $objectFilesDir = $this->container->getParameter('objdir');
+
+        if ($option == "core")
+            $to_delete = str_replace(":", "_", $to_delete);
+
+        $response = array();
+        $response["deleted_files"] = "";
+        $response["undeleted_files"] = "";
+
+        if ($handle = opendir("$tempDir/$objectFilesDir"))
+        {
+            while (false !== ($entry = readdir($handle)))
+            {
+                if ($entry == "." || $entry == ".." || $entry == ".DS_Store")
+                    continue;
+
+                if ($option == "library" && strpos($entry, "______" . $to_delete . "_______") === false)
+                    continue;
+
+                if ($option == "core" && strpos($entry, "_" . $to_delete . "_") === false)
+                    continue;
+
+
+                if (@unlink("$tempDir/$objectFilesDir/$entry") === false)
+                    $response["undeleted_files"] .= $entry . "\n";
+                else
+                    $response["deleted_files"] .= $entry . "\n";
+
+            }
+            closedir($handle);
+        }
+        else
+        {
+            return new Response(json_encode(array("success" => false, "step" => 0, "message" => "Failed to access object files directory.")));
+        }
+
+        if ($response["undeleted_files"] != "")
+        {
+            $message = ($option == "library") ? "Failed to delete one or more of the specified library object files.": "Failed to delete one or more of the specified core object files.";
+            return new Response(json_encode(array_merge(array("success" => false, "step" => 0, "message" => $message), $response)));
+        }
+
+        $message = ($option == "library") ? "Library deleted successfully.": "Core object files deleted successfully.";
+        return new Response(json_encode(array_merge(array("success" => true, "message" => $message), $response)));
+    }
+
 	/**
 	\brief Creates a list of the configuration parameters to be used in the compilation process.
 

Symfony/src/Codebender/CompilerBundle/Handler/CompilerHandler.php

@@ -597,6 +597,8 @@ private function doCompile($compiler_config, &$files, $dir, $CC, $CFLAGS, $CPP,
             foreach ($files[$ext] as $file)
             {
                 if($caching){
+                    $name_params['core'] = str_replace(":", "_", $name_params['core']);
+                    $name_params['variant'] = str_replace(":", "_", $name_params['variant']);
                     $object_filename = "$this->object_directory/${name_params['mcu']}_${name_params['f_cpu']}_${name_params['core']}_${name_params['variant']}_${name_params['vid']}_${name_params['pid']}______${name_params['library']}_______".((pathinfo(pathinfo($file, PATHINFO_DIRNAME), PATHINFO_FILENAME) == "utility") ? "utility_______" : "") .pathinfo($file, PATHINFO_FILENAME);
                     $object_file = $object_filename;
                     //Lock the file so that only one compiler instance (thread) will compile every library object file

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

@@ -9,3 +9,11 @@ codebender_compiler_test:
 codebender_compiler_homepage:
     pattern:  /{auth_key}/{version}
     defaults: { _controller: CodebenderCompilerBundle:Default:index }
+
+codebender_compiler_delete_all:
+    pattern:  /{auth_key}/{version}/delete/all/
+    defaults: { _controller: CodebenderCompilerBundle:Default:deleteAllObjects }
+
+codebender_compiler_delete_specific:
+    pattern:  /{auth_key}/{version}/delete/{option}/{to_delete}
+    defaults: { _controller: CodebenderCompilerBundle:Default:deleteSpecificObjects }