janis91 / ocr

lib/Service/StatusService.php

Spacing +13 added lines, -13 removed lines

@@ -81,26 +81,26 @@ 
 	public function getStatus() {
 		try {
 			// TODO: For now this will be placed in the regular check, but in the future this could be done in another way
-			$this->jobService->checkForFinishedJobs ();
+			$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,9 +112,9 @@ 
 	 * @throws NotFoundException
 	 */
 	private function handleException($e) {
-		$this->logger->logException ( $e, [ 
+		$this->logger->logException($e, [ 
 				'message' => 'Exception during status service function processing' 
-		] );
+		]);
 		throw $e;
 	}
 }
\ No newline at end of file

lib/Service/JobService.php

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