JuKu / JuKuCMS

system/packages/com.jukusoft.cms.tasks/classes/task.php

Indentation +145 added lines, -145 removed lines

@@ -27,151 +27,151 @@
 
 class Task {
 
-	protected $row = null;
-
-	public function __construct(array $row = array()) {
-		if (!empty($row)) {
-			$this->row = $row;
-		}
-	}
-
-	public function load (int $id) {
-		$row = Database::getInstance()->getRow("SELECT * FROM `{praefix}tasks` WHERE `id` = :id; ", array(
-			'id' => array(
-				'type' => PDO::PARAM_INT,
-				'value' => $id
-			)
-		));
-
-		if (!$row || empty($row)) {
-			throw new IllegalArgumentException("Task with id '" . $id . "' doesnt exists in database!");
-		}
-
-		$this->row = $row;
-	}
-
-	public function getID () : int {
-		return $this->row['id'];
-	}
-
-	public function getTitle () : string {
-		return $this->row['title'];
-	}
-
-	public function getType () : string {
-		return $this->row['type'];
-	}
-
-	public function getTypeParams () : array {
-		return $this->row['type_params'];
-	}
-
-	public function getFile () : string {
-		if (!PHPUtils::strEqs($this->getType(), "FILE")) {
-			throw new IllegalStateException("Task with id '" . $this->getID() . "' is not of type 'FILE', so cannot return file path in method Task::getFile().");
-		}
-
-		return $this->getTypeParams();
-	}
-
-	public function getParams () : array {
-		return unserialize($this->row['params']);
-	}
-
-	/**
-	 * try to lock task
-	 */
-	public function lock () : bool {
-		if (Cache::contains("task-locks", "task-" . $this->getID)) {
-			return false;
-		}
-
-		Cache::put("task-locks", "task-" . $this->getID, time());
-
-		return true;
-	}
-
-	public function unlock () {
-		Cache::clear("task-locks", "task-" . $this->getID);
-	}
-
-	public function execute () : bool {
-		//first try to lock task, so other scripts cannot execute same task at same time
-		if (!$this->lock()) {
-			return false;
-		}
-
-		try {
-			$array = explode(":", $this->getTypeParams());
-			$params = $this->getParams();
-
-			switch (strtolower($this->getType())) {
-				case "file":
-					$file = $this->getFile();
-
-					//check, if file exists
-					if (file_exists(ROOT_PATH . $file)) {
-						require(ROOT_PATH . $file);
-					} else {
-						throw new IllegalStateException("required file for task with id '" . $this->getID() . "' not found: " . $file);
-					}
-
-					break;
-				case "function":
-					$class_method = $array[0];
-
-					call_user_func($class_method, $params);
-					break;
-				case "class_static_method":
-					$class_name = $array[0];
-					$class_method = $array[1];
-
-					call_user_func(array($class_name, $class_method), $params);
-					break;
-				default:
-					throw new IllegalStateException("unknown task type '" . $this->getType() . "' for task id '" . $this->getID() . "'!");
-					break;
-			}
-		} catch (Exception $e) {
-			echo $e->getTraceAsString();
-		} finally {
-			//unlock task
-			$this->unlock();
-		}
-
-		return true;
-	}
-
-	/**
-	 * set last execution timestamp to now
-	 */
-	public function setLastExecution () {
-		//update database, set last execution timestamp to now
-		Database::getInstance()->execute("UPDATE `{praefix}tasks` SET `last_execution` = NOW() WHERE `id` = :id; ", array(
-			'id' => array(
-				'type' => PDO::PARAM_INT,
-				'value' => $this->getID()
-			)
-		));
-	}
-
-	public function deleteAfterExecution () : bool {
-		return $this->row['delete_after_execution'] == 1;
-	}
-
-	public function delete () {
-		//delete from database
-		Database::getInstance()->execute("DELETE FROM `{praefix}tasks` WHERE `id` = :id; ", array(
-			'id' => array(
-				'type' => PDO::PARAM_INT,
-				'value' => $this->getID()
-			)
-		));
-	}
-
-	public static function cast (Task $task) : Task {
-		return $task;
-	}
+    protected $row = null;
+
+    public function __construct(array $row = array()) {
+        if (!empty($row)) {
+            $this->row = $row;
+        }
+    }
+
+    public function load (int $id) {
+        $row = Database::getInstance()->getRow("SELECT * FROM `{praefix}tasks` WHERE `id` = :id; ", array(
+            'id' => array(
+                'type' => PDO::PARAM_INT,
+                'value' => $id
+            )
+        ));
+
+        if (!$row || empty($row)) {
+            throw new IllegalArgumentException("Task with id '" . $id . "' doesnt exists in database!");
+        }
+
+        $this->row = $row;
+    }
+
+    public function getID () : int {
+        return $this->row['id'];
+    }
+
+    public function getTitle () : string {
+        return $this->row['title'];
+    }
+
+    public function getType () : string {
+        return $this->row['type'];
+    }
+
+    public function getTypeParams () : array {
+        return $this->row['type_params'];
+    }
+
+    public function getFile () : string {
+        if (!PHPUtils::strEqs($this->getType(), "FILE")) {
+            throw new IllegalStateException("Task with id '" . $this->getID() . "' is not of type 'FILE', so cannot return file path in method Task::getFile().");
+        }
+
+        return $this->getTypeParams();
+    }
+
+    public function getParams () : array {
+        return unserialize($this->row['params']);
+    }
+
+    /**
+     * try to lock task
+     */
+    public function lock () : bool {
+        if (Cache::contains("task-locks", "task-" . $this->getID)) {
+            return false;
+        }
+
+        Cache::put("task-locks", "task-" . $this->getID, time());
+
+        return true;
+    }
+
+    public function unlock () {
+        Cache::clear("task-locks", "task-" . $this->getID);
+    }
+
+    public function execute () : bool {
+        //first try to lock task, so other scripts cannot execute same task at same time
+        if (!$this->lock()) {
+            return false;
+        }
+
+        try {
+            $array = explode(":", $this->getTypeParams());
+            $params = $this->getParams();
+
+            switch (strtolower($this->getType())) {
+                case "file":
+                    $file = $this->getFile();
+
+                    //check, if file exists
+                    if (file_exists(ROOT_PATH . $file)) {
+                        require(ROOT_PATH . $file);
+                    } else {
+                        throw new IllegalStateException("required file for task with id '" . $this->getID() . "' not found: " . $file);
+                    }
+
+                    break;
+                case "function":
+                    $class_method = $array[0];
+
+                    call_user_func($class_method, $params);
+                    break;
+                case "class_static_method":
+                    $class_name = $array[0];
+                    $class_method = $array[1];
+
+                    call_user_func(array($class_name, $class_method), $params);
+                    break;
+                default:
+                    throw new IllegalStateException("unknown task type '" . $this->getType() . "' for task id '" . $this->getID() . "'!");
+                    break;
+            }
+        } catch (Exception $e) {
+            echo $e->getTraceAsString();
+        } finally {
+            //unlock task
+            $this->unlock();
+        }
+
+        return true;
+    }
+
+    /**
+     * set last execution timestamp to now
+     */
+    public function setLastExecution () {
+        //update database, set last execution timestamp to now
+        Database::getInstance()->execute("UPDATE `{praefix}tasks` SET `last_execution` = NOW() WHERE `id` = :id; ", array(
+            'id' => array(
+                'type' => PDO::PARAM_INT,
+                'value' => $this->getID()
+            )
+        ));
+    }
+
+    public function deleteAfterExecution () : bool {
+        return $this->row['delete_after_execution'] == 1;
+    }
+
+    public function delete () {
+        //delete from database
+        Database::getInstance()->execute("DELETE FROM `{praefix}tasks` WHERE `id` = :id; ", array(
+            'id' => array(
+                'type' => PDO::PARAM_INT,
+                'value' => $this->getID()
+            )
+        ));
+    }
+
+    public static function cast (Task $task) : Task {
+        return $task;
+    }
 
 }
 

Spacing +14 added lines, -14 removed lines

@@ -35,7 +35,7 @@ 
 		}
 	}
 
-	public function load (int $id) {
+	public function load(int $id) {
 		$row = Database::getInstance()->getRow("SELECT * FROM `{praefix}tasks` WHERE `id` = :id; ", array(
 			'id' => array(
 				'type' => PDO::PARAM_INT,
@@ -50,23 +50,23 @@ 
 		$this->row = $row;
 	}
 
-	public function getID () : int {
+	public function getID() : int {
 		return $this->row['id'];
 	}
 
-	public function getTitle () : string {
+	public function getTitle() : string {
 		return $this->row['title'];
 	}
 
-	public function getType () : string {
+	public function getType() : string {
 		return $this->row['type'];
 	}
 
-	public function getTypeParams () : array {
+	public function getTypeParams() : array {
 		return $this->row['type_params'];
 	}
 
-	public function getFile () : string {
+	public function getFile() : string {
 		if (!PHPUtils::strEqs($this->getType(), "FILE")) {
 			throw new IllegalStateException("Task with id '" . $this->getID() . "' is not of type 'FILE', so cannot return file path in method Task::getFile().");
 		}
@@ -74,14 +74,14 @@ 
 		return $this->getTypeParams();
 	}
 
-	public function getParams () : array {
+	public function getParams() : array {
 		return unserialize($this->row['params']);
 	}
 
 	/**
 	 * try to lock task
 	 */
-	public function lock () : bool {
+	public function lock() : bool {
 		if (Cache::contains("task-locks", "task-" . $this->getID)) {
 			return false;
 		}
@@ -91,11 +91,11 @@ 
 		return true;
 	}
 
-	public function unlock () {
+	public function unlock() {
 		Cache::clear("task-locks", "task-" . $this->getID);
 	}
 
-	public function execute () : bool {
+	public function execute() : bool {
 		//first try to lock task, so other scripts cannot execute same task at same time
 		if (!$this->lock()) {
 			return false;
@@ -145,7 +145,7 @@ 
 	/**
 	 * set last execution timestamp to now
 	 */
-	public function setLastExecution () {
+	public function setLastExecution() {
 		//update database, set last execution timestamp to now
 		Database::getInstance()->execute("UPDATE `{praefix}tasks` SET `last_execution` = NOW() WHERE `id` = :id; ", array(
 			'id' => array(
@@ -155,11 +155,11 @@ 
 		));
 	}
 
-	public function deleteAfterExecution () : bool {
+	public function deleteAfterExecution() : bool {
 		return $this->row['delete_after_execution'] == 1;
 	}
 
-	public function delete () {
+	public function delete() {
 		//delete from database
 		Database::getInstance()->execute("DELETE FROM `{praefix}tasks` WHERE `id` = :id; ", array(
 			'id' => array(
@@ -169,7 +169,7 @@ 
 		));
 	}
 
-	public static function cast (Task $task) : Task {
+	public static function cast(Task $task) : Task {
 		return $task;
 	}
 

system/packages/com.jukusoft.cms.tasks/classes/tasks.php

Indentation +36 added lines, -36 removed lines

@@ -18,42 +18,42 @@
 
 class Tasks {
 
-	public static function schedule (int $limit = 3) {
-		//execute overdued tasks
-		foreach (self::getOverduedTasks($limit) as $task) {
-			//cast task
-			$task = Task::cast($task);
-
-			//execute task
-			$task->execute();
-
-			//check, if task is a one-time task
-			if ($task->deleteAfterExecution()) {
-				//delete task
-				$task->delete();
-			} else {
-				//update last execution timestamp
-				$task->setLastExecution();
-			}
-		}
-	}
-
-	public static function getOverduedTasks (int $limit = 10) : array {
-		$rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}tasks` WHERE (DATE_ADD(`last_execution`, INTERVAL `interval` MINUTE) < NOW() OR `last_execution` = '0000-00-00 00:00:00') AND `activated` = '1' LIMIT 0, :limit; ", array(
-			'limit' => array(
-				'type' => PDO::PARAM_INT,
-				'value' => $limit
-			)
-		));
-
-		$tasks = array();
-
-		foreach ($rows as $row) {
-			$tasks[] = new Task($row);
-		}
-
-		return $tasks;
-	}
+    public static function schedule (int $limit = 3) {
+        //execute overdued tasks
+        foreach (self::getOverduedTasks($limit) as $task) {
+            //cast task
+            $task = Task::cast($task);
+
+            //execute task
+            $task->execute();
+
+            //check, if task is a one-time task
+            if ($task->deleteAfterExecution()) {
+                //delete task
+                $task->delete();
+            } else {
+                //update last execution timestamp
+                $task->setLastExecution();
+            }
+        }
+    }
+
+    public static function getOverduedTasks (int $limit = 10) : array {
+        $rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}tasks` WHERE (DATE_ADD(`last_execution`, INTERVAL `interval` MINUTE) < NOW() OR `last_execution` = '0000-00-00 00:00:00') AND `activated` = '1' LIMIT 0, :limit; ", array(
+            'limit' => array(
+                'type' => PDO::PARAM_INT,
+                'value' => $limit
+            )
+        ));
+
+        $tasks = array();
+
+        foreach ($rows as $row) {
+            $tasks[] = new Task($row);
+        }
+
+        return $tasks;
+    }
 
 }