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/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;
 
 /**

Spacing +95 added lines, -95 removed lines

@@ -115,44 +115,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);
 		}
 	}
 	
@@ -166,26 +166,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);
 			}
 		}
 	}
@@ -198,21 +198,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);
 		}
 	}
 	
@@ -222,14 +222,14 @@ 
 	 */
 	public function checkForFinishedJobs() {
 		try {
-			$finishedJobs = $this->redisService->readingFinishedJobs ();
-			foreach ( $finishedJobs as $finishedJob ) {
-				$fJob = json_decode ( $finishedJob );
+			$finishedJobs = $this->redisService->readingFinishedJobs();
+			foreach ($finishedJobs as $finishedJob) {
+				$fJob = json_decode($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.'));
 		}
 	}
 	
@@ -243,18 +243,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);
 		}
 	}
 	
@@ -266,24 +266,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);
 		}
 	}
 	
@@ -294,20 +294,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);
 		}
 	}
 	
@@ -321,14 +321,14 @@ 
 	 */
 	private function getTempFile($type) {
 		if ($type == OcrConstants::TESSERACT) {
-			$fileName = tempnam ( $this->tempM->getTempBaseDir (), 'ocr_' );
-			unlink ( $fileName );
+			$fileName = tempnam($this->tempM->getTempBaseDir(), 'ocr_');
+			unlink($fileName);
 			$fileNameWithPostfix = $fileName . '.txt';
-			touch ( $fileNameWithPostfix );
-			chmod ( $fileNameWithPostfix, 0600 );
+			touch($fileNameWithPostfix);
+			chmod($fileNameWithPostfix, 0600);
 			return $fileNameWithPostfix;
 		} else {
-			return tempnam ( $this->tempM->getTempBaseDir (), 'ocr_' );
+			return tempnam($this->tempM->getTempBaseDir(), 'ocr_');
 		}
 	}
 	
@@ -339,8 +339,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;
@@ -354,7 +354,7 @@ 
 	 * @return boolean
 	 */
 	private function noLanguage($languages) {
-		if (in_array ( 'any', $languages )) {
+		if (in_array('any', $languages)) {
 			return true;
 		} else {
 			return false;
@@ -369,12 +369,12 @@ 
 	 * @throws NotFoundException
 	 */
 	private function handleException($e) {
-		$this->logger->logException ( $e, [ 
+		$this->logger->logException($e, [ 
 				'app' => 'ocr',
 				'message' => 'Exception during job service function processing' 
-		] );
+		]);
 		if ($e instanceof NotFoundException) {
-			throw new NotFoundException ( $e->getMessage () );
+			throw new NotFoundException($e->getMessage());
 		} else {
 			throw $e;
 		}

lib/AppInfo/Application.php

Spacing +47 added lines, -47 removed lines

@@ -39,130 +39,130 @@ 
 	 * @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 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 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' ), $server->getConfig (), $server->getL10N ( 'ocr' ), $server->getLogger () );
+			$server = $c->query('ServerContainer');
+			return new RedisService($c->query('OcrJobMapper'), $server->getConfig(), $server->getL10N('ocr'), $server->getLogger());
 		} );
 		
 		/**
 		 * 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 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' ) );
+			$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'));
 		} );
 		
 		/**
 		 * 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);
 	}
 	
 	/**
@@ -170,6 +170,6 @@ 
 	 * @codeCoverageIgnore
 	 */
 	public function registerPersonal() {
-		\OCP\App::registerPersonal ( $this->getContainer ()->getAppName (), 'personal' );
+		\OCP\App::registerPersonal($this->getContainer()->getAppName(), 'personal');
 	}
 }

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/FileService.php

Spacing +51 added lines, -51 removed lines

@@ -72,7 +72,7 @@ 
 	 */
 	public function checkSharedWithInitiator($fileInfo) {
 		try {
-			$owner = str_replace ( 'home::', '', $fileInfo->getStoragename () );
+			$owner = str_replace('home::', '', $fileInfo->getStoragename());
 			if ($this->userId === $owner) {
 				// user is owner (no shared file)
 				return false;
@@ -80,8 +80,8 @@ 
 				// user is not owner (shared file)
 				return true;
 			}
-		} catch ( Exception $e ) {
-			$this->handleException ( $e );
+		} catch (Exception $e) {
+			$this->handleException($e);
 		}
 	}
 	
@@ -94,9 +94,9 @@ 
 	 */
 	public function buildTarget($fileInfo, $shared) {
 		if ($shared) {
-			$target = $this->buildTargetForShared ( $fileInfo );
+			$target = $this->buildTargetForShared($fileInfo);
 		} else {
-			$target = $this->buildTargetNotForShared ( $fileInfo );
+			$target = $this->buildTargetNotForShared($fileInfo);
 		}
 		return $target;
 	}
@@ -109,9 +109,9 @@ 
 	 * @return string
 	 */
 	public function buildSource($fileInfo, $shared) {
-		$source = $fileInfo->getPath ();
+		$source = $fileInfo->getPath();
 		if ($shared) {
-			$source = str_replace ( 'home::', '', $fileInfo->getStoragename () ) . '/' . $source;
+			$source = str_replace('home::', '', $fileInfo->getStoragename()) . '/' . $source;
 		} else {
 			$source = $this->userId . '/' . $source;
 		}
@@ -128,22 +128,22 @@ 
 	 */
 	public function buildFileInfo($files) {
 		try {
-			$fileArray = array ();
-			foreach ( $files as $file ) {
+			$fileArray = array();
+			foreach ($files as $file) {
 				// Check if anything is missing and file type is correct
-				if (! empty ( $file ['id'] )) {
+				if (!empty ($file ['id'])) {
 					
-					$fileInfo = $this->fileMapper->find ( $file ['id'] );
-					$this->checkMimeType ( $fileInfo );
+					$fileInfo = $this->fileMapper->find($file ['id']);
+					$this->checkMimeType($fileInfo);
 					
-					array_push ( $fileArray, $fileInfo );
+					array_push($fileArray, $fileInfo);
 				} else {
-					throw new NotFoundException ( $this->l10n->t ( 'Wrong parameter.' ) );
+					throw new NotFoundException($this->l10n->t('Wrong parameter.'));
 				}
 			}
 			return $fileArray;
-		} catch ( Exception $e ) {
-			$this->handleException ( $e );
+		} catch (Exception $e) {
+			$this->handleException($e);
 		}
 	}
 	
@@ -154,7 +154,7 @@ 
 	 * @return string
 	 */
 	public function removeFileExtension($job) {
-		return substr ( $job->getTarget (), 0, strrpos ( $job->getTarget (), '_OCR' ) );
+		return substr($job->getTarget(), 0, strrpos($job->getTarget(), '_OCR'));
 	}
 	
 	/**
@@ -164,7 +164,7 @@ 
 	 * @return integer
 	 */
 	public function getCorrectType($fileInfo) {
-		if ($fileInfo->getMimetype () === OcrConstants::MIME_TYPE_PDF) {
+		if ($fileInfo->getMimetype() === OcrConstants::MIME_TYPE_PDF) {
 			return OcrConstants::OCRmyPDF;
 		} else {
 			return OcrConstants::TESSERACT;
@@ -179,7 +179,7 @@ 
 	 * @param string $pathToFile        	
 	 */
 	public function execRemove($pathToFile) {
-		exec ( 'rm ' . $pathToFile );
+		exec('rm ' . $pathToFile);
 	}
 	
 	/**
@@ -191,7 +191,7 @@ 
 	 * @return string
 	 */
 	public function getFileContents($pathToFile) {
-		return file_get_contents ( $pathToFile );
+		return file_get_contents($pathToFile);
 	}
 	
 	/**
@@ -203,7 +203,7 @@ 
 	 * @return boolean
 	 */
 	public function fileExists($pathToFile) {
-		return file_exists ( $pathToFile );
+		return file_exists($pathToFile);
 	}
 	
 	/**
@@ -218,32 +218,32 @@ 
 	 */
 	protected function buildTargetForShared(File $fileInfo) {
 		try {
-			$share = $this->shareMapper->find ( $fileInfo->getFileid (), $this->userId, str_replace ( 'home::', '', $fileInfo->getStoragename () ) );
+			$share = $this->shareMapper->find($fileInfo->getFileid(), $this->userId, str_replace('home::', '', $fileInfo->getStoragename()));
 			
 			// get rid of the .png or .pdf and so on
-			$fileName = substr ( $share->getFileTarget (), 0, (strrpos ( $share->getFileTarget (), '.' )) ); // '/thedom.png' => '/thedom' || '/Test/thedom.png' => '/Test/thedom'
+			$fileName = substr($share->getFileTarget(), 0, (strrpos($share->getFileTarget(), '.'))); // '/thedom.png' => '/thedom' || '/Test/thedom.png' => '/Test/thedom'
 			                                                                                                 
 			// remove everything in front of and including of the first appearance of a slash from behind
-			$fileName = substr ( strrchr ( $fileName, "/" ), 1 ); // '/thedom' => 'thedom' || '/Test/thedom' => 'thedom'
+			$fileName = substr(strrchr($fileName, "/"), 1); // '/thedom' => 'thedom' || '/Test/thedom' => 'thedom'
 			                                                      
 			// eliminate the file name from the path
-			$filePath = dirname ( $share->getFileTarget () ); // '/thedom.png' => '/' || '/Test/thedom.png' => '/Test'
+			$filePath = dirname($share->getFileTarget()); // '/thedom.png' => '/' || '/Test/thedom.png' => '/Test'
 			                                                  
 			// replace the first slash
-			$pos = strpos ( $filePath, '/' );
+			$pos = strpos($filePath, '/');
 			if ($pos !== false) {
-				$filePath = substr_replace ( $filePath, '', $pos, strlen ( '/' ) ); // '/' => '' || '/Test/' => 'Test'
+				$filePath = substr_replace($filePath, '', $pos, strlen('/')); // '/' => '' || '/Test/' => 'Test'
 			}
 			
-			if ($fileInfo->getMimetype () === OcrConstants::MIME_TYPE_PDF) {
+			if ($fileInfo->getMimetype() === OcrConstants::MIME_TYPE_PDF) {
 				// PDFs:
-				return \OCP\Files::buildNotExistingFileName ( $filePath, $fileName . '_OCR.pdf' );
+				return \OCP\Files::buildNotExistingFileName($filePath, $fileName . '_OCR.pdf');
 			} else {
 				// IMAGES:
-				return \OCP\Files::buildNotExistingFileName ( $filePath, $fileName . '_OCR.txt' );
+				return \OCP\Files::buildNotExistingFileName($filePath, $fileName . '_OCR.txt');
 			}
-		} catch ( Exception $e ) {
-			$this->handleException ( $e );
+		} catch (Exception $e) {
+			$this->handleException($e);
 		}
 	}
 	
@@ -260,32 +260,32 @@ 
 	protected function buildTargetNotForShared(File $fileInfo) {
 		try {
 			// get rid of the .png or .pdf and so on
-			$fileName = substr ( $fileInfo->getName (), 0, (strrpos ( $fileInfo->getName (), '.' )) ); // 'thedom.png' => 'thedom'
+			$fileName = substr($fileInfo->getName(), 0, (strrpos($fileInfo->getName(), '.'))); // 'thedom.png' => 'thedom'
 			                                                                                           
 			// eliminate the file name from the path
-			$filePath = str_replace ( $fileInfo->getName (), '', $fileInfo->getPath () ); // 'files/Test/thedom.png' => 'files/Test/' || 'files/thedom.png' => 'files/'
+			$filePath = str_replace($fileInfo->getName(), '', $fileInfo->getPath()); // 'files/Test/thedom.png' => 'files/Test/' || 'files/thedom.png' => 'files/'
 			                                                                              
 			// and get the path on top of the files/ dir
-			$filePath = str_replace ( 'files', '', $filePath ); // 'files/Test/' => '/Test/' || 'files/' => '/'
+			$filePath = str_replace('files', '', $filePath); // 'files/Test/' => '/Test/' || 'files/' => '/'
 			                                                    
 			// remove the last slash
-			$filePath = substr_replace ( $filePath, '', strrpos ( $filePath, '/' ), strlen ( '/' ) ); // '/Test/' => '/Test' || '/' => ''
+			$filePath = substr_replace($filePath, '', strrpos($filePath, '/'), strlen('/')); // '/Test/' => '/Test' || '/' => ''
 			                                                                                          
 			// replace the first slash
-			$pos = strpos ( $filePath, '/' );
+			$pos = strpos($filePath, '/');
 			if ($pos !== false) {
-				$filePath = substr_replace ( $filePath, '', $pos, strlen ( '/' ) ); // '/Test' => '// 'Test' || '/' => ''
+				$filePath = substr_replace($filePath, '', $pos, strlen('/')); // '/Test' => '// 'Test' || '/' => ''
 			}
 			
-			if ($fileInfo->getMimetype () === OcrConstants::MIME_TYPE_PDF) {
+			if ($fileInfo->getMimetype() === OcrConstants::MIME_TYPE_PDF) {
 				// PDFs:
-				return \OCP\Files::buildNotExistingFileName ( $filePath, $fileName . '_OCR.pdf' );
+				return \OCP\Files::buildNotExistingFileName($filePath, $fileName . '_OCR.pdf');
 			} else {
 				// IMAGES:
-				return \OCP\Files::buildNotExistingFileName ( $filePath, $fileName . '_OCR.txt' );
+				return \OCP\Files::buildNotExistingFileName($filePath, $fileName . '_OCR.txt');
 			}
-		} catch ( Exception $e ) {
-			$this->handleException ( $e );
+		} catch (Exception $e) {
+			$this->handleException($e);
 		}
 	}
 	
@@ -296,12 +296,12 @@ 
 	 */
 	private function checkMimeType(File $fileInfo) {
 		try {
-			if (! $fileInfo || ! in_array ( $fileInfo->getMimetype (), OcrConstants::ALLOWED_MIME_TYPES )) {
-				$this->logger->debug ( 'Getting FileInfo did not work or not included in the ALLOWED_MIMETYPES array.');
-				throw new NotFoundException ( $this->l10n->t ( 'Wrong MIME type.' ) );
+			if (!$fileInfo || !in_array($fileInfo->getMimetype(), OcrConstants::ALLOWED_MIME_TYPES)) {
+				$this->logger->debug('Getting FileInfo did not work or not included in the ALLOWED_MIMETYPES array.');
+				throw new NotFoundException($this->l10n->t('Wrong MIME type.'));
 			}
-		} catch ( Exception $e ) {
-			$this->handleException ( $e );
+		} catch (Exception $e) {
+			$this->handleException($e);
 		}
 	}
 	
@@ -313,12 +313,12 @@ 
 	 * @throws NotFoundException
 	 */
 	private function handleException($e) {
-		$this->logger->logException ( $e, [ 
+		$this->logger->logException($e, [ 
 				'app' => 'ocr',
 				'message' => 'Exception during file service function processing' 
-		] );
+		]);
 		if ($e instanceof NotFoundException) {
-			throw new NotFoundException ( $e->getMessage () );
+			throw new NotFoundException($e->getMessage());
 		} else {
 			throw $e;
 		}

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/Service/StatusService.php

Spacing +13 added lines, -13 removed lines

@@ -84,23 +84,23 @@ 
 			$this->jobService->checkForFinishedJobs();
 			
 			// returns user specific processed files
-			$processed = $this->jobMapper->findAllProcessed ( $this->userId );
-			$this->jobService->handleProcessed ();
+			$processed = $this->jobMapper->findAllProcessed($this->userId);
+			$this->jobService->handleProcessed();
 			
 			// return user specific pending state
-			$pending = $this->jobMapper->findAllPending ( $this->userId );
+			$pending = $this->jobMapper->findAllPending($this->userId);
 			
 			// return user specific failed state and set up error
-			$failed = $this->jobMapper->findAllFailed ( $this->userId );
-			$this->jobService->handleFailed ();
+			$failed = $this->jobMapper->findAllFailed($this->userId);
+			$this->jobService->handleFailed();
 			
 			return [ 
-					'processed' => count ( $processed ),
-					'failed' => count ( $failed ),
-					'pending' => count ( $pending ) 
+					'processed' => count($processed),
+					'failed' => count($failed),
+					'pending' => count($pending) 
 			];
-		} catch ( Exception $e ) {
-			$this->handleException ( $e );
+		} catch (Exception $e) {
+			$this->handleException($e);
 		}
 	}
 	
@@ -112,12 +112,12 @@ 
 	 * @throws NotFoundException
 	 */
 	private function handleException($e) {
-		$this->logger->logException ( $e, [ 
+		$this->logger->logException($e, [ 
 				'app' => 'ocr',
 				'message' => 'Exception during status service function processing' 
-		] );
+		]);
 		if ($e instanceof NotFoundException) {
-			throw new NotFoundException ( $e->getMessage () );
+			throw new NotFoundException($e->getMessage());
 		} else {
 			throw $e;
 		}