janis91 / ocr

lib/Service/FileService.php

Spacing +38 added lines, -38 removed lines

@@ -69,7 +69,7 @@ 
 	 * @return boolean|null
 	 */
 	public function checkSharedWithInitiator($fileInfo) {
-		$owner = str_replace ( 'home::', '', $fileInfo->getStoragename () );
+		$owner = str_replace('home::', '', $fileInfo->getStoragename());
 		if ($this->userId === $owner) {
 			// user is owner (no shared file)
 			return false;
@@ -88,9 +88,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;
 	}
@@ -103,9 +103,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;
 		}
@@ -121,17 +121,17 @@ 
 	 * @throws NotFoundException
 	 */
 	public function buildFileInfo($files) {
-		$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;
@@ -144,7 +144,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;
@@ -159,7 +159,7 @@ 
 	 * @param string $pathToFile        	
 	 */
 	public function execRemove($pathToFile) {
-		exec ( 'rm ' . $pathToFile );
+		exec('rm ' . $pathToFile);
 	}
 	
 	/**
@@ -171,7 +171,7 @@ 
 	 * @return string
 	 */
 	public function getFileContents($pathToFile) {
-		return file_get_contents ( $pathToFile );
+		return file_get_contents($pathToFile);
 	}
 	
 	/**
@@ -183,7 +183,7 @@ 
 	 * @return boolean
 	 */
 	public function fileExists($pathToFile) {
-		return file_exists ( $pathToFile );
+		return file_exists($pathToFile);
 	}
 	
 	/**
@@ -196,7 +196,7 @@ 
 	 * @return string
 	 */
 	public function buildNotExistingFilename($filePath, $fileName) {
-		return \OCP\Files::buildNotExistingFileName ( $filePath, $fileName . '_OCR.pdf' );
+		return \OCP\Files::buildNotExistingFileName($filePath, $fileName . '_OCR.pdf');
 	}
 	
 	/**
@@ -210,29 +210,29 @@ 
 	 * @return string
 	 */
 	private function buildTargetForShared(File $fileInfo) {
-		$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 $this->buildNotExistingFilename ( $filePath, $fileName . '_OCR.pdf' );
+			return $this->buildNotExistingFilename($filePath, $fileName . '_OCR.pdf');
 		} else {
 			// IMAGES:
-			return $this->buildNotExistingFilename ( $filePath, $fileName . '_OCR.txt' );
+			return $this->buildNotExistingFilename($filePath, $fileName . '_OCR.txt');
 		}
 	}
 	
@@ -248,29 +248,29 @@ 
 	 */
 	private function buildTargetNotForShared(File $fileInfo) {
 		// 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 $this->buildNotExistingFilename ( $filePath, $fileName . '_OCR.pdf' );
+			return $this->buildNotExistingFilename($filePath, $fileName . '_OCR.pdf');
 		} else {
 			// IMAGES:
-			return $this->buildNotExistingFilename ( $filePath, $fileName . '_OCR.txt' );
+			return $this->buildNotExistingFilename($filePath, $fileName . '_OCR.txt');
 		}
 	}
 	
@@ -280,9 +280,9 @@ 
 	 * @param File $fileInfo        	
 	 */
 	private function checkMimeType(File $fileInfo) {
-		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.'));
 		}
 	}
 }
\ No newline at end of file

lib/Service/RedisService.php

Spacing +38 added lines, -38 removed lines

@@ -95,9 +95,9 @@ 
 		$this->logger = $logger;
 		$this->l10n = $l10n;
 		$this->config = $config;
-		$this->redisHost = $this->config->getAppValue ( $this->appName, 'redisHost' );
-		$this->redisPort = intval ( $this->config->getAppValue ( $this->appName, 'redisPort' ) );
-		$this->redisDb = intval ( $this->config->getAppValue ( $this->appName, 'redisDb' ) );
+		$this->redisHost = $this->config->getAppValue($this->appName, 'redisHost');
+		$this->redisPort = intval($this->config->getAppValue($this->appName, 'redisPort'));
+		$this->redisDb = intval($this->config->getAppValue($this->appName, 'redisDb'));
 	}
 	
 	/**
@@ -110,25 +110,25 @@ 
 	public function sendJob($job, $languages, $occDir) {
 		try {
 			// check for messaging and put everything together
-			$redis = $this->setupRedisInstance ();
+			$redis = $this->setupRedisInstance();
 			
-			$job = $this->mapper->insert ( $job );
-			$msg = json_encode ( array (
-					'id' => $job->getId (),
-					'type' => $job->getType (),
-					'source' => $job->getSource (),
-					'tempFile' => $job->getTempFile (),
+			$job = $this->mapper->insert($job);
+			$msg = json_encode(array(
+					'id' => $job->getId(),
+					'type' => $job->getType(),
+					'source' => $job->getSource(),
+					'tempFile' => $job->getTempFile(),
 					'languages' => $languages 
-			) );
-			if (! $redis->lPush ( OcrConstants::REDIS_NEW_JOBS_QUEUE, $msg )) {
-				throw new NotFoundException ( $this->l10n->t ( 'Could not add files to the redis OCR processing queue.' ) );
+			));
+			if (!$redis->lPush(OcrConstants::REDIS_NEW_JOBS_QUEUE, $msg)) {
+				throw new NotFoundException($this->l10n->t('Could not add files to the redis OCR processing queue.'));
 			}
-		} catch ( Exception $e ) {
-			$this->fileService->execRemove ( $job->getTempFile () );
-			$job->setStatus ( 'FAILED' );
-			$job->setErrorLog ( $this->l10n->t ( 'Could not add files to the redis OCR processing queue.' ) );
-			$this->mapper->update ( $job );
-			$this->handleException ( $e );
+		} catch (Exception $e) {
+			$this->fileService->execRemove($job->getTempFile());
+			$job->setStatus('FAILED');
+			$job->setErrorLog($this->l10n->t('Could not add files to the redis OCR processing queue.'));
+			$this->mapper->update($job);
+			$this->handleException($e);
 		}
 	}
 	
@@ -139,15 +139,15 @@ 
 	 */
 	public function readingFinishedJobs() {
 		try {
-			$redis = $this->setupRedisInstance ();
+			$redis = $this->setupRedisInstance();
 			
-			$result = $redis->multi ()->lRange ( OcrConstants::REDIS_FINISHED_JOBS_QUEUE, 0, - 1 )->delete ( OcrConstants::REDIS_FINISHED_JOBS_QUEUE )->exec ();
-			$this->logger->debug ( 'Retrieved the following array from redis: {result}', [ 
+			$result = $redis->multi()->lRange(OcrConstants::REDIS_FINISHED_JOBS_QUEUE, 0, - 1)->delete(OcrConstants::REDIS_FINISHED_JOBS_QUEUE)->exec();
+			$this->logger->debug('Retrieved the following array from redis: {result}', [ 
 					'result' => $result [0] 
-			] );
+			]);
 			return $result [0];
-		} catch ( Exception $e ) {
-			$this->handleException ( $e );
+		} catch (Exception $e) {
+			$this->handleException($e);
 		}
 	}
 	
@@ -158,21 +158,21 @@ 
 	 * @return \Redis
 	 */
 	private function setupRedisInstance() {
-		if (! extension_loaded ( 'redis' )) {
-			$this->logger->debug ( 'It seems that the message queueing capabilities are not available in your local php installation. Please install php-redis.' );
-			throw new NotFoundException ( $this->l10n->t ( 'Message queueing capabilities are missing on the server.' ) );
+		if (!extension_loaded('redis')) {
+			$this->logger->debug('It seems that the message queueing capabilities are not available in your local php installation. Please install php-redis.');
+			throw new NotFoundException($this->l10n->t('Message queueing capabilities are missing on the server.'));
 		}
 		
-		$redis = new \Redis ();
-		if (! $redis->connect ( $this->redisHost, $this->redisPort, 2.5, NULL, 100 )) {
-			$this->logger->debug ( 'Cannot connect to Redis.' );
-			throw new NotFoundException ( $this->l10n->t ( 'Cannot connect to Redis.' ) );
+		$redis = new \Redis();
+		if (!$redis->connect($this->redisHost, $this->redisPort, 2.5, NULL, 100)) {
+			$this->logger->debug('Cannot connect to Redis.');
+			throw new NotFoundException($this->l10n->t('Cannot connect to Redis.'));
 		}
-		if (! $redis->select ( $this->redisDb )) {
-			$this->logger->debug ( 'Cannot connect to the right Redis database.' );
-			throw new NotFoundException ( $this->l10n->t ( 'Cannot connect to the right Redis database.' ) );
+		if (!$redis->select($this->redisDb)) {
+			$this->logger->debug('Cannot connect to the right Redis database.');
+			throw new NotFoundException($this->l10n->t('Cannot connect to the right Redis database.'));
 		}
-		$redis->setOption ( \Redis::OPT_PREFIX, OcrConstants::REDIS_KEY_PREFIX );
+		$redis->setOption(\Redis::OPT_PREFIX, OcrConstants::REDIS_KEY_PREFIX);
 		
 		return $redis;
 	}
@@ -185,9 +185,9 @@ 
 	 * @throws NotFoundException
 	 */
 	private function handleException($e) {
-		$this->logger->logException ( $e, [ 
+		$this->logger->logException($e, [ 
 				'message' => 'Exception during message queue processing' 
-		] );
+		]);
 		throw $e;
 	}
 }
\ No newline at end of file

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