AOEpeople / crawler

domain/process/class.tx_crawler_domain_process_manager.php

Spacing +20 added lines, -20 removed lines

@@ -26,7 +26,7 @@ 
  * Manages cralwer processes and can be used to start a new process or multiple processes
  *
  */
-class tx_crawler_domain_process_manager  {
+class tx_crawler_domain_process_manager {
 
     /**
      * @var $timeToLive integer
@@ -83,21 +83,21 @@ 
      *
      * @throws RuntimeException
      */
-    public function multiProcess( $timeout ) {
+    public function multiProcess($timeout) {
 
         if ($this->processLimit <= 1) {
-            throw new RuntimeException('To run crawler in multi process mode you have to configure the processLimit > 1.' . PHP_EOL);
+            throw new RuntimeException('To run crawler in multi process mode you have to configure the processLimit > 1.'.PHP_EOL);
         }
 
         $pendingItemsStart = $this->queueRepository->countAllPendingItems();
         $itemReportLimit = 20;
-        $reportItemCount =     $pendingItemsStart -  $itemReportLimit;
+        $reportItemCount = $pendingItemsStart - $itemReportLimit;
         if ($this->verbose) {
             $this->reportItemStatus();
         }
         $this->startRequiredProcesses();
         $nextTimeOut = time() + $this->timeToLive;
-        for ($i=0; $i<$timeout; $i++) {
+        for ($i = 0; $i < $timeout; $i++) {
             $currentPendingItems = $this->queueRepository->countAllPendingItems();
             if ($this->startRequiredProcesses($this->verbose)) {
                 $nextTimeOut = time() + $this->timeToLive;
@@ -112,16 +112,16 @@ 
                 if ($this->verbose) {
                     $this->reportItemStatus();
                 }
-                $reportItemCount = $currentPendingItems -  $itemReportLimit;
+                $reportItemCount = $currentPendingItems - $itemReportLimit;
             }
             sleep(1);
             if ($nextTimeOut < time()) {
-                $timedOutProcesses = $this->processRepository->findAll('','DESC',NULL,0,'ttl >'.$nextTimeOut);
+                $timedOutProcesses = $this->processRepository->findAll('', 'DESC', NULL, 0, 'ttl >'.$nextTimeOut);
                 $nextTimeOut = time() + $this->timeToLive;
                 if ($this->verbose) {
-                    echo 'Cleanup'.implode(',',$timedOutProcesses->getProcessIds()).chr(10);
+                    echo 'Cleanup'.implode(',', $timedOutProcesses->getProcessIds()).chr(10);
                 }
-                $this->crawlerObj->CLI_releaseProcesses($timedOutProcesses->getProcessIds(),true);
+                $this->crawlerObj->CLI_releaseProcesses($timedOutProcesses->getProcessIds(), true);
             }
         }
         if ($currentPendingItems > 0 && $this->verbose) {
@@ -143,17 +143,17 @@ 
      */
     private function startRequiredProcesses() {
         $ret = FALSE;
-        $currentProcesses= $this->processRepository->countActive();
-        $availableProcessesCount = $this->processLimit-$currentProcesses;
+        $currentProcesses = $this->processRepository->countActive();
+        $availableProcessesCount = $this->processLimit - $currentProcesses;
         $requiredProcessesCount = ceil($this->queueRepository->countAllUnassignedPendingItems() / $this->countInARun);
-        $startProcessCount = min(array($availableProcessesCount,$requiredProcessesCount));
+        $startProcessCount = min(array($availableProcessesCount, $requiredProcessesCount));
         if ($startProcessCount <= 0) {
             return $ret;
         }
         if ($startProcessCount && $this->verbose) {
             echo 'Start '.$startProcessCount.' new processes (Running:'.$currentProcesses.')';
         }
-        for($i=0;$i<$startProcessCount;$i++) {
+        for ($i = 0; $i < $startProcessCount; $i++) {
             usleep(100);
             if ($this->startProcess()) {
                 if ($this->verbose) {
@@ -173,25 +173,25 @@ 
      * @throws Exception if no crawlerprocess was started
      */
     public function startProcess() {
-        $ttl = (time() + $this->timeToLive -1);
+        $ttl = (time() + $this->timeToLive - 1);
         $current = $this->processRepository->countNotTimeouted($ttl);
         // Check whether OS is Windows
         if (TYPO3_OS === 'WIN') {
-            $sCompletePath = escapeshellcmd('start ' . $this->getCrawlerCliPath());
+            $sCompletePath = escapeshellcmd('start '.$this->getCrawlerCliPath());
             $oFileHandler = popen($sCompletePath, 'r');
             if ($oFileHandler !== false) {
                 pclose($oFileHandler);
             }
         }
         else {
-            $sCompletePath = '(' .escapeshellcmd($this->getCrawlerCliPath()) . ' &) > /dev/null';
+            $sCompletePath = '('.escapeshellcmd($this->getCrawlerCliPath()).' &) > /dev/null';
             $oFileHandler = system($sCompletePath);
         }
         if ($oFileHandler === false) {
             throw new Exception('could not start process!');
         }
         else {
-            for ($i=0;$i<10;$i++) {
+            for ($i = 0; $i < 10; $i++) {
                 if ($this->processRepository->countNotTimeouted($ttl) > $current) {
                     return true;
                 }
@@ -206,10 +206,10 @@ 
      *
      * @return string
      */
-    public function getCrawlerCliPath(){
-        $phpPath         = $this->crawlerObj->extensionSettings['phpPath'] . ' ';
+    public function getCrawlerCliPath() {
+        $phpPath         = $this->crawlerObj->extensionSettings['phpPath'].' ';
         $pathToTypo3     = rtrim(\TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('TYPO3_DOCUMENT_ROOT'), '/');
-        $pathToTypo3     .= rtrim(\TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('TYPO3_SITE_PATH'), '/');
+        $pathToTypo3 .= rtrim(\TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('TYPO3_SITE_PATH'), '/');
         $cliPart         = '/typo3/cli_dispatch.phpsh crawler';
         
         $scriptPath = $phpPath.$pathToTypo3.$cliPart;

Braces +2 added lines, -4 removed lines

@@ -182,15 +182,13 @@
             if ($oFileHandler !== false) {
                 pclose($oFileHandler);
             }
-        }
-        else {
+        } else {
             $sCompletePath = '(' .escapeshellcmd($this->getCrawlerCliPath()) . ' &) > /dev/null';
             $oFileHandler = system($sCompletePath);
         }
         if ($oFileHandler === false) {
             throw new Exception('could not start process!');
-        }
-        else {
+        } else {
             for ($i=0;$i<10;$i++) {
                 if ($this->processRepository->countNotTimeouted($ttl) > $current) {
                     return true;

domain/process/class.tx_crawler_domain_process.php

Indentation +141 added lines, -141 removed lines

@@ -24,145 +24,145 @@
 
 class tx_crawler_domain_process extends tx_crawler_domain_lib_abstract_dbobject {
 
-	CONST STATE_RUNNING = 'running';
-	CONST STATE_CANCELLED = 'cancelled';
-	CONST STATE_COMPLETED = 'completed';
-
-	/**
-	 * @var string table name
-	 */
-	protected static $tableName = 'tx_crawler_process';
-
-	/**
-	 * Returns the activity state for this process
-	 *
-	 * @param void
-	 * @return boolean
-	 */
-	public function getActive() {
-		return $this->row['active'];
-	}
-
-	/**
-	 * Returns the identifier for the process
-	 *
-	 * @return string
-	 */
-	public function getProcess_id() {
-		return $this->row['process_id'];
-	}
-
-	/**
-	 * Returns the timestamp of the exectime for the first relevant queue item.
-	 * This can be used to determine the runtime
-	 *
-	 * @return int
-	 */
-	public function getTimeForFirstItem() {
-		$queueRepository = new tx_crawler_domain_queue_repository();
-		$entry = $queueRepository->findYoungestEntryForProcess($this);
-
-		return $entry->getExecutionTime();
-	}
-
-	/**
-	 * Returns the timestamp of the exectime for the last relevant queue item.
-	 * This can be used to determine the runtime
-	 *
-	 * @return int
-	 */
-	public function getTimeForLastItem() {
-		$queueRepository = new tx_crawler_domain_queue_repository();
-		$entry = $queueRepository->findOldestEntryForProcess($this);
-
-		return $entry->getExecutionTime();
-	}
-
-	/**
-	 * Returns the difference between first and last processed item
-	 *
-	 * @return int
-	 */
-	public function getRuntime() {
-		return $this->getTimeForLastItem() - $this->getTimeForFirstItem();
-	}
-
-	/**
-	 * Returns the ttl of the process
-	 *
-	 * @return int
-	 */
-	public function getTTL() {
-		return $this->row['ttl'];
-	}
-
-	/**
-	 * Counts the number of items which need to be processed
-	 *
-	 * @author Timo Schmidt <timo.schmidt@aoemedia.de>
-	 * @param void
-	 * @return int
-	 */
-	public function countItemsProcessed() {
-		$queueRepository = new tx_crawler_domain_queue_repository();
-		return $queueRepository->countExecutedItemsByProcess($this);
-	}
-
-	/**
-	 * Counts the number of items which still need to be processed
-	 *
-	 * @author Timo Schmidt <timo.schmidt@aoemedia.de>
-	 * @param void
-	 * @return int
-	 */
-	public function countItemsToProcess() {
-		$queueRepository = new tx_crawler_domain_queue_repository();
-		return $queueRepository->countNonExecutedItemsByProcess($this);
-	}
-
-	/**
-	 * Returns the Progress of a crawling process as a percentage value
-	 *
-	 * @param void
-	 * @return float
-	 */
-	public function getProgress() {
-		$all = $this->countItemsAssigned();
-		if ($all<=0) {
-			return 0;
-		}
-
-		$res = round((100 / $all) * $this->countItemsProcessed());
-
-		if ($res > 100.0) {
-			return 100.0;
-		}
-		return $res;
-	}
-
-	/**
-	 * Returns the number of assigned Entrys
-	 *
-	 * @return int
-	 */
-	public function countItemsAssigned() {
-		return $this->row['assigned_items_count'];
-	}
-
-	/**
-	 * Return the processes current state
-	 *
-	 * @param void
-	 * @return string 'running'|'cancelled'|'completed'
-	 */
-	public function getState() {
-		if ($this->getActive() && $this->getProgress() < 100) {
-			$stage = tx_crawler_domain_process::STATE_RUNNING;
-		} elseif (!$this->getActive() && $this->getProgress() < 100) {
-			$stage = tx_crawler_domain_process::STATE_CANCELLED;
-		} else {
-			$stage = tx_crawler_domain_process::STATE_COMPLETED;
-		}
-		return $stage;
-	}
+    CONST STATE_RUNNING = 'running';
+    CONST STATE_CANCELLED = 'cancelled';
+    CONST STATE_COMPLETED = 'completed';
+
+    /**
+     * @var string table name
+     */
+    protected static $tableName = 'tx_crawler_process';
+
+    /**
+     * Returns the activity state for this process
+     *
+     * @param void
+     * @return boolean
+     */
+    public function getActive() {
+        return $this->row['active'];
+    }
+
+    /**
+     * Returns the identifier for the process
+     *
+     * @return string
+     */
+    public function getProcess_id() {
+        return $this->row['process_id'];
+    }
+
+    /**
+     * Returns the timestamp of the exectime for the first relevant queue item.
+     * This can be used to determine the runtime
+     *
+     * @return int
+     */
+    public function getTimeForFirstItem() {
+        $queueRepository = new tx_crawler_domain_queue_repository();
+        $entry = $queueRepository->findYoungestEntryForProcess($this);
+
+        return $entry->getExecutionTime();
+    }
+
+    /**
+     * Returns the timestamp of the exectime for the last relevant queue item.
+     * This can be used to determine the runtime
+     *
+     * @return int
+     */
+    public function getTimeForLastItem() {
+        $queueRepository = new tx_crawler_domain_queue_repository();
+        $entry = $queueRepository->findOldestEntryForProcess($this);
+
+        return $entry->getExecutionTime();
+    }
+
+    /**
+     * Returns the difference between first and last processed item
+     *
+     * @return int
+     */
+    public function getRuntime() {
+        return $this->getTimeForLastItem() - $this->getTimeForFirstItem();
+    }
+
+    /**
+     * Returns the ttl of the process
+     *
+     * @return int
+     */
+    public function getTTL() {
+        return $this->row['ttl'];
+    }
+
+    /**
+     * Counts the number of items which need to be processed
+     *
+     * @author Timo Schmidt <timo.schmidt@aoemedia.de>
+     * @param void
+     * @return int
+     */
+    public function countItemsProcessed() {
+        $queueRepository = new tx_crawler_domain_queue_repository();
+        return $queueRepository->countExecutedItemsByProcess($this);
+    }
+
+    /**
+     * Counts the number of items which still need to be processed
+     *
+     * @author Timo Schmidt <timo.schmidt@aoemedia.de>
+     * @param void
+     * @return int
+     */
+    public function countItemsToProcess() {
+        $queueRepository = new tx_crawler_domain_queue_repository();
+        return $queueRepository->countNonExecutedItemsByProcess($this);
+    }
+
+    /**
+     * Returns the Progress of a crawling process as a percentage value
+     *
+     * @param void
+     * @return float
+     */
+    public function getProgress() {
+        $all = $this->countItemsAssigned();
+        if ($all<=0) {
+            return 0;
+        }
+
+        $res = round((100 / $all) * $this->countItemsProcessed());
+
+        if ($res > 100.0) {
+            return 100.0;
+        }
+        return $res;
+    }
+
+    /**
+     * Returns the number of assigned Entrys
+     *
+     * @return int
+     */
+    public function countItemsAssigned() {
+        return $this->row['assigned_items_count'];
+    }
+
+    /**
+     * Return the processes current state
+     *
+     * @param void
+     * @return string 'running'|'cancelled'|'completed'
+     */
+    public function getState() {
+        if ($this->getActive() && $this->getProgress() < 100) {
+            $stage = tx_crawler_domain_process::STATE_RUNNING;
+        } elseif (!$this->getActive() && $this->getProgress() < 100) {
+            $stage = tx_crawler_domain_process::STATE_CANCELLED;
+        } else {
+            $stage = tx_crawler_domain_process::STATE_COMPLETED;
+        }
+        return $stage;
+    }
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -128,7 +128,7 @@
 	 */
 	public function getProgress() {
 		$all = $this->countItemsAssigned();
-		if ($all<=0) {
+		if ($all <= 0) {
 			return 0;
 		}
 

domain/process/class.tx_crawler_domain_process_collection.php

Indentation +50 added lines, -50 removed lines

@@ -41,62 +41,62 @@
  */
 class tx_crawler_domain_process_collection extends ArrayObject {
 
-	/**
-	 * Method to retrieve an element from the collection.
-	 * @access public
- 	 * @throws Exception
-	 * @return tx_crawler_domain_process
-	 */
-	public function offsetGet($index) {
-		if (! parent::offsetExists($index)) {
-			throw new Exception('Index "' . var_export($index, true) . '" for tx_crawler_domain_process are not available');
-		}
-		return parent::offsetGet($index);
-	}
+    /**
+     * Method to retrieve an element from the collection.
+     * @access public
+     * @throws Exception
+     * @return tx_crawler_domain_process
+     */
+    public function offsetGet($index) {
+        if (! parent::offsetExists($index)) {
+            throw new Exception('Index "' . var_export($index, true) . '" for tx_crawler_domain_process are not available');
+        }
+        return parent::offsetGet($index);
+    }
 
-	/**
-	 * Method to add an element to the collection-
-	 *
-	 * @param mixed $index
-	 * @param tx_crawler_domain_process $subject
-	 * @throws InvalidArgumentException
-	 * @return void
-	 */
-	public function offsetSet($index, $subject) {
-		if (! $subject instanceof tx_crawler_domain_process ) {
-			throw new InvalidArgumentException('Wrong parameter type given, "tx_crawler_domain_process" expected!');
-		}
-		parent::offsetSet($index, $subject);
-	}
+    /**
+     * Method to add an element to the collection-
+     *
+     * @param mixed $index
+     * @param tx_crawler_domain_process $subject
+     * @throws InvalidArgumentException
+     * @return void
+     */
+    public function offsetSet($index, $subject) {
+        if (! $subject instanceof tx_crawler_domain_process ) {
+            throw new InvalidArgumentException('Wrong parameter type given, "tx_crawler_domain_process" expected!');
+        }
+        parent::offsetSet($index, $subject);
+    }
 
-	/**
-	 * Method to append an element to the collection
-	 * @param tx_crawler_domain_process $subject
-	 * @throws InvalidArgumentException
-	 * @return void
-	 */
-	public function append($subject) {
-		if (! $subject instanceof tx_crawler_domain_process ) {
-			throw new InvalidArgumentException('Wrong parameter type given, "tx_crawler_domain_process" expected!');
-		}
-		parent::append($subject);
-	}
+    /**
+     * Method to append an element to the collection
+     * @param tx_crawler_domain_process $subject
+     * @throws InvalidArgumentException
+     * @return void
+     */
+    public function append($subject) {
+        if (! $subject instanceof tx_crawler_domain_process ) {
+            throw new InvalidArgumentException('Wrong parameter type given, "tx_crawler_domain_process" expected!');
+        }
+        parent::append($subject);
+    }
 	
-	/**
-	 * returns array of process ids of the current collection
-	 * @return array
-	 */
-	public function getProcessIds() {
-		$result=array();
-		foreach ($this->getIterator() as $value) {
-			$result[]=$value->getProcess_id();
-		}
-		return $result;
-	}
+    /**
+     * returns array of process ids of the current collection
+     * @return array
+     */
+    public function getProcessIds() {
+        $result=array();
+        foreach ($this->getIterator() as $value) {
+            $result[]=$value->getProcess_id();
+        }
+        return $result;
+    }
 }
 
 
 if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/crawler/domain/process/class.tx_crawler_domain_process_collection.php']) {
-	include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/crawler/domain/process/class.tx_crawler_domain_process_collection.php']);
+    include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/crawler/domain/process/class.tx_crawler_domain_process_collection.php']);
 }
 ?>
\ No newline at end of file

Spacing +6 added lines, -6 removed lines

@@ -48,8 +48,8 @@ 
 	 * @return tx_crawler_domain_process
 	 */
 	public function offsetGet($index) {
-		if (! parent::offsetExists($index)) {
-			throw new Exception('Index "' . var_export($index, true) . '" for tx_crawler_domain_process are not available');
+		if (!parent::offsetExists($index)) {
+			throw new Exception('Index "'.var_export($index, true).'" for tx_crawler_domain_process are not available');
 		}
 		return parent::offsetGet($index);
 	}
@@ -63,7 +63,7 @@ 
 	 * @return void
 	 */
 	public function offsetSet($index, $subject) {
-		if (! $subject instanceof tx_crawler_domain_process ) {
+		if (!$subject instanceof tx_crawler_domain_process) {
 			throw new InvalidArgumentException('Wrong parameter type given, "tx_crawler_domain_process" expected!');
 		}
 		parent::offsetSet($index, $subject);
@@ -76,7 +76,7 @@ 
 	 * @return void
 	 */
 	public function append($subject) {
-		if (! $subject instanceof tx_crawler_domain_process ) {
+		if (!$subject instanceof tx_crawler_domain_process) {
 			throw new InvalidArgumentException('Wrong parameter type given, "tx_crawler_domain_process" expected!');
 		}
 		parent::append($subject);
@@ -87,9 +87,9 @@ 
 	 * @return array
 	 */
 	public function getProcessIds() {
-		$result=array();
+		$result = array();
 		foreach ($this->getIterator() as $value) {
-			$result[]=$value->getProcess_id();
+			$result[] = $value->getProcess_id();
 		}
 		return $result;
 	}

domain/events/interface.tx_crawler_domain_events_observer.php

Indentation +8 added lines, -8 removed lines

@@ -24,14 +24,14 @@
 
 interface tx_crawler_domain_events_observer {
 
-	/**
-	 * This method should be implemented by the observer to register events
-	 * that should be forwarded to the observer
-	 *
-	 * @param tx_crawler_domain_events_dispatcher $dispatcher
-	 * @return boolean
-	 */
-	public function registerObservers(tx_crawler_domain_events_dispatcher $dispatcher);
+    /**
+     * This method should be implemented by the observer to register events
+     * that should be forwarded to the observer
+     *
+     * @param tx_crawler_domain_events_dispatcher $dispatcher
+     * @return boolean
+     */
+    public function registerObservers(tx_crawler_domain_events_dispatcher $dispatcher);
 }
 
 ?>
\ No newline at end of file

domain/events/class.tx_crawler_domain_events_dispatcher.php

Indentation +75 added lines, -75 removed lines

@@ -52,32 +52,32 @@ 
  */
 class tx_crawler_domain_events_dispatcher {
 
-	/**
-	 * @var array of tx_crawler_domain_events_observer objects;
-	 */
-	protected $observers;
+    /**
+     * @var array of tx_crawler_domain_events_observer objects;
+     */
+    protected $observers;
 
-	/**
-	 * @var tx_crawler_domain_events_dispatcher
-	 */
-	protected static $instance;
+    /**
+     * @var tx_crawler_domain_events_dispatcher
+     */
+    protected static $instance;
 
-	/**
-	 * The __constructor is private because the dispatcher is a singleton
-	 *
-	 * @param void
-	 * @return void
-	 */
+    /**
+     * The __constructor is private because the dispatcher is a singleton
+     *
+     * @param void
+     * @return void
+     */
     protected function __construct() {
-    	$this->observers = array();
-    	if (is_array ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['crawler/domain/events/class.tx_crawler_domain_events_dispatcher.php']['registerObservers'])) {
-			foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['crawler/domain/events/class.tx_crawler_domain_events_dispatcher.php']['registerObservers'] as $classRef) {
-				$hookObj = &\TYPO3\CMS\Core\Utility\GeneralUtility::getUserObj($classRef);
-				if (method_exists($hookObj, 'registerObservers')) {
-					$hookObj->registerObservers($this);
-				}
-			}
-		}
+        $this->observers = array();
+        if (is_array ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['crawler/domain/events/class.tx_crawler_domain_events_dispatcher.php']['registerObservers'])) {
+            foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['crawler/domain/events/class.tx_crawler_domain_events_dispatcher.php']['registerObservers'] as $classRef) {
+                $hookObj = &\TYPO3\CMS\Core\Utility\GeneralUtility::getUserObj($classRef);
+                if (method_exists($hookObj, 'registerObservers')) {
+                    $hookObj->registerObservers($this);
+                }
+            }
+        }
     }
 
     /**
@@ -86,62 +86,62 @@ 
      * @param void
      * @return array array with registered events.
      */
-	protected function getEvents() {
-		return array_keys($this->observers);
-	}
+    protected function getEvents() {
+        return array_keys($this->observers);
+    }
 
-	/**
-	 * This method can be used to add an observer for an event to the dispatcher
-	 *
-	 * @param tx_crawler_domain_events_observer $observer_object
-	 * @param string $observer_method
-	 * @param string $event
-	 * @return void
-	 */
-	public function addObserver(tx_crawler_domain_events_observer $observer_object, $observer_method, $event) {
-		$this->observers[$event][] = array('object' => $observer_object, 'method' => $observer_method);
-	}
+    /**
+     * This method can be used to add an observer for an event to the dispatcher
+     *
+     * @param tx_crawler_domain_events_observer $observer_object
+     * @param string $observer_method
+     * @param string $event
+     * @return void
+     */
+    public function addObserver(tx_crawler_domain_events_observer $observer_object, $observer_method, $event) {
+        $this->observers[$event][] = array('object' => $observer_object, 'method' => $observer_method);
+    }
 
-	/**
-	 * Enables checking whether a certain event is observed by anyone
-	 *
-	 * @param string $event
-	 * @return boolean
-	 */
-	public function hasObserver($event) {
-		return count($this->observers[$event]) > 0;
-	}
+    /**
+     * Enables checking whether a certain event is observed by anyone
+     *
+     * @param string $event
+     * @return boolean
+     */
+    public function hasObserver($event) {
+        return count($this->observers[$event]) > 0;
+    }
 
-	/**
-	 * This method should be used to post a event to the dispatcher. Each
-	 * registered observer will be notified about the event.
-	 *
-	 * @param string $event
-	 * @param string $group
-	 * @param mixed $attachedData
-	 * @return void
-	 */
-	public function post($event, $group, $attachedData) {
-		if(is_array($this->observers[$event])) {
-			foreach($this->observers[$event] as $eventObserver) {
-				call_user_func(array($eventObserver['object'],$eventObserver['method']),$event,$group,$attachedData);
-			}
-		}
-	}
+    /**
+     * This method should be used to post a event to the dispatcher. Each
+     * registered observer will be notified about the event.
+     *
+     * @param string $event
+     * @param string $group
+     * @param mixed $attachedData
+     * @return void
+     */
+    public function post($event, $group, $attachedData) {
+        if(is_array($this->observers[$event])) {
+            foreach($this->observers[$event] as $eventObserver) {
+                call_user_func(array($eventObserver['object'],$eventObserver['method']),$event,$group,$attachedData);
+            }
+        }
+    }
 
-	/**
-	 * Returns the instance of the dispatcher singleton
-	 *
-	 * @param void
-	 * @return tx_crawler_domain_events_dispatcher
-	 */
-	public static function getInstance() {
+    /**
+     * Returns the instance of the dispatcher singleton
+     *
+     * @param void
+     * @return tx_crawler_domain_events_dispatcher
+     */
+    public static function getInstance() {
 
-		if(!self::$instance instanceof tx_crawler_domain_events_dispatcher) {
-			$dispatcher = new tx_crawler_domain_events_dispatcher();
-			self::$instance = $dispatcher;
-		}
+        if(!self::$instance instanceof tx_crawler_domain_events_dispatcher) {
+            $dispatcher = new tx_crawler_domain_events_dispatcher();
+            self::$instance = $dispatcher;
+        }
 
-		return self::$instance;
-	}
+        return self::$instance;
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -70,7 +70,7 @@ 
 	 */
     protected function __construct() {
     	$this->observers = array();
-    	if (is_array ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['crawler/domain/events/class.tx_crawler_domain_events_dispatcher.php']['registerObservers'])) {
+    	if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['crawler/domain/events/class.tx_crawler_domain_events_dispatcher.php']['registerObservers'])) {
 			foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['crawler/domain/events/class.tx_crawler_domain_events_dispatcher.php']['registerObservers'] as $classRef) {
 				$hookObj = &\TYPO3\CMS\Core\Utility\GeneralUtility::getUserObj($classRef);
 				if (method_exists($hookObj, 'registerObservers')) {
@@ -122,9 +122,9 @@ 
 	 * @return void
 	 */
 	public function post($event, $group, $attachedData) {
-		if(is_array($this->observers[$event])) {
-			foreach($this->observers[$event] as $eventObserver) {
-				call_user_func(array($eventObserver['object'],$eventObserver['method']),$event,$group,$attachedData);
+		if (is_array($this->observers[$event])) {
+			foreach ($this->observers[$event] as $eventObserver) {
+				call_user_func(array($eventObserver['object'], $eventObserver['method']), $event, $group, $attachedData);
 			}
 		}
 	}
@@ -137,7 +137,7 @@ 
 	 */
 	public static function getInstance() {
 
-		if(!self::$instance instanceof tx_crawler_domain_events_dispatcher) {
+		if (!self::$instance instanceof tx_crawler_domain_events_dispatcher) {
 			$dispatcher = new tx_crawler_domain_events_dispatcher();
 			self::$instance = $dispatcher;
 		}

view/class.tx_crawler_view_pagination.php

Indentation +115 added lines, -115 removed lines

@@ -24,121 +24,121 @@
 
 class tx_crawler_view_pagination {
 
-	/**
-	 * @var string template path
-	 */
-	protected $template = 'EXT:crawler/template/pagination.php';
-
-	/**
-	 * @var int $perpage number of items perPage
-	 */
-	protected $perPage;
-
-	/**
-	 * @var int $currentOffset current offset
-	 */
-	protected $currentOffset;
-
-	/**
-	 * @var int $totalItemCount number of total item
-	 */
-	protected $totalItemCount;
-
-	/**
-	 * @var string $baseUrl
-	 */
-	protected $baseUrl;
-
-
-
-
-	/**
-	 * Method to render the view.
-	 *
-	 * @return string html content
-	 */
-	public function render() {
-		ob_start();
-		$this->template = \TYPO3\CMS\Core\Utility\GeneralUtility::getFileAbsFileName($this->template);
-		include($this->template);
-		$content = ob_get_contents();
-		ob_end_clean();
-
-		return $content;
-	}
-
-	/**
-	 * Returns the currently configured offset-
-	 * @return int
-	 */
-	public function getCurrentOffset() {
-		return $this->currentOffset;
-	}
-
-	/**
-	 * Method to read the number of items per page
-	 *
-	 * @return int
-	 */
-	public function getPerPage() {
-		return $this->perPage;
-	}
-
-	/**
-	 * Method to set the current offset from start
-	 *
-	 * @param int $currentOffset
-	 */
-	public function setCurrentOffset($currentOffset) {
-		$this->currentOffset = $currentOffset;
-	}
-
-	/**
-	 * Number of items per page.
-	 *
-	 * @param int $perPage
-	 */
-	public function setPerPage($perPage) {
-		$this->perPage = $perPage;
-	}
-
-	/**
-	 * returns the total number of items
-	 * @return int
-	 */
-	public function getTotalItemCount() {
-		return $this->totalItemCount;
-	}
-
-	/**
-	 * Method to set the total number of items in the pagination
-	 *
-	 * @param int $totalItemCount
-	 */
-	public function setTotalItemCount($totalItemCount) {
-		$this->totalItemCount = $totalItemCount;
-	}
-
-	/**
-	 * Returns the total number of pages needed to  display all content which
-	 * is paginatable
-	 *
-	 * @return double
-	 */
-	public function getTotalPagesCount() {
-	 	return ceil($this->getTotalItemCount() / $this->getPerPage());
-	}
-
-	/**
-	 * This method is used to caluclate the label for a pageoffset,
-	 * in normal cases its the internal offset + 1
-	 *
-	 * @param int $pageoffset
-	 * @return int
-	 */
-	protected function getLabelForPageOffset($pageoffset) {
-		return $pageoffset + 1;
-	}
+    /**
+     * @var string template path
+     */
+    protected $template = 'EXT:crawler/template/pagination.php';
+
+    /**
+     * @var int $perpage number of items perPage
+     */
+    protected $perPage;
+
+    /**
+     * @var int $currentOffset current offset
+     */
+    protected $currentOffset;
+
+    /**
+     * @var int $totalItemCount number of total item
+     */
+    protected $totalItemCount;
+
+    /**
+     * @var string $baseUrl
+     */
+    protected $baseUrl;
+
+
+
+
+    /**
+     * Method to render the view.
+     *
+     * @return string html content
+     */
+    public function render() {
+        ob_start();
+        $this->template = \TYPO3\CMS\Core\Utility\GeneralUtility::getFileAbsFileName($this->template);
+        include($this->template);
+        $content = ob_get_contents();
+        ob_end_clean();
+
+        return $content;
+    }
+
+    /**
+     * Returns the currently configured offset-
+     * @return int
+     */
+    public function getCurrentOffset() {
+        return $this->currentOffset;
+    }
+
+    /**
+     * Method to read the number of items per page
+     *
+     * @return int
+     */
+    public function getPerPage() {
+        return $this->perPage;
+    }
+
+    /**
+     * Method to set the current offset from start
+     *
+     * @param int $currentOffset
+     */
+    public function setCurrentOffset($currentOffset) {
+        $this->currentOffset = $currentOffset;
+    }
+
+    /**
+     * Number of items per page.
+     *
+     * @param int $perPage
+     */
+    public function setPerPage($perPage) {
+        $this->perPage = $perPage;
+    }
+
+    /**
+     * returns the total number of items
+     * @return int
+     */
+    public function getTotalItemCount() {
+        return $this->totalItemCount;
+    }
+
+    /**
+     * Method to set the total number of items in the pagination
+     *
+     * @param int $totalItemCount
+     */
+    public function setTotalItemCount($totalItemCount) {
+        $this->totalItemCount = $totalItemCount;
+    }
+
+    /**
+     * Returns the total number of pages needed to  display all content which
+     * is paginatable
+     *
+     * @return double
+     */
+    public function getTotalPagesCount() {
+            return ceil($this->getTotalItemCount() / $this->getPerPage());
+    }
+
+    /**
+     * This method is used to caluclate the label for a pageoffset,
+     * in normal cases its the internal offset + 1
+     *
+     * @param int $pageoffset
+     * @return int
+     */
+    protected function getLabelForPageOffset($pageoffset) {
+        return $pageoffset + 1;
+    }
 
 }
 

view/process/class.tx_crawler_view_process_list.php

Indentation +391 added lines, -391 removed lines

@@ -24,397 +24,397 @@
 
 class tx_crawler_view_process_list {
 
-	/**
-	 * @var string template path
-	 */
-	protected $template = 'EXT:crawler/template/process/list.php';
-
-	/**
-	 * @var string icon path
-	 */
-	protected $iconPath;
-
-	/**
-	 * @var string Holds the path to start a cli process via command line
-	 */
-	protected $cliPath;
-
-	/**
-	 * @var int Holds the total number of items pending in the queue to be processed
-	 */
-	protected $totalItemCount;
-
-	/**
-	 * @var boolean Holds the enable state of the crawler
-	 */
-	protected $isCrawlerEnabled;
-
-	/**
-	 * @var int Holds the number of active processes
-	 */
-	protected $activeProcessCount;
-
-	/**
-	 * @var int Holds the number of maximum active processes
-	 */
-	protected $maxActiveProcessCount;
-
-	/**
-	 * @var string Holds the mode state, can be simple or detail
-	 */
-	protected $mode;
-
-	/**
-	 * @var int Holds the current page id
-	 */
-	protected $pageId;
-
-	/**
-	 * @var int $totalItemCount number of total item
-	 */
-	protected $totalUnprocessedItemCount;
-
-	/**
-	 * @var int Holds the number of assigned unprocessed items
-	 */
-	protected $assignedUnprocessedItemCount;
-
-	/**
-	 * @return int
-	 */
-	public function getAssignedUnprocessedItemCount() {
-		return $this->assignedUnprocessedItemCount;
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getTotalUnprocessedItemCount() {
-		return $this->totalUnprocessedItemCount;
-	}
-
-	/**
-	 * @param int $assignedUnprocessedItemCount
-	 */
-	public function setAssignedUnprocessedItemCount($assignedUnprocessedItemCount) {
-		$this->assignedUnprocessedItemCount = $assignedUnprocessedItemCount;
-	}
-
-	/**
-	 * @param int $totalUnprocessedItemCount
-	 */
-	public function setTotalUnprocessedItemCount($totalUnprocessedItemCount) {
-		$this->totalUnprocessedItemCount = $totalUnprocessedItemCount;
-	}
-
-	/**
-	 * Set the page id
-	 *
-	 * @param int $pageId page id
-	 */
-	public function setPageId($pageId) {
-		$this->pageId = $pageId;
-	}
-
-	/**
-	 * Get the page id
-	 *
-	 * @return int page id
-	 */
-	public function getPageId() {
-		return $this->pageId;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getMode() {
-		return $this->mode;
-	}
-
-	/**
-	 * @param string $mode
-	 */
-	public function setMode($mode) {
-		$this->mode = $mode;
-	}
-
-
-	/**
-	 * @return int
-	 */
-	public function getMaxActiveProcessCount() {
-		return $this->maxActiveProcessCount;
-	}
-
-	/**
-	 * @param int $maxActiveProcessCount
-	 */
-	public function setMaxActiveProcessCount($maxActiveProcessCount) {
-		$this->maxActiveProcessCount = $maxActiveProcessCount;
-	}
-
-
-	/**
-	 * @return int
-	 */
-	public function getActiveProcessCount() {
-		return $this->activeProcessCount;
-	}
-
-	/**
-	 * @param int $activeProcessCount
-	 */
-	public function setActiveProcessCount($activeProcessCount) {
-		$this->activeProcessCount = $activeProcessCount;
-	}
-
-	/**
-	 * @return boolean
-	 */
-	public function getIsCrawlerEnabled() {
-		return $this->isCrawlerEnabled;
-	}
-
-	/**
-	 * @param boolean $isCrawlerEnabled
-	 */
-	public function setIsCrawlerEnabled($isCrawlerEnabled) {
-		$this->isCrawlerEnabled = $isCrawlerEnabled;
-	}
-
-
-	/**
-	 * Returns the path to start a cli process from the shell
-	 * @return string
-	 */
-	public function getCliPath() {
-		return $this->cliPath;
-	}
-
-	/**
-	 * @param string $cliPath
-	 */
-	public function setCliPath($cliPath) {
-		$this->cliPath = $cliPath;
-	}
-
-
-	/**
-	 * @return int
-	 */
-	public function getTotalItemCount() {
-		return $this->totalItemCount;
-	}
-
-	/**
-	 * @param int $totalItemCount
-	 */
-	public function setTotalItemCount($totalItemCount) {
-		$this->totalItemCount = $totalItemCount;
-	}
-
-	/**
-	 * Method to set the path to the icon from outside
-	 *
-	 * @param string $iconPath
-	 */
-	public function setIconPath($iconPath) {
-		$this->iconPath = $iconPath;
-	}
-
-	/**
-	 * Method to read the configured icon path
-	 *
-	 * @return string
-	 */
-	protected function getIconPath() {
-		return $this->iconPath;
-	}
-
-	/**
-	 * Method to set a collection of process objects to be displayed in
-	 * the list view.
-	 *
-	 * @param tx_crawler_domain_process_collection $processCollection
-	 */
-	public function setProcessCollection($processCollection) {
-		$this->processCollection = $processCollection;
-	}
-
-	/**
-	 * Returns a collection of processObjects.
-	 *
-	 * @return tx_crawler_domain_process_collection
-	 */
-	protected function getProcessCollection() {
-		return $this->processCollection;
-	}
-
-	/**
-	 * Formats a timestamp as date
-	 *
-	 * @param int $timestamp
-	 * @return string
-	 */
-	protected function asDate($timestamp) {
-		if ($timestamp > 0) {
-			return date($this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:time.detailed'), $timestamp);
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * Converts seconds into minutes
-	 *
-	 * @param int $seconds
-	 * @return double
-	 */
-	protected function asMinutes($seconds) {
-		return round($seconds / 60);
-	}
-
-	/**
-	 * Returns the state icon for the current job
-	 *
-	 * @param string $state
-	 * @return string icon
-	 */
-	protected function getIconForState($state) {
-		switch($state) {
-			case 'running':
-				$icon = 'bullet_orange';
-				$title = $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.process.running');
-				break;
-			case 'completed':
-				$icon = 'bullet_green';
-				$title = $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.process.success');
-				break;
-			case 'cancelled':
-				$icon = 'bullet_red';
-				$title = $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.process.cancelled');
-				break;
-		}
-
-		return $this->getIcon($icon, $title);
-	}
-
-	/**
-	 * Returns a tag for the refresh icon
-	 *
-	 * @return string
-	 */
-	protected function getRefreshIcon() {
-		return $this->getIcon('arrow_refresh');
-	}
-
-	/**
-	 * Returns a tag for the refresh icon
-	 *
-	 * @return string
-	 */
-	protected function getRefreshLink() {
-		return '<input onclick="window.location=\'' . \TYPO3\CMS\Backend\Utility\BackendUtility::getModuleUrl('web_info') . '&SET[crawlaction]=multiprocess' . '\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\'' . $this->getIconPath() . 'arrow_refresh.png' . '\'); background-repeat: no-repeat;" value="' . $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.refresh') . '" />';
-	}
-
-	/**
-	 * Returns an icon to stop all processes
-	 *
-	 * @return string html tag for stop icon
-	 */
-	protected function getStopIcon() {
-		return $this->getIcon('stop');
-	}
-
-	/**
-	 * Returns a link for the panel to enable or disable the crawler
-	 *
-	 * @return string
-	 */
-	protected function getEnableDisableLink() {
-		if ($this->getIsCrawlerEnabled()) {
-			return '<input onclick="window.location+=\'&action=stopCrawling\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\'' . $this->getIconPath() . 'control_stop_blue.png' . '\'); background-repeat: no-repeat;" value="' . $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.disablecrawling') . '" />';
-		} else {
-			return '<input onclick="window.location+=\'&action=resumeCrawling\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\'' . $this->getIconPath() . 'control_play.png' . '\'); background-repeat: no-repeat;" value="' . $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.enablecrawling') . '" />';
-		}
-	}
-
-	/**
-	 * Get mode link
-	 *
-	 * @param void
-	 * @return string a-tag
-	 */
-	protected function getModeLink() {
-		if ($this->getMode() == 'detail') {
-			return '<input onclick="window.location+=\'&SET[processListMode]=simple\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\'' . $this->getIconPath() . 'arrow_in.png' . '\'); background-repeat: no-repeat;" value="' . $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.show.running') . '" />';
-		} elseif ($this->getMode() == 'simple') {
-			return '<input onclick="window.location+=\'&SET[processListMode]=detail\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\'' . $this->getIconPath() . 'arrow_out.png' . '\'); background-repeat: no-repeat;" value="' . $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.show.all') . '" />';
-		}
-	}
-
-	/**
-	 * Get add link
-	 *
-	 * @param void
-	 * @return string a-tag
-	 */
-	protected function getAddLink() {
-		if ($this->getActiveProcessCount() < $this->getMaxActiveProcessCount() && $this->getIsCrawlerEnabled()) {
-			return '<input onclick="window.location+=\'&action=addProcess\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\'' . $this->getIconPath() . 'add.png' . '\'); background-repeat: no-repeat;" value="' . $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.process.add') . '" />';
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * Returns the icon to add new crawler processes
-	 *
-	 * @return string html tag for image to add new processes
-	 */
-	protected function getAddIcon() {
-		return $this->getIcon('add');
-	}
-
-	/**
-	 * Returns an imagetag for an icon
-	 *
-	 * @param string $icon
-	 * @return string html tag for icon
-	 */
-	protected function getIcon($icon, $title='') {
-		if (!empty($title)) {
-			$title = ' title="'.$title.'"';
-		}
-		return '<img src="'.$this->getIconPath().$icon.'.png" ' . $title . ' />';
-	}
-
-	/**
-	 * Method to render the view.
-	 *
-	 * @return string html content
-	 */
-	public function render() {
-		ob_start();
-		$this->template = \TYPO3\CMS\Core\Utility\GeneralUtility::getFileAbsFileName($this->template);
-		include($this->template);
-		$content = ob_get_contents();
-		ob_end_clean();
-		return $content;
-	}
-
-	/**
-	 * retrieve locallanglabel from environment
-	 * just a wrapper should be done in a cleaner way
-	 * later on
-	 *
-	 * @param string $label
-	 * @return string
-	 */
-	protected function getLLLabel($label) {
-		return $GLOBALS['LANG']->sL($label);
-	}
+    /**
+     * @var string template path
+     */
+    protected $template = 'EXT:crawler/template/process/list.php';
+
+    /**
+     * @var string icon path
+     */
+    protected $iconPath;
+
+    /**
+     * @var string Holds the path to start a cli process via command line
+     */
+    protected $cliPath;
+
+    /**
+     * @var int Holds the total number of items pending in the queue to be processed
+     */
+    protected $totalItemCount;
+
+    /**
+     * @var boolean Holds the enable state of the crawler
+     */
+    protected $isCrawlerEnabled;
+
+    /**
+     * @var int Holds the number of active processes
+     */
+    protected $activeProcessCount;
+
+    /**
+     * @var int Holds the number of maximum active processes
+     */
+    protected $maxActiveProcessCount;
+
+    /**
+     * @var string Holds the mode state, can be simple or detail
+     */
+    protected $mode;
+
+    /**
+     * @var int Holds the current page id
+     */
+    protected $pageId;
+
+    /**
+     * @var int $totalItemCount number of total item
+     */
+    protected $totalUnprocessedItemCount;
+
+    /**
+     * @var int Holds the number of assigned unprocessed items
+     */
+    protected $assignedUnprocessedItemCount;
+
+    /**
+     * @return int
+     */
+    public function getAssignedUnprocessedItemCount() {
+        return $this->assignedUnprocessedItemCount;
+    }
+
+    /**
+     * @return int
+     */
+    public function getTotalUnprocessedItemCount() {
+        return $this->totalUnprocessedItemCount;
+    }
+
+    /**
+     * @param int $assignedUnprocessedItemCount
+     */
+    public function setAssignedUnprocessedItemCount($assignedUnprocessedItemCount) {
+        $this->assignedUnprocessedItemCount = $assignedUnprocessedItemCount;
+    }
+
+    /**
+     * @param int $totalUnprocessedItemCount
+     */
+    public function setTotalUnprocessedItemCount($totalUnprocessedItemCount) {
+        $this->totalUnprocessedItemCount = $totalUnprocessedItemCount;
+    }
+
+    /**
+     * Set the page id
+     *
+     * @param int $pageId page id
+     */
+    public function setPageId($pageId) {
+        $this->pageId = $pageId;
+    }
+
+    /**
+     * Get the page id
+     *
+     * @return int page id
+     */
+    public function getPageId() {
+        return $this->pageId;
+    }
+
+    /**
+     * @return string
+     */
+    public function getMode() {
+        return $this->mode;
+    }
+
+    /**
+     * @param string $mode
+     */
+    public function setMode($mode) {
+        $this->mode = $mode;
+    }
+
+
+    /**
+     * @return int
+     */
+    public function getMaxActiveProcessCount() {
+        return $this->maxActiveProcessCount;
+    }
+
+    /**
+     * @param int $maxActiveProcessCount
+     */
+    public function setMaxActiveProcessCount($maxActiveProcessCount) {
+        $this->maxActiveProcessCount = $maxActiveProcessCount;
+    }
+
+
+    /**
+     * @return int
+     */
+    public function getActiveProcessCount() {
+        return $this->activeProcessCount;
+    }
+
+    /**
+     * @param int $activeProcessCount
+     */
+    public function setActiveProcessCount($activeProcessCount) {
+        $this->activeProcessCount = $activeProcessCount;
+    }
+
+    /**
+     * @return boolean
+     */
+    public function getIsCrawlerEnabled() {
+        return $this->isCrawlerEnabled;
+    }
+
+    /**
+     * @param boolean $isCrawlerEnabled
+     */
+    public function setIsCrawlerEnabled($isCrawlerEnabled) {
+        $this->isCrawlerEnabled = $isCrawlerEnabled;
+    }
+
+
+    /**
+     * Returns the path to start a cli process from the shell
+     * @return string
+     */
+    public function getCliPath() {
+        return $this->cliPath;
+    }
+
+    /**
+     * @param string $cliPath
+     */
+    public function setCliPath($cliPath) {
+        $this->cliPath = $cliPath;
+    }
+
+
+    /**
+     * @return int
+     */
+    public function getTotalItemCount() {
+        return $this->totalItemCount;
+    }
+
+    /**
+     * @param int $totalItemCount
+     */
+    public function setTotalItemCount($totalItemCount) {
+        $this->totalItemCount = $totalItemCount;
+    }
+
+    /**
+     * Method to set the path to the icon from outside
+     *
+     * @param string $iconPath
+     */
+    public function setIconPath($iconPath) {
+        $this->iconPath = $iconPath;
+    }
+
+    /**
+     * Method to read the configured icon path
+     *
+     * @return string
+     */
+    protected function getIconPath() {
+        return $this->iconPath;
+    }
+
+    /**
+     * Method to set a collection of process objects to be displayed in
+     * the list view.
+     *
+     * @param tx_crawler_domain_process_collection $processCollection
+     */
+    public function setProcessCollection($processCollection) {
+        $this->processCollection = $processCollection;
+    }
+
+    /**
+     * Returns a collection of processObjects.
+     *
+     * @return tx_crawler_domain_process_collection
+     */
+    protected function getProcessCollection() {
+        return $this->processCollection;
+    }
+
+    /**
+     * Formats a timestamp as date
+     *
+     * @param int $timestamp
+     * @return string
+     */
+    protected function asDate($timestamp) {
+        if ($timestamp > 0) {
+            return date($this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:time.detailed'), $timestamp);
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Converts seconds into minutes
+     *
+     * @param int $seconds
+     * @return double
+     */
+    protected function asMinutes($seconds) {
+        return round($seconds / 60);
+    }
+
+    /**
+     * Returns the state icon for the current job
+     *
+     * @param string $state
+     * @return string icon
+     */
+    protected function getIconForState($state) {
+        switch($state) {
+            case 'running':
+                $icon = 'bullet_orange';
+                $title = $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.process.running');
+                break;
+            case 'completed':
+                $icon = 'bullet_green';
+                $title = $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.process.success');
+                break;
+            case 'cancelled':
+                $icon = 'bullet_red';
+                $title = $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.process.cancelled');
+                break;
+        }
+
+        return $this->getIcon($icon, $title);
+    }
+
+    /**
+     * Returns a tag for the refresh icon
+     *
+     * @return string
+     */
+    protected function getRefreshIcon() {
+        return $this->getIcon('arrow_refresh');
+    }
+
+    /**
+     * Returns a tag for the refresh icon
+     *
+     * @return string
+     */
+    protected function getRefreshLink() {
+        return '<input onclick="window.location=\'' . \TYPO3\CMS\Backend\Utility\BackendUtility::getModuleUrl('web_info') . '&SET[crawlaction]=multiprocess' . '\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\'' . $this->getIconPath() . 'arrow_refresh.png' . '\'); background-repeat: no-repeat;" value="' . $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.refresh') . '" />';
+    }
+
+    /**
+     * Returns an icon to stop all processes
+     *
+     * @return string html tag for stop icon
+     */
+    protected function getStopIcon() {
+        return $this->getIcon('stop');
+    }
+
+    /**
+     * Returns a link for the panel to enable or disable the crawler
+     *
+     * @return string
+     */
+    protected function getEnableDisableLink() {
+        if ($this->getIsCrawlerEnabled()) {
+            return '<input onclick="window.location+=\'&action=stopCrawling\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\'' . $this->getIconPath() . 'control_stop_blue.png' . '\'); background-repeat: no-repeat;" value="' . $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.disablecrawling') . '" />';
+        } else {
+            return '<input onclick="window.location+=\'&action=resumeCrawling\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\'' . $this->getIconPath() . 'control_play.png' . '\'); background-repeat: no-repeat;" value="' . $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.enablecrawling') . '" />';
+        }
+    }
+
+    /**
+     * Get mode link
+     *
+     * @param void
+     * @return string a-tag
+     */
+    protected function getModeLink() {
+        if ($this->getMode() == 'detail') {
+            return '<input onclick="window.location+=\'&SET[processListMode]=simple\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\'' . $this->getIconPath() . 'arrow_in.png' . '\'); background-repeat: no-repeat;" value="' . $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.show.running') . '" />';
+        } elseif ($this->getMode() == 'simple') {
+            return '<input onclick="window.location+=\'&SET[processListMode]=detail\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\'' . $this->getIconPath() . 'arrow_out.png' . '\'); background-repeat: no-repeat;" value="' . $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.show.all') . '" />';
+        }
+    }
+
+    /**
+     * Get add link
+     *
+     * @param void
+     * @return string a-tag
+     */
+    protected function getAddLink() {
+        if ($this->getActiveProcessCount() < $this->getMaxActiveProcessCount() && $this->getIsCrawlerEnabled()) {
+            return '<input onclick="window.location+=\'&action=addProcess\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\'' . $this->getIconPath() . 'add.png' . '\'); background-repeat: no-repeat;" value="' . $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.process.add') . '" />';
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Returns the icon to add new crawler processes
+     *
+     * @return string html tag for image to add new processes
+     */
+    protected function getAddIcon() {
+        return $this->getIcon('add');
+    }
+
+    /**
+     * Returns an imagetag for an icon
+     *
+     * @param string $icon
+     * @return string html tag for icon
+     */
+    protected function getIcon($icon, $title='') {
+        if (!empty($title)) {
+            $title = ' title="'.$title.'"';
+        }
+        return '<img src="'.$this->getIconPath().$icon.'.png" ' . $title . ' />';
+    }
+
+    /**
+     * Method to render the view.
+     *
+     * @return string html content
+     */
+    public function render() {
+        ob_start();
+        $this->template = \TYPO3\CMS\Core\Utility\GeneralUtility::getFileAbsFileName($this->template);
+        include($this->template);
+        $content = ob_get_contents();
+        ob_end_clean();
+        return $content;
+    }
+
+    /**
+     * retrieve locallanglabel from environment
+     * just a wrapper should be done in a cleaner way
+     * later on
+     *
+     * @param string $label
+     * @return string
+     */
+    protected function getLLLabel($label) {
+        return $GLOBALS['LANG']->sL($label);
+    }
 }
 
 ?>

Spacing +9 added lines, -9 removed lines

@@ -282,7 +282,7 @@ 
 	 * @return string icon
 	 */
 	protected function getIconForState($state) {
-		switch($state) {
+		switch ($state) {
 			case 'running':
 				$icon = 'bullet_orange';
 				$title = $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.process.running');
@@ -315,7 +315,7 @@ 
 	 * @return string
 	 */
 	protected function getRefreshLink() {
-		return '<input onclick="window.location=\'' . \TYPO3\CMS\Backend\Utility\BackendUtility::getModuleUrl('web_info') . '&SET[crawlaction]=multiprocess' . '\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\'' . $this->getIconPath() . 'arrow_refresh.png' . '\'); background-repeat: no-repeat;" value="' . $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.refresh') . '" />';
+		return '<input onclick="window.location=\''.\TYPO3\CMS\Backend\Utility\BackendUtility::getModuleUrl('web_info').'&SET[crawlaction]=multiprocess'.'\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\''.$this->getIconPath().'arrow_refresh.png'.'\'); background-repeat: no-repeat;" value="'.$this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.refresh').'" />';
 	}
 
 	/**
@@ -334,9 +334,9 @@ 
 	 */
 	protected function getEnableDisableLink() {
 		if ($this->getIsCrawlerEnabled()) {
-			return '<input onclick="window.location+=\'&action=stopCrawling\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\'' . $this->getIconPath() . 'control_stop_blue.png' . '\'); background-repeat: no-repeat;" value="' . $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.disablecrawling') . '" />';
+			return '<input onclick="window.location+=\'&action=stopCrawling\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\''.$this->getIconPath().'control_stop_blue.png'.'\'); background-repeat: no-repeat;" value="'.$this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.disablecrawling').'" />';
 		} else {
-			return '<input onclick="window.location+=\'&action=resumeCrawling\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\'' . $this->getIconPath() . 'control_play.png' . '\'); background-repeat: no-repeat;" value="' . $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.enablecrawling') . '" />';
+			return '<input onclick="window.location+=\'&action=resumeCrawling\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\''.$this->getIconPath().'control_play.png'.'\'); background-repeat: no-repeat;" value="'.$this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.enablecrawling').'" />';
 		}
 	}
 
@@ -348,9 +348,9 @@ 
 	 */
 	protected function getModeLink() {
 		if ($this->getMode() == 'detail') {
-			return '<input onclick="window.location+=\'&SET[processListMode]=simple\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\'' . $this->getIconPath() . 'arrow_in.png' . '\'); background-repeat: no-repeat;" value="' . $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.show.running') . '" />';
+			return '<input onclick="window.location+=\'&SET[processListMode]=simple\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\''.$this->getIconPath().'arrow_in.png'.'\'); background-repeat: no-repeat;" value="'.$this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.show.running').'" />';
 		} elseif ($this->getMode() == 'simple') {
-			return '<input onclick="window.location+=\'&SET[processListMode]=detail\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\'' . $this->getIconPath() . 'arrow_out.png' . '\'); background-repeat: no-repeat;" value="' . $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.show.all') . '" />';
+			return '<input onclick="window.location+=\'&SET[processListMode]=detail\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\''.$this->getIconPath().'arrow_out.png'.'\'); background-repeat: no-repeat;" value="'.$this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.show.all').'" />';
 		}
 	}
 
@@ -362,7 +362,7 @@ 
 	 */
 	protected function getAddLink() {
 		if ($this->getActiveProcessCount() < $this->getMaxActiveProcessCount() && $this->getIsCrawlerEnabled()) {
-			return '<input onclick="window.location+=\'&action=addProcess\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\'' . $this->getIconPath() . 'add.png' . '\'); background-repeat: no-repeat;" value="' . $this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.process.add') . '" />';
+			return '<input onclick="window.location+=\'&action=addProcess\';" type="button" style="padding:4px 4px 4px 20px; background-position: 3px 3px; background-image: url(\''.$this->getIconPath().'add.png'.'\'); background-repeat: no-repeat;" value="'.$this->getLLLabel('LLL:EXT:crawler/modfunc1/locallang.xml:labels.process.add').'" />';
 		} else {
 			return '';
 		}
@@ -383,11 +383,11 @@ 
 	 * @param string $icon
 	 * @return string html tag for icon
 	 */
-	protected function getIcon($icon, $title='') {
+	protected function getIcon($icon, $title = '') {
 		if (!empty($title)) {
 			$title = ' title="'.$title.'"';
 		}
-		return '<img src="'.$this->getIconPath().$icon.'.png" ' . $title . ' />';
+		return '<img src="'.$this->getIconPath().$icon.'.png" '.$title.' />';
 	}
 
 	/**

Configuration/TCA/Overrides/tx_crawler_configuration.php

Indentation +1 added lines, -1 removed lines

@@ -3,5 +3,5 @@
 
 // Compatibility with 6.2
 if (\TYPO3\CMS\Core\Utility\VersionNumberUtility::convertVersionNumberToInteger(\TYPO3\CMS\Core\Utility\VersionNumberUtility::getNumericTypo3Version()) < 7000000) {
-  $GLOBALS['TCA']['tx_crawler_configuration']['columns']['processing_instruction_filter']['config']['renderMode'] = 'checkbox';
+    $GLOBALS['TCA']['tx_crawler_configuration']['columns']['processing_instruction_filter']['config']['renderMode'] = 'checkbox';
 }

Classes/Utility/SchedulerUtility.php

Spacing +10 added lines, -10 removed lines

@@ -42,36 +42,36 @@
     {
         $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks']['AOE\\Crawler\\Task\\CrawlerQueueTask'] = array(
             'extension'        => $extKey,
-            'title'            => 'LLL:EXT:' . $extKey . '/Resources/Private/Language/Backend.xlf:crawler_im.name',
-            'description'      => 'LLL:EXT:' . $extKey . '/Resources/Private/Language/Backend.xlf:crawler_im.description',
+            'title'            => 'LLL:EXT:'.$extKey.'/Resources/Private/Language/Backend.xlf:crawler_im.name',
+            'description'      => 'LLL:EXT:'.$extKey.'/Resources/Private/Language/Backend.xlf:crawler_im.description',
             'additionalFields' => 'AOE\\Crawler\\Task\\CrawlerQueueTaskAdditionalFieldProvider'
         );
 
         $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks']['AOE\\Crawler\\Task\\CrawlerTask'] = array(
             'extension'        => $extKey,
-            'title'            => 'LLL:EXT:' . $extKey . '/Resources/Private/Language/Backend.xlf:crawler_crawl.name',
-            'description'      => 'LLL:EXT:' . $extKey . '/Resources/Private/Language/Backend.xlf:crawler_crawl.description',
+            'title'            => 'LLL:EXT:'.$extKey.'/Resources/Private/Language/Backend.xlf:crawler_crawl.name',
+            'description'      => 'LLL:EXT:'.$extKey.'/Resources/Private/Language/Backend.xlf:crawler_crawl.description',
             'additionalFields' => 'AOE\\Crawler\\Task\\CrawlerTaskAdditionalFieldProvider'
         );
 
         $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks']['AOE\\Crawler\\Task\\CrawlMultiProcessTask'] = array(
             'extension'        => $extKey,
-            'title'            => 'LLL:EXT:' . $extKey . '/Resources/Private/Language/Backend.xlf:crawler_crawlMultiProcess.name',
-            'description'      => 'LLL:EXT:' . $extKey . '/Resources/Private/Language/Backend.xlf:crawler_crawl.description',
+            'title'            => 'LLL:EXT:'.$extKey.'/Resources/Private/Language/Backend.xlf:crawler_crawlMultiProcess.name',
+            'description'      => 'LLL:EXT:'.$extKey.'/Resources/Private/Language/Backend.xlf:crawler_crawl.description',
             'additionalFields' => 'AOE\\Crawler\\Task\\CrawlMultiProcessTaskAdditionalFieldProvider'
         );
 
         $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks']['AOE\\Crawler\\Task\\FlushQueueTask'] = array(
             'extension'        => $extKey,
-            'title'            => 'LLL:EXT:' . $extKey . '/Resources/Private/Language/Backend.xlf:crawler_flush.name',
-            'description'      => 'LLL:EXT:' . $extKey . '/Resources/Private/Language/Backend.xlf:crawler_flush.description',
+            'title'            => 'LLL:EXT:'.$extKey.'/Resources/Private/Language/Backend.xlf:crawler_flush.name',
+            'description'      => 'LLL:EXT:'.$extKey.'/Resources/Private/Language/Backend.xlf:crawler_flush.description',
             'additionalFields' => 'AOE\\Crawler\\Task\\FlushQueueTaskAdditionalFieldProvider'
         );
 
         $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks']['AOE\\Crawler\\Task\\ProcessCleanupTask'] = array(
             'extension'        => $extKey,
-            'title'            => 'LLL:EXT:' . $extKey . '/Resources/Private/Language/Backend.xlf:crawler_processCleanup.name',
-            'description'      => 'LLL:EXT:' . $extKey . '/Resources/Private/Language/Backend.xlf:crawler_processCleanup.description',
+            'title'            => 'LLL:EXT:'.$extKey.'/Resources/Private/Language/Backend.xlf:crawler_processCleanup.name',
+            'description'      => 'LLL:EXT:'.$extKey.'/Resources/Private/Language/Backend.xlf:crawler_processCleanup.description',
         );
     }
 }