janis91 / ocr

lib/Service/GearmanWorkerService.php

Doc Comments +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 	/**
 	 * Checks if a worker is active and registered at the Gearman Job Server.
 	 * returns false if not.
-	 * @return bool
+	 * @return boolean|null
 	 */
 	public function workerExists(){
 		try {

lib/Service/OcrService.php

Doc Comments +4 added lines, -3 removed lines

@@ -130,7 +130,7 @@ 
 	 * Processes and prepares the files for ocr.
 	 * Sends the stuff to the gearman client in order to ocr async.
 	 *
-	 * @param $language
+	 * @param string $language
 	 * @param array $files
 	 * @return string
 	 */
@@ -199,7 +199,7 @@ 
 	 * the gearman worker should call it automatically after each processing step.
 	 *
 	 * @param $statusId
-	 * @param $failed
+	 * @param boolean $failed
 	 */
 	public function complete($statusId, $failed){
 		try{
@@ -334,12 +334,13 @@ 
 
 	/**
 	 * Inits the Gearman client and sends the task to the background worker (async)
-	 * @param $type
+	 * @param string $type
 	 * @param $datadirectory
 	 * @param $path
 	 * @param $tempFile
 	 * @param $language
 	 * @param $statusId
+	 * @param OcrStatus $status
 	 */
 	private function sendGearmanJob($type, $datadirectory, $path, $tempFile, $language, $status, $occDir){
 		try {

Braces +10 added lines, -10 removed lines

@@ -120,7 +120,7 @@ 
 			} else {
 				throw new NotFoundException('No languages found.');
 			}
-		}catch(Exception $e){
+		} catch(Exception $e){
 			$this->handleException($e);
 		}
 	}
@@ -152,7 +152,7 @@ 
 					// set the gearman running type
 					if($fInfo->getMimetype() === $this::MIMETYPE_PDF){
 						$ftype = 'mypdf';
-					}else{
+					} else{
 						$ftype = 'tess';
 					}
 
@@ -164,10 +164,10 @@ 
 					$this->sendGearmanJob($ftype, $this->config->getSystemValue('datadirectory'), $fInfo->getPath(), $tempFile, $language, $status, \OC::$SERVERROOT);
 				}
 				return 'PROCESSING';
-			}else{
+			} else{
 				throw new NotFoundException('Empty parameters.');
 			}
-		}catch(Exception $e){
+		} catch(Exception $e){
 			$this->handleException($e);
 		}
 	}
@@ -188,7 +188,7 @@ 
 			$pending = count($this->statusMapper->findAllPending($this->userId));
 
 			return ['processed' => $processed, 'failed' => $failed, 'pending' => $pending];
-		}catch (Exception $e){
+		} catch (Exception $e){
 			$this->handleException($e);
 		}
 	}
@@ -206,7 +206,7 @@ 
 			if(!$failed) {
 				$status->setStatus('PROCESSED');
 				$this->statusMapper->update($status);
-			}else{
+			} else{
 				$status->setStatus('FAILED');
 				$this->statusMapper->update($status);
 			}
@@ -242,12 +242,12 @@ 
 					$this->view->file_put_contents($status->getNewName(), file_get_contents($status->getTempFile()));// don't need to extend with .pdf / it uses the tmp file to save
 					$this->statusMapper->delete($status);
 					exec('rm ' . $status->getTempFile());
-				}else{
+				} else{
 					throw new NotFoundException('Temp file does not exist.');
 				}
 			}
 			return count($processed);
-		}catch (Exception $e){
+		} catch (Exception $e){
 			$this->handleException($e);
 		}
 	}
@@ -268,7 +268,7 @@ 
 			}
 			$this->logger->debug('Following status objects failed: '.json_encode($failed), ['app' => 'ocr']);
 			return $failed;
-		}catch (Exception $e){
+		} catch (Exception $e){
 			$this->handleException($e);
 		}
 	}
@@ -340,7 +340,7 @@ 
 	private function getCorrectPath($file){
 		if($file['path'] === '/'){
 			$path = ''. '/' . $file['name'];
-		}else{
+		} else{
 			$path = $file['path']. '/' . $file['name'];
 		}
 		return $path;

worker/GearmanOCRWorker.php

Braces +3 added lines, -3 removed lines

@@ -16,11 +16,11 @@ 
 		if ($success == 0 && !isset($_out[1])) {
 			//occ command which puts the file and cleans the tempfile
 			exec('php '.$workload->occdir.'/occ ocr:complete '.$workload->statusid.' false');
-		}else{
+		} else{
 			//update status failed.
 			exec('php '.$workload->occdir.'/occ ocr:complete '.$workload->statusid.' true');
 		}
-	}else{
+	} else{
 		//ocrmypdf
 		$command = 'ocrmypdf "' . $workload->datadirectory . $workload->path . '" "' . $workload->tempfile . '" -l ' . $workload->language . ' --skip-text';
 		$success = -1;
@@ -29,7 +29,7 @@ 
 		if ($success == 0 && !isset($_out[0])) {
 			//occ command which puts the file and cleans the tempfile
 			exec('php '.$workload->occdir.'/occ ocr:complete '.$workload->statusid.' false');
-		}else{
+		} else{
 			//update status failed.
 			exec('php '.$workload->occdir.'/occ ocr:complete '.$workload->statusid.' true');
 		}

lib/Command/CompleteOCR.php

Braces +3 added lines, -3 removed lines

@@ -71,9 +71,9 @@ 
 		try{
 			if($failed === 'false'){
 				$failed = false;
-			}elseif ($failed === 'true'){
+			} elseif ($failed === 'true'){
 				$failed = true;
-			}else{
+			} else{
 				throw new ServiceException('Wrong Arguments.');
 			}
 			$this->ocrService->complete($statusId, $failed);
@@ -82,7 +82,7 @@ 
 				$output->writeln('<error>Could not complete ocr for status id ' . $statusId .
 					': ' . $e->getMessage() .
 					'</error> ');
-			}else{
+			} else{
 				$output->writeln('<error>Unexpected error for status id ' . $statusId .
 					': ' . $e->getMessage() .
 					'</error> ');