Initial fix for containing the deletion Actions

These Controller actions are much bigger than they should be, and so the main logic should go to a Handler. Initial implementation for the 1st one (untelsted)

Author: tzikis

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

@@ -15,6 +15,7 @@
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Response;
 use Codebender\CompilerBundle\Handler\CompilerHandler;
+use Codebender\CompilerBundle\Handler\DeletionHandler;
 
 class DefaultController extends Controller
 {
@@ -78,50 +79,19 @@ public function deleteAllObjectsAction($auth_key, $version)
 		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);
+		//Get the compiler service
+		/** @var DeletionHandler $deleter */
+		$deleter = $this->get('deletion_handler');
 
-		if ($handle = opendir("$tempDir/$objectFilesDir"))
-		{
+		$deleter->deleteAllObjects($success, $fileCount, $deletionStats, $undeletedFiles);
 
-			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
+		if ($success === false)
 			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))));
+		else
+			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)

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

@@ -0,0 +1,72 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: iluvatar
+ * Date: 9/1/15
+ * Time: 4:44 AM
+ *
+ * \file
+ * \brief Functions used to delete caches (object files) from past compilations.
+ *
+ * \author Vasilis Georgitzikis
+ *
+ * \copyright (c) 2012-2015, The Codebender Development Team
+ * \copyright Licensed under the Simplified BSD License
+ */
+
+namespace Codebender\CompilerBundle\Handler;
+
+use Symfony\Bridge\Monolog\Logger;
+
+class DeletionHandler
+{
+	private $compiler_logger;
+	private $object_directory;
+
+	function __construct(Logger $logger, $objdir)
+	{
+		$this->compiler_logger = $logger;
+		$this->object_directory = $objdir;
+	}
+
+	function deleteAllObjects(&$success, &$fileCount, &$deletionStats, &$undeletedFiles)
+	{
+		$success = false;
+		$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($this->object_directory))
+		{
+			$success = true;
+
+			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($this->object_directory."/$entry") === false)
+					{
+						$deletionStats["failure_dot_$extension"]++;
+						$undeletedFiles .= $entry."\n";
+					}
+					else
+						$deletionStats["success_dot_$extension"]++;
+				}
+			}
+			closedir($handle);
+		}
+	}
+} 

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

@@ -4,6 +4,7 @@ parameters:
     utility_handler.class:	Codebender\CompilerBundle\Handler\UtilityHandler
     preprocessing_handler.class:	Codebender\CompilerBundle\Handler\PreprocessingHandler
     postprocessing_handler.class:	Codebender\CompilerBundle\Handler\PostprocessingHandler
+    deletion_handler.class:	Codebender\CompilerBundle\Handler\DeletionHandler
 
 services:
 #    codebender_compiler.example:
@@ -18,6 +19,9 @@ services:
         class:			"%preprocessing_handler.class%"
     postprocessing_handler:
         class:			"%postprocessing_handler.class%"
+    deletion_handler:
+        class:			"%deletion_handler.class%"
+        arguments:		["@compiler_logger", "%temp_dir%/%objdir%"]
     compiler_logger:
         class: Symfony\Bridge\Monolog\Logger
         arguments: [cmplr_log]