AOEpeople / crawler

cli/crawler_multiprocess.php

Spacing +2 added lines, -2 removed lines

@@ -4,10 +4,10 @@
 }
 
 $processManager = new tx_crawler_domain_process_manager();
-$timeout = isset($_SERVER['argv'][1] ) ? intval($_SERVER['argv'][1]) : 1800;
+$timeout = isset($_SERVER['argv'][1]) ? intval($_SERVER['argv'][1]) : 1800;
 
 try {
 	$processManager->multiProcess($timeout);
 } catch (Exception $e) {
-	echo PHP_EOL . $e->getMessage();
+	echo PHP_EOL.$e->getMessage();
 }

domain/process/class.tx_crawler_domain_process_manager.php

Spacing +19 added lines, -19 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
 	 */
@@ -65,8 +65,8 @@ 
 	 * the constructor
 	 */
 	public function __construct() {
-		$this->processRepository	= new tx_crawler_domain_process_repository();
-		$this->queueRepository	= new tx_crawler_domain_queue_repository();
+		$this->processRepository = new tx_crawler_domain_process_repository();
+		$this->queueRepository = new tx_crawler_domain_queue_repository();
 		$this->crawlerObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_crawler_lib');
 		$this->timeToLive = intval($this->crawlerObj->extensionSettings['processMaxRunTime']);
 		$this->countInARun = intval($this->crawlerObj->extensionSettings['countInARun']);
@@ -81,7 +81,7 @@ 
 	 */
 	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();
@@ -99,7 +99,7 @@ 
 			}
 			if ($currentPendingItems == 0) {
 				if ($this->verbose) {
-					echo 'Finished...' . chr(10);
+					echo 'Finished...'.chr(10);
 				}
 				break;
 			}
@@ -111,16 +111,16 @@ 
 			}
 			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);
 			}
 		}
 		if ($currentPendingItems > 0 && $this->verbose) {
-			echo 'Stop with timeout' . chr(10);
+			echo 'Stop with timeout'.chr(10);
 		}
 	}
 
@@ -138,17 +138,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) {
@@ -168,14 +168,14 @@ 
 	 * @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);
-		$completePath = '(' .escapeshellcmd($this->getCrawlerCliPath()) . ' &) > /dev/null';
+		$completePath = '('.escapeshellcmd($this->getCrawlerCliPath()).' &) > /dev/null';
 		if (system($completePath) === 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;
 				}
@@ -190,10 +190,10 @@ 
 	 *
 	 * @return string
 	 */
-	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'), '/');
+	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'), '/');
 		$cliPart	 	= '/typo3/cli_dispatch.phpsh crawler';
 		return $phpPath.$pathToTypo3.$cliPart;
 	}

Classes/Task/CrawlMultiProcessTaskAdditionalFieldProvider.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
 
         // input for timeOut
         $fieldId = 'task_timeOut';
-        $fieldCode = '<input type="text" name="tx_scheduler[timeOut]" id="' . $fieldId . '" value="' . htmlentities($taskInfo['timeOut']) . '" class="form-control" />';
+        $fieldCode = '<input type="text" name="tx_scheduler[timeOut]" id="'.$fieldId.'" value="'.htmlentities($taskInfo['timeOut']).'" class="form-control" />';
         $additionalFields[$fieldId] = array(
             'code' => $fieldCode,
             'label' => 'LLL:EXT:crawler/Resources/Private/Language/Backend.xlf:crawler_im.timeOut'

Classes/Task/CrawlerQueueTaskAdditionalFieldProvider.php

Spacing +7 added lines, -7 removed lines

@@ -88,7 +88,7 @@ 
 
         // input for startPage
         $fieldId = 'task_startPage';
-        $fieldCode = '<input name="tx_scheduler[startPage]" type="text" id="' . $fieldId . '" value="' . $task->startPage . '" class="form-control" />';
+        $fieldCode = '<input name="tx_scheduler[startPage]" type="text" id="'.$fieldId.'" value="'.$task->startPage.'" class="form-control" />';
         $additionalFields[$fieldId] = array(
             'code' => $fieldCode,
             'label' => 'LLL:EXT:crawler/Resources/Private/Language/Backend.xlf:crawler_im.startPage'
@@ -104,10 +104,10 @@ 
             '4' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.depth_4'),
             '99' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.depth_infi'),
         );
-        $fieldCode = '<select name="tx_scheduler[depth]" id="' . $fieldId . '" class="form-control">';
+        $fieldCode = '<select name="tx_scheduler[depth]" id="'.$fieldId.'" class="form-control">';
 
         foreach ($fieldValueArray as $key => $label) {
-            $fieldCode .= "\t" . '<option value="' . $key . '"' . (($key == $task->depth) ? ' selected="selected"' : '') . '>' . $label . '</option>';
+            $fieldCode .= "\t".'<option value="'.$key.'"'.(($key == $task->depth) ? ' selected="selected"' : '').'>'.$label.'</option>';
         }
 
         $fieldCode .= '</select>';
@@ -119,10 +119,10 @@ 
         // combobox for configuration records
         $recordsArray = $this->getCrawlerConfigurationRecords();
         $fieldId = 'task_configuration';
-        $fieldCode = '<select name="tx_scheduler[configuration][]" multiple="multiple" id="' . $fieldId . '" class="form-control">';
-        $fieldCode .= "\t" . '<option value=""></option>';
+        $fieldCode = '<select name="tx_scheduler[configuration][]" multiple="multiple" id="'.$fieldId.'" class="form-control">';
+        $fieldCode .= "\t".'<option value=""></option>';
         for ($i = 0; $i < count($recordsArray); $i++) {
-            $fieldCode .= "\t" . '<option ' . $this->getSelectedState($task->configuration, $recordsArray[$i]['name']) . 'value="' . $recordsArray[$i]['name'] . '">' . $recordsArray[$i]['name'] . '</option>';
+            $fieldCode .= "\t".'<option '.$this->getSelectedState($task->configuration, $recordsArray[$i]['name']).'value="'.$recordsArray[$i]['name'].'">'.$recordsArray[$i]['name'].'</option>';
         }
         $fieldCode .= '</select>';
 
@@ -165,7 +165,7 @@ 
         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             '*',
             'tx_crawler_configuration',
-            '1=1' . BackendUtility::deleteClause('tx_crawler_configuration')
+            '1=1'.BackendUtility::deleteClause('tx_crawler_configuration')
         );
 
         while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {

Classes/Task/FlushQueueTaskAdditionalFieldProvider.php

Spacing +4 added lines, -4 removed lines

@@ -60,10 +60,10 @@
         }
 
         $fieldId = 'mode';
-        $fieldCode = '<select name="tx_scheduler[mode]" id="' . $fieldId . '" value="' . htmlentities($taskInfo['mode']) . '" class="form-control">'
-            . '<option value="all"' . ($taskInfo['mode'] == 'all' ? ' selected="selected"' : '') . '>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/Backend.xlf:crawler_flush.modeAll') . '</option>'
-            . '<option value="finished"' . ($taskInfo['mode'] == 'finished' ? ' selected="selected"' : '') . '>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/Backend.xlf:crawler_flush.modeFinished') . '</option>'
-            . '<option value="pending"' . ($taskInfo['mode'] == 'pending' ? ' selected="selected"' : '') . '>' . $GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/Backend.xlf:crawler_flush.modePending') . '</option>'
+        $fieldCode = '<select name="tx_scheduler[mode]" id="'.$fieldId.'" value="'.htmlentities($taskInfo['mode']).'" class="form-control">'
+            . '<option value="all"'.($taskInfo['mode'] == 'all' ? ' selected="selected"' : '').'>'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/Backend.xlf:crawler_flush.modeAll').'</option>'
+            . '<option value="finished"'.($taskInfo['mode'] == 'finished' ? ' selected="selected"' : '').'>'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/Backend.xlf:crawler_flush.modeFinished').'</option>'
+            . '<option value="pending"'.($taskInfo['mode'] == 'pending' ? ' selected="selected"' : '').'>'.$GLOBALS['LANG']->sL('LLL:EXT:crawler/Resources/Private/Language/Backend.xlf:crawler_flush.modePending').'</option>'
             . '</select>';
 
         $additionalFields[$fieldId] = array(

Classes/Task/CrawlerTaskAdditionalFieldProvider.php

Spacing +3 added lines, -3 removed lines

@@ -83,21 +83,21 @@
 
         // input for sleepTime
         $fieldId = 'task_sleepTime';
-        $fieldCode = '<input type="text" name="tx_scheduler[sleepTime]" id="' . $fieldId . '" value="' . htmlentities($taskInfo['sleepTime']) . '" class="form-control" />';
+        $fieldCode = '<input type="text" name="tx_scheduler[sleepTime]" id="'.$fieldId.'" value="'.htmlentities($taskInfo['sleepTime']).'" class="form-control" />';
         $additionalFields[$fieldId] = array(
             'code' => $fieldCode,
             'label' => 'LLL:EXT:crawler/Resources/Private/Language/Backend.xlf:crawler_im.sleepTime'
         );
         // input for sleepAfterFinish
         $fieldId = 'task_sleepAfterFinish';
-        $fieldCode = '<input type="text" name="tx_scheduler[sleepAfterFinish]" id="' . $fieldId . '" value="' . htmlentities($taskInfo['sleepAfterFinish']) . '" class="form-control" />';
+        $fieldCode = '<input type="text" name="tx_scheduler[sleepAfterFinish]" id="'.$fieldId.'" value="'.htmlentities($taskInfo['sleepAfterFinish']).'" class="form-control" />';
         $additionalFields[$fieldId] = array(
             'code' => $fieldCode,
             'label' => 'LLL:EXT:crawler/Resources/Private/Language/Backend.xlf:crawler_im.sleepAfterFinish'
         );
         // input for countInARun
         $fieldId = 'task_countInARun';
-        $fieldCode = '<input type="text" name="tx_scheduler[countInARun]" id="' . $fieldId . '" value="' . htmlentities($taskInfo['countInARun']) . '" class="form-control" />';
+        $fieldCode = '<input type="text" name="tx_scheduler[countInARun]" id="'.$fieldId.'" value="'.htmlentities($taskInfo['countInARun']).'" class="form-control" />';
         $additionalFields[$fieldId] = array(
             'code' => $fieldCode,
             'label' => 'LLL:EXT:crawler/Resources/Private/Language/Backend.xlf:crawler_im.countInARun'