janis91 / ocr

lib/Settings/Section.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 	 *
 	 */
 	public function getName() {
-		return $this->l->t ( 'OCR' );
+		return $this->l->t('OCR');
 	}
 	/**
 	 *

lib/Controller/JobController.php

Spacing +7 added lines, -7 removed lines

@@ -47,7 +47,7 @@ 
 	 *        	$UserId
 	 */
 	public function __construct($AppName, IRequest $request, JobService $service, $UserId) {
-		parent::__construct ( $AppName, $request );
+		parent::__construct($AppName, $request);
 		$this->userId = $UserId;
 		$this->service = $service;
 	}
@@ -62,8 +62,8 @@ 
 	 * @return DataResponse
 	 */
 	public function process($languages, $files) {
-		return $this->handleNotFound ( function () use ($languages, $files) {
-			return $this->service->process ( $languages, $files );
+		return $this->handleNotFound(function() use ($languages, $files) {
+			return $this->service->process($languages, $files);
 		} );
 	}
 	
@@ -73,8 +73,8 @@ 
 	 * @return \OCP\AppFramework\Http\DataResponse
 	 */
 	public function getAllJobs() {
-		return $this->handleNotFound ( function () {
-			return $this->service->getAllJobsForUser ( $this->userId );
+		return $this->handleNotFound(function() {
+			return $this->service->getAllJobsForUser($this->userId);
 		} );
 	}
 	
@@ -85,8 +85,8 @@ 
 	 * @return \OCP\AppFramework\Http\DataResponse
 	 */
 	public function deleteJob($id) {
-		return $this->handleNotFound ( function () use ($id) {
-			return $this->service->deleteJob ( $id, $this->userId );
+		return $this->handleNotFound(function() use ($id) {
+			return $this->service->deleteJob($id, $this->userId);
 		} );
 	}
 }
\ No newline at end of file

appinfo/routes.php

Indentation +9 added lines, -9 removed lines

@@ -18,15 +18,15 @@
  * it's instantiated in there
  */
 return [
-    'routes' => [
+	'routes' => [
 		['name' => 'Job#process', 'url' => '/', 'verb' => 'POST'],
-    	['name' => 'Job#deleteJob', 'url' => '/', 'verb' => 'DELETE'],
-    	['name' => 'Job#getAllJobs', 'url' => '/', 'verb' => 'GET'],
+		['name' => 'Job#deleteJob', 'url' => '/', 'verb' => 'DELETE'],
+		['name' => 'Job#getAllJobs', 'url' => '/', 'verb' => 'GET'],
 		['name' => 'Status#getStatus', 'url' => '/status', 'verb' => 'GET'],
-    	// settings
-    	['name' => 'AdminSettings#setLanguages', 'url' => '/admin/languages', 'verb' => 'POST'],
-    	['name' => 'AdminSettings#setRedis', 'url' => '/admin/redis', 'verb' => 'POST'],
-    	['name' => 'AdminSettings#getLanguages', 'url' => '/languages', 'verb' => 'GET'],
-    	['name' => 'AdminSettings#evaluateRedisSettings', 'url' => '/redis', 'verb' => 'GET']
-    ]
+		// settings
+		['name' => 'AdminSettings#setLanguages', 'url' => '/admin/languages', 'verb' => 'POST'],
+		['name' => 'AdminSettings#setRedis', 'url' => '/admin/redis', 'verb' => 'POST'],
+		['name' => 'AdminSettings#getLanguages', 'url' => '/languages', 'verb' => 'GET'],
+		['name' => 'AdminSettings#evaluateRedisSettings', 'url' => '/redis', 'verb' => 'GET']
+	]
 ];
\ No newline at end of file

lib/Controller/AdminSettingsController.php

Spacing +15 added lines, -15 removed lines

@@ -40,7 +40,7 @@ 
 	 * @param string $userId        	
 	 */
 	public function __construct($appName, IRequest $request, IL10N $l10n, AppConfigService $appConfig, $userId) {
-		parent::__construct ( $appName, $request );
+		parent::__construct($appName, $request);
 		$this->l10n = $l10n;
 		$this->appConfig = $appConfig;
 	}
@@ -51,8 +51,8 @@ 
 	 * @return DataResponse
 	 */
 	public function getLanguages() {
-		return $this->handleNotFound ( function () {
-			return [ 'languages' => $this->appConfig->getAppValue ( OcrConstants::LANGUAGES_CONFIG_KEY )];
+		return $this->handleNotFound(function() {
+			return ['languages' => $this->appConfig->getAppValue(OcrConstants::LANGUAGES_CONFIG_KEY)];
 		} );
 	}
 	
@@ -62,8 +62,8 @@ 
 	 * @return DataResponse
 	 */
 	public function evaluateRedisSettings() {
-		return $this->handleNotFound ( function () {
-			return [ 'set' => $this->appConfig->evaluateRedisSettings ()];
+		return $this->handleNotFound(function() {
+			return ['set' => $this->appConfig->evaluateRedisSettings()];
 		} );
 	}
 	
@@ -74,12 +74,12 @@ 
 	 * @return DataResponse
 	 */
 	public function setLanguages($languages) {
-		return $this->handleNotFound ( function () use ($languages) {
+		return $this->handleNotFound(function() use ($languages) {
 			if ($languages !== null) {
-				$this->appConfig->setAppValue ( OcrConstants::LANGUAGES_CONFIG_KEY, $languages );
-				return $this->l10n->t ( 'Saved' );
+				$this->appConfig->setAppValue(OcrConstants::LANGUAGES_CONFIG_KEY, $languages);
+				return $this->l10n->t('Saved');
 			} else {
-				throw new NotFoundException ( $this->l10n->t ( 'The languages are not specified in the correct format.' ) );
+				throw new NotFoundException($this->l10n->t('The languages are not specified in the correct format.'));
 			}
 		} );
 	}
@@ -93,14 +93,14 @@ 
 	 * @return DataResponse
 	 */
 	public function setRedis($redisHost, $redisPort, $redisDb) {
-		return $this->handleNotFound ( function () use ($redisHost, $redisPort, $redisDb) {
+		return $this->handleNotFound(function() use ($redisHost, $redisPort, $redisDb) {
 			if ($redisHost !== null && $redisPort !== null && $redisDb !== null) {
-				$this->appConfig->setAppValue ( OcrConstants::REDIS_CONFIG_KEY_HOST, $redisHost );
-				$this->appConfig->setAppValue ( OcrConstants::REDIS_CONFIG_KEY_PORT, $redisPort );
-				$this->appConfig->setAppValue ( OcrConstants::REDIS_CONFIG_KEY_DB, $redisDb );
-				return $this->l10n->t ( 'Saved' );
+				$this->appConfig->setAppValue(OcrConstants::REDIS_CONFIG_KEY_HOST, $redisHost);
+				$this->appConfig->setAppValue(OcrConstants::REDIS_CONFIG_KEY_PORT, $redisPort);
+				$this->appConfig->setAppValue(OcrConstants::REDIS_CONFIG_KEY_DB, $redisDb);
+				return $this->l10n->t('Saved');
 			} else {
-				throw new NotFoundException ( $this->l10n->t ( 'The Redis settings do not have the right format.' ) );
+				throw new NotFoundException($this->l10n->t('The Redis settings do not have the right format.'));
 			}
 		} );
 	}

lib/Service/AppConfigService.php

Spacing +13 added lines, -13 removed lines

@@ -52,7 +52,7 @@ 
 	 * @return string
 	 */
 	public function getAppValue($key) {
-		return $this->config->getAppValue ( $this->appName, $key );
+		return $this->config->getAppValue($this->appName, $key);
 	}
 	/**
 	 * Evaluate if all redis related settings are set.
@@ -61,7 +61,7 @@ 
 	 */
 	public function evaluateRedisSettings() {
 		
-		if ($this->config->getAppValue ( $this->appName, OcrConstants::REDIS_CONFIG_KEY_HOST ) !== '' && $this->config->getAppValue ( $this->appName, OcrConstants::REDIS_CONFIG_KEY_PORT ) !== '' && $this->config->getAppValue ( $this->appName, OcrConstants::REDIS_CONFIG_KEY_DB ) !== '') {
+		if ($this->config->getAppValue($this->appName, OcrConstants::REDIS_CONFIG_KEY_HOST) !== '' && $this->config->getAppValue($this->appName, OcrConstants::REDIS_CONFIG_KEY_PORT) !== '' && $this->config->getAppValue($this->appName, OcrConstants::REDIS_CONFIG_KEY_DB) !== '') {
 			return true;
 		} else {
 			return false;
@@ -76,27 +76,27 @@ 
 	 */
 	public function setAppValue($key, $value) {
 		if ($key === OcrConstants::LANGUAGES_CONFIG_KEY) {
-			if (! preg_match ( '/^(([a-z]{3,4}|[a-z]{3,4}\-[a-z]{3,4});)*([a-z]{3,4}|[a-z]{3,4}\-[a-z]{3,4})$/', $value )) {
-				throw new NotFoundException ( $this->l10n->t ( 'The languages are not specified in the correct format.' ) );
+			if (!preg_match('/^(([a-z]{3,4}|[a-z]{3,4}\-[a-z]{3,4});)*([a-z]{3,4}|[a-z]{3,4}\-[a-z]{3,4})$/', $value)) {
+				throw new NotFoundException($this->l10n->t('The languages are not specified in the correct format.'));
 			}
 		}
 		if ($key === OcrConstants::REDIS_CONFIG_KEY_HOST) {
-			if (! preg_match ( '/(^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$)/', $value )) {
-				throw new NotFoundException ( $this->l10n->t ( 'The redis host is not specified in the correct format.' ) );
+			if (!preg_match('/(^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$)/', $value)) {
+				throw new NotFoundException($this->l10n->t('The redis host is not specified in the correct format.'));
 			}
 		}
 		if ($key === OcrConstants::REDIS_CONFIG_KEY_PORT) {
-			$value = intval ( $value );
-			if (! ($value > 0 && $value < 65535)) {
-				throw new NotFoundException ( $this->l10n->t ( 'The redis port number is not specified in the correct format.' ) );
+			$value = intval($value);
+			if (!($value > 0 && $value < 65535)) {
+				throw new NotFoundException($this->l10n->t('The redis port number is not specified in the correct format.'));
 			}
 		}
 		if ($key === OcrConstants::REDIS_CONFIG_KEY_DB) {
-			$value = intval ( $value );
-			if (! ($value >= 0)) {
-				throw new NotFoundException ( $this->l10n->t ( 'The redis db is not specified in the correct format.' ) );
+			$value = intval($value);
+			if (!($value >= 0)) {
+				throw new NotFoundException($this->l10n->t('The redis db is not specified in the correct format.'));
 			}
 		}
-		return $this->config->setAppValue ( $this->appName, $key, $value );
+		return $this->config->setAppValue($this->appName, $key, $value);
 	}
 }
\ No newline at end of file

lib/Db/OcrJob.php

Spacing +1 added lines, -1 removed lines

@@ -99,7 +99,7 @@
 	 * @param string $originalFilename
 	 * @param string $errorLog
 	 */
-	public function __construct($status = null, $source = null, $target = null, $tempFile = null, $type = null, $userId = null, $errorDisplayed = null, $originalFilename = null, $errorLog= null) {
+	public function __construct($status = null, $source = null, $target = null, $tempFile = null, $type = null, $userId = null, $errorDisplayed = null, $originalFilename = null, $errorLog = null) {
 		$this->setStatus($status);
 		$this->setSource($source);
 		$this->setTarget($target);

lib/Settings/Admin.php

Spacing +4 added lines, -4 removed lines

@@ -32,12 +32,12 @@
 	 * @return TemplateResponse
 	 */
 	public function getForm() {
-		return new TemplateResponse( 'ocr', 'settings-admin', [ 
-				OcrConstants::LANGUAGES_CONFIG_KEY => $this->config->getAppValue ( 'ocr', OcrConstants::LANGUAGES_CONFIG_KEY), 
-				OcrConstants::REDIS_CONFIG_KEY_HOST => $this->config->getAppValue ( 'ocr', OcrConstants::REDIS_CONFIG_KEY_HOST),
+		return new TemplateResponse('ocr', 'settings-admin', [ 
+				OcrConstants::LANGUAGES_CONFIG_KEY => $this->config->getAppValue('ocr', OcrConstants::LANGUAGES_CONFIG_KEY), 
+				OcrConstants::REDIS_CONFIG_KEY_HOST => $this->config->getAppValue('ocr', OcrConstants::REDIS_CONFIG_KEY_HOST),
 				OcrConstants::REDIS_CONFIG_KEY_PORT => $this->config->getAppValue('ocr', OcrConstants::REDIS_CONFIG_KEY_PORT),
 				OcrConstants::REDIS_CONFIG_KEY_DB => $this->config->getAppValue('ocr', OcrConstants::REDIS_CONFIG_KEY_DB)
-		], 'blank' );
+		], 'blank');
 	}
 	/**
 	 *

lib/Service/JobService.php

Unused Use Statements -1 removed lines

@@ -17,7 +17,6 @@
 use OCP\IL10N;
 use OCP\ITempManager;
 use OCA\Ocr\Db\OcrJob;
-use OCA\Ocr\Db\File;
 use OCA\Ocr\Constants\OcrConstants;
 use OCA\Ocr\Util\PHPUtil;
 

Spacing +96 added lines, -96 removed lines

@@ -124,44 +124,44 @@ 
 	 */
 	public function process($languages, $files) {
 		try {
-			$this->logger->debug ( 'Will now process files: {files} with languages: {languages}', [ 
-					'files' => json_encode ( $files ),
-					'languages' => json_encode ( $languages )
-			] );
+			$this->logger->debug('Will now process files: {files} with languages: {languages}', [ 
+					'files' => json_encode($files),
+					'languages' => json_encode($languages)
+			]);
 			// Check if files and language not empty
-			$noLang = $this->noLanguage ( $languages );
-			if (! empty ( $files ) && ($this->checkForAcceptedLanguages ( $languages ) || $noLang)) {
+			$noLang = $this->noLanguage($languages);
+			if (!empty ($files) && ($this->checkForAcceptedLanguages($languages) || $noLang)) {
 				// language part:
 				if ($noLang) {
-					$languages = [ ];
+					$languages = [];
 				}
 				// file part:
-				$fileInfo = $this->fileService->buildFileInfo ( $files );
-				foreach ( $fileInfo as $fInfo ) {
+				$fileInfo = $this->fileService->buildFileInfo($files);
+				foreach ($fileInfo as $fInfo) {
 					// Check Shared
-					$shared = $this->fileService->checkSharedWithInitiator ( $fInfo );
-					$target = $this->fileService->buildTarget ( $fInfo, $shared );
-					$source = $this->fileService->buildSource ( $fInfo, $shared );
+					$shared = $this->fileService->checkSharedWithInitiator($fInfo);
+					$target = $this->fileService->buildTarget($fInfo, $shared);
+					$source = $this->fileService->buildSource($fInfo, $shared);
 					
 					// set the running type
-					$fType = $this->fileService->getCorrectType ( $fInfo );
+					$fType = $this->fileService->getCorrectType($fInfo);
 					
 					// create a temp file for ocr processing purposes
-					$tempFile = $this->getTempFile ( $fType );
+					$tempFile = $this->getTempFile($fType);
 					
 					// Create job object
-					$job = new OcrJob ( OcrConstants::STATUS_PENDING, $source, $target, $tempFile, $fType, $this->userId, false, $fInfo->getName (), null );
+					$job = new OcrJob(OcrConstants::STATUS_PENDING, $source, $target, $tempFile, $fType, $this->userId, false, $fInfo->getName(), null);
 					
 					// Init client and send task / job
 					// Feed the worker
-					$this->redisService->sendJob ( $job, $languages, \OC::$SERVERROOT );
+					$this->redisService->sendJob($job, $languages, \OC::$SERVERROOT);
 				}
 				return 'PROCESSING';
 			} else {
-				throw new NotFoundException ( $this->l10n->t ( 'Empty parameters passed.' ) );
+				throw new NotFoundException($this->l10n->t('Empty parameters passed.'));
 			}
-		} catch ( Exception $e ) {
-			$this->handleException ( $e );
+		} catch (Exception $e) {
+			$this->handleException($e);
 		}
 	}
 	
@@ -175,26 +175,26 @@ 
 	 */
 	public function deleteJob($jobId, $userId) {
 		try {
-			$job = $this->jobMapper->find ( $jobId );
-			if ($job->getUserId () !== $userId) {
-				throw new NotFoundException ( $this->l10n->t ( 'Cannot delete. Wrong owner.' ) );
+			$job = $this->jobMapper->find($jobId);
+			if ($job->getUserId() !== $userId) {
+				throw new NotFoundException($this->l10n->t('Cannot delete. Wrong owner.'));
 			} else {
-				$job = $this->jobMapper->delete ( $job );
+				$job = $this->jobMapper->delete($job);
 			}
-			$job->setTarget ( null );
-			$job->setSource ( null );
-			$job->setStatus ( null );
-			$job->setTempFile ( null );
-			$job->setType ( null );
-			$job->setUserId ( null );
-			$job->setErrorDisplayed ( null );
+			$job->setTarget(null);
+			$job->setSource(null);
+			$job->setStatus(null);
+			$job->setTempFile(null);
+			$job->setType(null);
+			$job->setUserId(null);
+			$job->setErrorDisplayed(null);
 			return $job;
-		} catch ( Exception $e ) {
+		} catch (Exception $e) {
 			if ($e instanceof DoesNotExistException) {
-				$ex = new NotFoundException ( $this->l10n->t ( 'Cannot delete. Wrong ID.' ) );
-				$this->handleException ( $ex );
+				$ex = new NotFoundException($this->l10n->t('Cannot delete. Wrong ID.'));
+				$this->handleException($ex);
 			} else {
-				$this->handleException ( $e );
+				$this->handleException($e);
 			}
 		}
 	}
@@ -207,21 +207,21 @@ 
 	 */
 	public function getAllJobsForUser($userId) {
 		try {
-			$jobs = $this->jobMapper->findAll ( $userId );
-			$jobsNew = array ();
-			foreach ( $jobs as $job ) {
-				$job->setTarget ( null );
-				$job->setSource ( null );
-				$job->setTempFile ( null );
-				$job->setType ( null );
-				$job->setUserId ( null );
-				$job->setErrorDisplayed ( null );
+			$jobs = $this->jobMapper->findAll($userId);
+			$jobsNew = array();
+			foreach ($jobs as $job) {
+				$job->setTarget(null);
+				$job->setSource(null);
+				$job->setTempFile(null);
+				$job->setType(null);
+				$job->setUserId(null);
+				$job->setErrorDisplayed(null);
 				
-				array_push ( $jobsNew, $job );
+				array_push($jobsNew, $job);
 			}
 			return $jobsNew;
-		} catch ( Exception $e ) {
-			$this->handleException ( $e );
+		} catch (Exception $e) {
+			$this->handleException($e);
 		}
 	}
 	
@@ -231,14 +231,14 @@ 
 	 */
 	public function checkForFinishedJobs() {
 		try {
-			$finishedJobs = $this->redisService->readingFinishedJobs ();
-			foreach ( $finishedJobs as $finishedJob ) {
-				$fJob = $this->transformJob( $finishedJob );
+			$finishedJobs = $this->redisService->readingFinishedJobs();
+			foreach ($finishedJobs as $finishedJob) {
+				$fJob = $this->transformJob($finishedJob);
 				$this->logger->debug('The following job finished: {job}', ['job' => $fJob]);
-				$this->jobFinished ( $fJob->id, $fJob->error, $fJob->log );
+				$this->jobFinished($fJob->id, $fJob->error, $fJob->log);
 			}
-		} catch ( Exception $e ) {
-			throw new NotFoundException ( $this->l10n->t ( 'Reading the finished jobs from redis went wrong.' ) );
+		} catch (Exception $e) {
+			throw new NotFoundException($this->l10n->t('Reading the finished jobs from redis went wrong.'));
 		}
 	}
 	
@@ -252,18 +252,18 @@ 
 	 */
 	public function jobFinished($jobId, $error, $log) {
 		try {
-			$job = $this->jobMapper->find ( $jobId );
-			if (! $error) {
-				$job->setStatus ( OcrConstants::STATUS_PROCESSED );
-				$this->jobMapper->update ( $job );
+			$job = $this->jobMapper->find($jobId);
+			if (!$error) {
+				$job->setStatus(OcrConstants::STATUS_PROCESSED);
+				$this->jobMapper->update($job);
 			} else {
-				$job->setStatus ( OcrConstants::STATUS_FAILED );
-				$job->setErrorLog( $log );
-				$this->jobMapper->update ( $job );
-				$this->logger->error ( $log);
+				$job->setStatus(OcrConstants::STATUS_FAILED);
+				$job->setErrorLog($log);
+				$this->jobMapper->update($job);
+				$this->logger->error($log);
 			}
-		} catch ( Exception $e ) {
-			$this->handleException ( $e );
+		} catch (Exception $e) {
+			$this->handleException($e);
 		}
 	}
 	
@@ -275,24 +275,24 @@ 
 	 */
 	public function handleProcessed() {
 		try {
-			$this->logger->debug ( 'Check if files were processed by ocr and if so, put them to the right dirs.');
-			$processed = $this->jobMapper->findAllProcessed ( $this->userId );
-			foreach ( $processed as $job ) {
-				if ($this->fileService->fileExists ( $job->getTempFile () )) {
+			$this->logger->debug('Check if files were processed by ocr and if so, put them to the right dirs.');
+			$processed = $this->jobMapper->findAllProcessed($this->userId);
+			foreach ($processed as $job) {
+				if ($this->fileService->fileExists($job->getTempFile())) {
 					// Save the tmp file with newname
-					$this->view->file_put_contents ( $job->getTarget (), $this->fileService->getFileContents ( $job->getTempFile () ) );
-					$this->jobMapper->delete ( $job );
-					$this->fileService->execRemove ( $job->getTempFile () );
+					$this->view->file_put_contents($job->getTarget(), $this->fileService->getFileContents($job->getTempFile()));
+					$this->jobMapper->delete($job);
+					$this->fileService->execRemove($job->getTempFile());
 				} else {
-					$job->setStatus ( OcrConstants::STATUS_FAILED );
+					$job->setStatus(OcrConstants::STATUS_FAILED);
 					$job->setErrorLog('Temp file does not exist.');
-					$this->jobMapper->update ( $job );
-					throw new NotFoundException ( $this->l10n->t ( 'Temp file does not exist.' ) );
+					$this->jobMapper->update($job);
+					throw new NotFoundException($this->l10n->t('Temp file does not exist.'));
 				}
 			}
 			return $processed;
-		} catch ( Exception $e ) {
-			$this->handleException ( $e );
+		} catch (Exception $e) {
+			$this->handleException($e);
 		}
 	}
 	
@@ -303,20 +303,20 @@ 
 	 */
 	public function handleFailed() {
 		try {
-			$failed = $this->jobMapper->findAllFailed ( $this->userId );
-			foreach ( $failed as $job ) {
+			$failed = $this->jobMapper->findAllFailed($this->userId);
+			foreach ($failed as $job) {
 				// clean the tempfile
-				$this->fileService->execRemove ( $job->getTempFile () );
+				$this->fileService->execRemove($job->getTempFile());
 				// set error displayed
-				$job->setErrorDisplayed ( true );
-				$this->jobMapper->update ( $job );
+				$job->setErrorDisplayed(true);
+				$this->jobMapper->update($job);
 			}
-			$this->logger->debug ( 'Following jobs failed: {failed}', [ 
-					'failed' => json_encode ( $failed )
-			] );
+			$this->logger->debug('Following jobs failed: {failed}', [ 
+					'failed' => json_encode($failed)
+			]);
 			return $failed;
-		} catch ( Exception $e ) {
-			$this->handleException ( $e );
+		} catch (Exception $e) {
+			$this->handleException($e);
 		}
 	}
 	
@@ -329,14 +329,14 @@ 
 	 */
 	private function getTempFile($type) {
 		if ($type === OcrConstants::TESSERACT) {
-			$fileName = $this->phpUtil->tempnamWrapper($this->tempM->getTempBaseDir (), OcrConstants::TEMPFILE_PREFIX);
+			$fileName = $this->phpUtil->tempnamWrapper($this->tempM->getTempBaseDir(), OcrConstants::TEMPFILE_PREFIX);
 			$this->phpUtil->unlinkWrapper($fileName);
 			$fileNameWithPostfix = $fileName . '.txt';
-			$this->phpUtil->touchWrapper( $fileNameWithPostfix );
-			$this->phpUtil->chmodWrapper( $fileNameWithPostfix, 0600 );
+			$this->phpUtil->touchWrapper($fileNameWithPostfix);
+			$this->phpUtil->chmodWrapper($fileNameWithPostfix, 0600);
 			return $fileNameWithPostfix;
 		} else {
-			return $this->phpUtil->tempnamWrapper( $this->tempM->getTempBaseDir (), 'ocr_' );
+			return $this->phpUtil->tempnamWrapper($this->tempM->getTempBaseDir(), 'ocr_');
 		}
 	}
 	
@@ -348,11 +348,11 @@ 
 	 * @return mixed
 	 */
 	private function transformJob($job) {
-		$decoded = json_decode ( $job );
-		if($decoded !== null && isset($decoded->id)) {
+		$decoded = json_decode($job);
+		if ($decoded !== null && isset($decoded->id)) {
 			return $decoded;
 		} else {
-			throw new NotFoundException($this->l10n->t ( 'The finished job retrieved by Redis was corrupt.' ));
+			throw new NotFoundException($this->l10n->t('The finished job retrieved by Redis was corrupt.'));
 		}
 	}
 	
@@ -363,8 +363,8 @@ 
 	 * @return boolean
 	 */
 	private function checkForAcceptedLanguages($languages) {
-		$installedLanguages = explode ( ';', $this->appConfigService->getAppValue ( 'languages' ) );
-		if (count ( array_diff ( $languages, $installedLanguages ) ) === 0) {
+		$installedLanguages = explode(';', $this->appConfigService->getAppValue('languages'));
+		if (count(array_diff($languages, $installedLanguages)) === 0) {
 			return true;
 		} else {
 			return false;
@@ -378,7 +378,7 @@ 
 	 * @return boolean
 	 */
 	private function noLanguage($languages) {
-		if (in_array ( 'any', $languages )) {
+		if (in_array('any', $languages)) {
 			return true;
 		} else {
 			return false;
@@ -393,9 +393,9 @@ 
 	 * @throws NotFoundException
 	 */
 	private function handleException($e) {
-		$this->logger->logException ( $e, [ 
+		$this->logger->logException($e, [ 
 				'message' => 'Exception during job service function processing' 
-		] );
+		]);
 		throw $e;
 	}
 }
\ No newline at end of file

lib/AppInfo/Application.php

Spacing +50 added lines, -50 removed lines

@@ -40,139 +40,139 @@ 
 	 * @param array $urlParams        	
 	 */
 	public function __construct(array $urlParams = array()) {
-		parent::__construct ( 'ocr', $urlParams );
-		$container = $this->getContainer ();
+		parent::__construct('ocr', $urlParams);
+		$container = $this->getContainer();
 		
 		/**
 		 * Add the js and style if OCA\Files app is loaded
 		 */
-		$eventDispatcher = \OC::$server->getEventDispatcher ();
-		$eventDispatcher->addListener ( 'OCA\Files::loadAdditionalScripts', function () {
-			script ( 'ocr', 'dist/ocrapp' );
-			style ( 'ocr', 'ocrstyle' );
+		$eventDispatcher = \OC::$server->getEventDispatcher();
+		$eventDispatcher->addListener('OCA\Files::loadAdditionalScripts', function() {
+			script('ocr', 'dist/ocrapp');
+			style('ocr', 'ocrstyle');
 			// if not loaded before - load select2 for multi select languages
-			vendor_script ( 'select2/select2' );
-			vendor_style ( 'select2/select2' );
+			vendor_script('select2/select2');
+			vendor_style('select2/select2');
 		} );
 		
 		/**
 		 * Register core services
 		 */
-		$container->registerService ( 'CurrentUID', function (IContainer $c) {
+		$container->registerService('CurrentUID', function(IContainer $c) {
 			/** @var \OC\Server $server */
-			$server = $c->query ( 'ServerContainer' );
-			$user = $server->getUserSession ()->getUser ();
-			return ($user) ? $user->getUID () : '';
+			$server = $c->query('ServerContainer');
+			$user = $server->getUserSession()->getUser();
+			return ($user) ? $user->getUID() : '';
 		} );
 		
 		// Allow automatic DI for the View, until they migrated to Nodes API
-		$container->registerService ( View::class, function () {
-			return new View ( '' );
-		}, false );
+		$container->registerService(View::class, function() {
+			return new View('');
+		}, false);
 		
 		/**
 		 * Register the PHPUtil
 		 */
-		$container->registerService ( 'PHPUtil', function (IContainer $c) {
+		$container->registerService('PHPUtil', function(IContainer $c) {
 			/** @var \OC\Server $server */
-			$server = $c->query ( 'ServerContainer' );
-			return new PHPUtil ( $server->getL10N ( 'ocr' ), $server->getLogger () );
+			$server = $c->query('ServerContainer');
+			return new PHPUtil($server->getL10N('ocr'), $server->getLogger());
 		} );
 		
 		/**
 		 * Register the Ocr Job mapper
 		 */
-		$container->registerService ( 'OcrJobMapper', function (IContainer $c) {
+		$container->registerService('OcrJobMapper', function(IContainer $c) {
 			/** @var \OC\Server $server */
-			$server = $c->query ( 'ServerContainer' );
-			return new OcrJobMapper ( $server->getDatabaseConnection () );
+			$server = $c->query('ServerContainer');
+			return new OcrJobMapper($server->getDatabaseConnection());
 		} );
 		
 		/**
 		 * Register the File mapper
 		 */
-		$container->registerService ( 'FileMapper', function (IContainer $c) {
+		$container->registerService('FileMapper', function(IContainer $c) {
 			/** @var \OC\Server $server */
-			$server = $c->query ( 'ServerContainer' );
-			return new FileMapper ( $server->getDatabaseConnection () );
+			$server = $c->query('ServerContainer');
+			return new FileMapper($server->getDatabaseConnection());
 		} );
 		
 		/**
 		 * Register the Share mapper
 		 */
-		$container->registerService ( 'ShareMapper', function (IContainer $c) {
+		$container->registerService('ShareMapper', function(IContainer $c) {
 			/** @var \OC\Server $server */
-			$server = $c->query ( 'ServerContainer' );
-			return new ShareMapper ( $server->getDatabaseConnection () );
+			$server = $c->query('ServerContainer');
+			return new ShareMapper($server->getDatabaseConnection());
 		} );
 		
 		/**
 		 * Register the App Config Service
 		 */
-		$container->registerService ( 'AppConfigService', function (IAppContainer $c) {
+		$container->registerService('AppConfigService', function(IAppContainer $c) {
 			/** @var \OC\Server $server */
-			$server = $c->query ( 'ServerContainer' );
-			return new AppConfigService ( $server->getConfig (), $server->getL10N ( 'ocr' ) );
+			$server = $c->query('ServerContainer');
+			return new AppConfigService($server->getConfig(), $server->getL10N('ocr'));
 		} );
 		
 		/**
 		 * Register the Job Service
 		 */
-		$container->registerService ( 'FileService', function (IAppContainer $c) {
+		$container->registerService('FileService', function(IAppContainer $c) {
 			/** @var \OC\Server $server */
-			$server = $c->query ( 'ServerContainer' );
-			return new FileService ( $server->getL10N ( 'ocr' ), $server->getLogger (), $c->query ( 'CurrentUID' ), $c->query ( 'FileMapper' ), $c->query ( 'ShareMapper' ) );
+			$server = $c->query('ServerContainer');
+			return new FileService($server->getL10N('ocr'), $server->getLogger(), $c->query('CurrentUID'), $c->query('FileMapper'), $c->query('ShareMapper'));
 		} );
 		
 		/**
 		 * Register the Redis Service
 		 */
-		$container->registerService ( 'RedisService', function (IAppContainer $c) {
+		$container->registerService('RedisService', function(IAppContainer $c) {
 			/** @var \OC\Server $server */
-			$server = $c->query ( 'ServerContainer' );
-			return new RedisService ( $c->query ( 'OcrJobMapper' ), $c->query ( 'FileService' ), $server->getConfig (), $server->getL10N ( 'ocr' ), $server->getLogger () );
+			$server = $c->query('ServerContainer');
+			return new RedisService($c->query('OcrJobMapper'), $c->query('FileService'), $server->getConfig(), $server->getL10N('ocr'), $server->getLogger());
 		} );
 		
 		/**
 		 * Register the Job Service
 		 */
-		$container->registerService ( 'JobService', function (IAppContainer $c) {
+		$container->registerService('JobService', function(IAppContainer $c) {
 			/** @var \OC\Server $server */
-			$server = $c->query ( 'ServerContainer' );
-			return new JobService ( $server->getL10N ( 'ocr' ), $server->getLogger (), $c->query ( 'CurrentUID' ), new View ( '/' . $c->query ( 'CurrentUID' ) . '/files' ), $server->getTempManager (), $c->query ( 'RedisService' ), $c->query ( 'OcrJobMapper' ), $c->query ( 'FileService' ), $c->query ( 'AppConfigService' ), $c->query ( 'PHPUtil' ) );
+			$server = $c->query('ServerContainer');
+			return new JobService($server->getL10N('ocr'), $server->getLogger(), $c->query('CurrentUID'), new View('/' . $c->query('CurrentUID') . '/files'), $server->getTempManager(), $c->query('RedisService'), $c->query('OcrJobMapper'), $c->query('FileService'), $c->query('AppConfigService'), $c->query('PHPUtil'));
 		} );
 		
 		/**
 		 * Register the Status Service
 		 */
-		$container->registerService ( 'StatusService', function (IAppContainer $c) {
+		$container->registerService('StatusService', function(IAppContainer $c) {
 			/** @var \OC\Server $server */
-			$server = $c->query ( 'ServerContainer' );
-			return new StatusService ( $server->getL10N ( 'ocr' ), $server->getLogger (), $c->query ( 'CurrentUID' ), $c->query ( 'OcrJobMapper' ), $c->query ( 'JobService' ) );
+			$server = $c->query('ServerContainer');
+			return new StatusService($server->getL10N('ocr'), $server->getLogger(), $c->query('CurrentUID'), $c->query('OcrJobMapper'), $c->query('JobService'));
 		} );
 		
 		/**
 		 * Controller
 		 */
-		$container->registerService ( 'StatusController', function (IAppContainer $c) {
+		$container->registerService('StatusController', function(IAppContainer $c) {
 			/** @var \OC\Server $server */
-			$server = $c->query ( 'ServerContainer' );
-			return new StatusController ( $c->getAppName (), $server->getRequest (), $c->query ( 'StatusService' ) );
+			$server = $c->query('ServerContainer');
+			return new StatusController($c->getAppName(), $server->getRequest(), $c->query('StatusService'));
 		} );
 		
 		/**
 		 * Controller
 		 */
-		$container->registerService ( 'JobController', function (IAppContainer $c) {
+		$container->registerService('JobController', function(IAppContainer $c) {
 			/** @var \OC\Server $server */
-			$server = $c->query ( 'ServerContainer' );
-			return new JobController ( $c->getAppName (), $server->getRequest (), $c->query ( 'JobService' ), $c->query ( 'CurrentUID' ) );
+			$server = $c->query('ServerContainer');
+			return new JobController($c->getAppName(), $server->getRequest(), $c->query('JobService'), $c->query('CurrentUID'));
 		} );
 		
 		/**
 		 * Controller
 		 */
-		$container->registerAlias ( 'PersonalSettingsController', PersonalSettingsController::class );
+		$container->registerAlias('PersonalSettingsController', PersonalSettingsController::class);
 	}
 	
 	/**
@@ -180,6 +180,6 @@ 
 	 * @codeCoverageIgnore
 	 */
 	public function registerPersonal() {
-		\OCP\App::registerPersonal ( $this->getContainer ()->getAppName (), 'personal' );
+		\OCP\App::registerPersonal($this->getContainer()->getAppName(), 'personal');
 	}
 }