janis91 / 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;
 use OCA\Ocr\Util\PHPUtil;
 

Indentation +354 added lines, -354 removed lines

@@ -29,380 +29,380 @@
  */
 class JobService {
 
-    /**
-     *
-     * @var ILogger
-     */
-    private $logger;
+	/**
+	 *
+	 * @var ILogger
+	 */
+	private $logger;
 
-    /**
-     *
-     * @var RedisService
-     */
-    private $redisService;
+	/**
+	 *
+	 * @var RedisService
+	 */
+	private $redisService;
 
-    /**
-     *
-     * @var OcrJobMapper
-     */
-    private $jobMapper;
+	/**
+	 *
+	 * @var OcrJobMapper
+	 */
+	private $jobMapper;
 
-    /**
-     *
-     * @var View
-     */
-    private $view;
+	/**
+	 *
+	 * @var View
+	 */
+	private $view;
 
-    /**
-     *
-     * @var String
-     */
-    private $userId;
+	/**
+	 *
+	 * @var String
+	 */
+	private $userId;
 
-    /**
-     *
-     * @var IL10N
-     */
-    private $l10n;
+	/**
+	 *
+	 * @var IL10N
+	 */
+	private $l10n;
 
-    /**
-     *
-     * @var FileService
-     */
-    private $fileService;
+	/**
+	 *
+	 * @var FileService
+	 */
+	private $fileService;
 
-    /**
-     *
-     * @var ITempManager
-     */
-    private $tempM;
+	/**
+	 *
+	 * @var ITempManager
+	 */
+	private $tempM;
 
-    /**
-     *
-     * @var AppConfigService
-     */
-    private $appConfigService;
+	/**
+	 *
+	 * @var AppConfigService
+	 */
+	private $appConfigService;
 
-    /**
-     *
-     * @var PHPUtil
-     */
-    private $phpUtil;
+	/**
+	 *
+	 * @var PHPUtil
+	 */
+	private $phpUtil;
 
-    /**
-     * JobService constructor.
-     * 
-     * @param IL10N $l10n            
-     * @param ILogger $logger            
-     * @param string $userId            
-     * @param View $view            
-     * @param RedisService $queueService            
-     * @param OcrJobMapper $mapper            
-     * @param FileService $fileService            
-     * @param AppConfigService $appConfigService            
-     * @param PHPUtil $phpUtil            
-     */
-    public function __construct(IL10N $l10n, ILogger $logger, $userId, View $view, ITempManager $tempManager, 
-            RedisService $queueService, OcrJobMapper $mapper, FileService $fileService, 
-            AppConfigService $appConfigService, PHPUtil $phpUtil) {
-        $this->logger = $logger;
-        $this->redisService = $queueService;
-        $this->jobMapper = $mapper;
-        $this->view = $view;
-        $this->userId = $userId;
-        $this->l10n = $l10n;
-        $this->fileService = $fileService;
-        $this->tempM = $tempManager;
-        $this->appConfigService = $appConfigService;
-        $this->phpUtil = $phpUtil;
-    }
+	/**
+	 * JobService constructor.
+	 * 
+	 * @param IL10N $l10n            
+	 * @param ILogger $logger            
+	 * @param string $userId            
+	 * @param View $view            
+	 * @param RedisService $queueService            
+	 * @param OcrJobMapper $mapper            
+	 * @param FileService $fileService            
+	 * @param AppConfigService $appConfigService            
+	 * @param PHPUtil $phpUtil            
+	 */
+	public function __construct(IL10N $l10n, ILogger $logger, $userId, View $view, ITempManager $tempManager, 
+			RedisService $queueService, OcrJobMapper $mapper, FileService $fileService, 
+			AppConfigService $appConfigService, PHPUtil $phpUtil) {
+		$this->logger = $logger;
+		$this->redisService = $queueService;
+		$this->jobMapper = $mapper;
+		$this->view = $view;
+		$this->userId = $userId;
+		$this->l10n = $l10n;
+		$this->fileService = $fileService;
+		$this->tempM = $tempManager;
+		$this->appConfigService = $appConfigService;
+		$this->phpUtil = $phpUtil;
+	}
 
-    /**
-     * Processes and prepares the files for OCR.
-     * Sends the stuff to the client in order to OCR async.
-     * 
-     * @param string[] $languages            
-     * @param array $files            
-     * @return string
-     */
-    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)
-                    ]);
-            // Check if files and language not empty
-            $noLang = $this->noLanguage($languages);
-            if (!empty($files) && ($this->checkForAcceptedLanguages($languages) || $noLang)) {
-                // language part:
-                if ($noLang) {
-                    $languages = [];
-                }
-                // file part:
-                $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);
-                    // set the running type
-                    $fType = $this->fileService->getCorrectType($fInfo);
-                    // create a temp file for ocr processing purposes
-                    $tempFile = $this->getTempFile($fType);
-                    // Create job object
-                    $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);
-                }
-                return 'PROCESSING';
-            } else {
-                throw new NotFoundException($this->l10n->t('Empty parameters passed.'));
-            }
-        } catch (Exception $e) {
-            $this->handleException($e);
-        }
-    }
+	/**
+	 * Processes and prepares the files for OCR.
+	 * Sends the stuff to the client in order to OCR async.
+	 * 
+	 * @param string[] $languages            
+	 * @param array $files            
+	 * @return string
+	 */
+	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)
+					]);
+			// Check if files and language not empty
+			$noLang = $this->noLanguage($languages);
+			if (!empty($files) && ($this->checkForAcceptedLanguages($languages) || $noLang)) {
+				// language part:
+				if ($noLang) {
+					$languages = [];
+				}
+				// file part:
+				$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);
+					// set the running type
+					$fType = $this->fileService->getCorrectType($fInfo);
+					// create a temp file for ocr processing purposes
+					$tempFile = $this->getTempFile($fType);
+					// Create job object
+					$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);
+				}
+				return 'PROCESSING';
+			} else {
+				throw new NotFoundException($this->l10n->t('Empty parameters passed.'));
+			}
+		} catch (Exception $e) {
+			$this->handleException($e);
+		}
+	}
 
-    /**
-     * Delete an ocr job for a given id and userId.
-     * 
-     * @param
-     *            $jobId
-     * @param string $userId            
-     * @return OcrJob
-     */
-    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.'));
-            } else {
-                $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);
-            return $job;
-        } catch (Exception $e) {
-            if ($e instanceof DoesNotExistException) {
-                $ex = new NotFoundException($this->l10n->t('Cannot delete. Wrong ID.'));
-                $this->handleException($ex);
-            } else {
-                $this->handleException($e);
-            }
-        }
-    }
+	/**
+	 * Delete an ocr job for a given id and userId.
+	 * 
+	 * @param
+	 *            $jobId
+	 * @param string $userId            
+	 * @return OcrJob
+	 */
+	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.'));
+			} else {
+				$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);
+			return $job;
+		} catch (Exception $e) {
+			if ($e instanceof DoesNotExistException) {
+				$ex = new NotFoundException($this->l10n->t('Cannot delete. Wrong ID.'));
+				$this->handleException($ex);
+			} else {
+				$this->handleException($e);
+			}
+		}
+	}
 
-    /**
-     * Gets all job objects for a specific user.
-     * 
-     * @param string $userId            
-     * @return array
-     */
-    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);
-                array_push($jobsNew, $job);
-            }
-            return $jobsNew;
-        } catch (Exception $e) {
-            $this->handleException($e);
-        }
-    }
+	/**
+	 * Gets all job objects for a specific user.
+	 * 
+	 * @param string $userId            
+	 * @return array
+	 */
+	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);
+				array_push($jobsNew, $job);
+			}
+			return $jobsNew;
+		} catch (Exception $e) {
+			$this->handleException($e);
+		}
+	}
 
-    /**
-     * The function checks if there are finished jobs to process finally.
-     * 
-     * @throws NotFoundException
-     */
-    public function checkForFinishedJobs() {
-        try {
-            $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);
-            }
-        } catch (Exception $e) {
-            throw new NotFoundException($this->l10n->t('Reading the finished jobs from redis went wrong.'));
-        }
-    }
+	/**
+	 * The function checks if there are finished jobs to process finally.
+	 * 
+	 * @throws NotFoundException
+	 */
+	public function checkForFinishedJobs() {
+		try {
+			$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);
+			}
+		} catch (Exception $e) {
+			throw new NotFoundException($this->l10n->t('Reading the finished jobs from redis went wrong.'));
+		}
+	}
 
-    /**
-     * The function the worker will call in order to set the jobs status.
-     * The worker should call it automatically after each processing step.
-     * 
-     * @param integer $jobId            
-     * @param boolean $error            
-     * @param string $log            
-     */
-    public function jobFinished($jobId, $error, $log) {
-        try {
-            $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);
-            }
-        } catch (Exception $e) {
-            $this->handleException($e);
-        }
-    }
+	/**
+	 * The function the worker will call in order to set the jobs status.
+	 * The worker should call it automatically after each processing step.
+	 * 
+	 * @param integer $jobId            
+	 * @param boolean $error            
+	 * @param string $log            
+	 */
+	public function jobFinished($jobId, $error, $log) {
+		try {
+			$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);
+			}
+		} catch (Exception $e) {
+			$this->handleException($e);
+		}
+	}
 
-    /**
-     * Finishes all Processed files by copying them to the right path and deleteing the temp files.
-     * Returns the number of processed files.
-     * 
-     * @return array
-     */
-    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())) {
-                    // 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());
-                } else {
-                    $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.'));
-                }
-            }
-            return $processed;
-        } catch (Exception $e) {
-            $this->handleException($e);
-        }
-    }
+	/**
+	 * Finishes all Processed files by copying them to the right path and deleteing the temp files.
+	 * Returns the number of processed files.
+	 * 
+	 * @return array
+	 */
+	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())) {
+					// 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());
+				} else {
+					$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.'));
+				}
+			}
+			return $processed;
+		} catch (Exception $e) {
+			$this->handleException($e);
+		}
+	}
 
-    /**
-     * Handles all failed orders of ocr processing queue and returns the job objects.
-     * 
-     * @return array
-     */
-    public function handleFailed() {
-        try {
-            $failed = $this->jobMapper->findAllFailed($this->userId);
-            foreach ($failed as $job) {
-                // clean the tempfile
-                $this->fileService->execRemove($job->getTempFile());
-                // set error displayed
-                $job->setErrorDisplayed(true);
-                $this->jobMapper->update($job);
-            }
-            $this->logger->debug('Following jobs failed: {failed}', 
-                    [
-                            'failed' => json_encode($failed)
-                    ]);
-            return $failed;
-        } catch (Exception $e) {
-            $this->handleException($e);
-        }
-    }
+	/**
+	 * Handles all failed orders of ocr processing queue and returns the job objects.
+	 * 
+	 * @return array
+	 */
+	public function handleFailed() {
+		try {
+			$failed = $this->jobMapper->findAllFailed($this->userId);
+			foreach ($failed as $job) {
+				// clean the tempfile
+				$this->fileService->execRemove($job->getTempFile());
+				// set error displayed
+				$job->setErrorDisplayed(true);
+				$this->jobMapper->update($job);
+			}
+			$this->logger->debug('Following jobs failed: {failed}', 
+					[
+							'failed' => json_encode($failed)
+					]);
+			return $failed;
+		} catch (Exception $e) {
+			$this->handleException($e);
+		}
+	}
 
-    /**
-     * Gives a temp file name back depending on the type of the OCR.
-     * Later in the worker this file is used as an output.
-     * 
-     * @param integer $type            
-     * @return string
-     */
-    private function getTempFile($type) {
-        if ($type === OcrConstants::TESSERACT) {
-            $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);
-            return $fileNameWithPostfix;
-        } else {
-            return $this->phpUtil->tempnamWrapper($this->tempM->getTempBaseDir(), 'ocr_');
-        }
-    }
+	/**
+	 * Gives a temp file name back depending on the type of the OCR.
+	 * Later in the worker this file is used as an output.
+	 * 
+	 * @param integer $type            
+	 * @return string
+	 */
+	private function getTempFile($type) {
+		if ($type === OcrConstants::TESSERACT) {
+			$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);
+			return $fileNameWithPostfix;
+		} else {
+			return $this->phpUtil->tempnamWrapper($this->tempM->getTempBaseDir(), 'ocr_');
+		}
+	}
 
-    /**
-     * Takes care of transforming an incoming finished job into a php readable object.
-     * 
-     * @param string $job            
-     * @throws NotFoundException
-     * @return mixed
-     */
-    private function transformJob($job) {
-        $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.'));
-        }
-    }
+	/**
+	 * Takes care of transforming an incoming finished job into a php readable object.
+	 * 
+	 * @param string $job            
+	 * @throws NotFoundException
+	 * @return mixed
+	 */
+	private function transformJob($job) {
+		$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.'));
+		}
+	}
 
-    /**
-     * Checks if the given languages are supported or not.
-     * 
-     * @param string[] $languages            
-     * @return boolean
-     */
-    private function checkForAcceptedLanguages($languages) {
-        $installedLanguages = explode(';', $this->appConfigService->getAppValue('languages'));
-        if (count(array_diff($languages, $installedLanguages)) === 0) {
-            return true;
-        } else {
-            return false;
-        }
-    }
+	/**
+	 * Checks if the given languages are supported or not.
+	 * 
+	 * @param string[] $languages            
+	 * @return boolean
+	 */
+	private function checkForAcceptedLanguages($languages) {
+		$installedLanguages = explode(';', $this->appConfigService->getAppValue('languages'));
+		if (count(array_diff($languages, $installedLanguages)) === 0) {
+			return true;
+		} else {
+			return false;
+		}
+	}
 
-    /**
-     * Checks if the process should be initiated without any language specified.
-     * 
-     * @param string[] $languages            
-     * @return boolean
-     */
-    private function noLanguage($languages) {
-        if (in_array('any', $languages)) {
-            return true;
-        } else {
-            return false;
-        }
-    }
+	/**
+	 * Checks if the process should be initiated without any language specified.
+	 * 
+	 * @param string[] $languages            
+	 * @return boolean
+	 */
+	private function noLanguage($languages) {
+		if (in_array('any', $languages)) {
+			return true;
+		} else {
+			return false;
+		}
+	}
 
-    /**
-     * Handle the possible thrown Exceptions from all methods of this class.
-     * 
-     * @param Exception $e            
-     * @throws Exception
-     * @throws NotFoundException
-     */
-    private function handleException($e) {
-        $this->logger->logException($e, 
-                [
-                        'message' => 'Exception during job service function processing'
-                ]);
-        throw $e;
-    }
+	/**
+	 * Handle the possible thrown Exceptions from all methods of this class.
+	 * 
+	 * @param Exception $e            
+	 * @throws Exception
+	 * @throws NotFoundException
+	 */
+	private function handleException($e) {
+		$this->logger->logException($e, 
+				[
+						'message' => 'Exception during job service function processing'
+				]);
+		throw $e;
+	}
 }
\ No newline at end of file

templates/settings-personal.php

Indentation +2 added lines, -2 removed lines

@@ -8,10 +8,10 @@
  * @copyright Janis Koehr 2017
  */
 style('ocr', [
-        'ocrpersonal'
+		'ocrpersonal'
 ]);
 script('ocr', [
-        'dist/ocrpersonal'
+		'dist/ocrpersonal'
 ]);
 ?>
 

appinfo/routes.php

Indentation +43 added lines, -43 removed lines

@@ -8,47 +8,47 @@
  * @copyright Janis Koehr 2017
  */
 return [
-        'routes' => [
-                [
-                        'name' => 'Job#process',
-                        'url' => '/',
-                        'verb' => 'POST'
-                ],
-                [
-                        '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'
-                ]
-        ]
+		'routes' => [
+				[
+						'name' => 'Job#process',
+						'url' => '/',
+						'verb' => 'POST'
+				],
+				[
+						'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'
+				]
+		]
 ];
\ No newline at end of file

lib/Db/OcrJob.php

Indentation +92 added lines, -92 removed lines

@@ -38,106 +38,106 @@
  */
 class OcrJob extends Entity implements JsonSerializable {
 
-    /**
-     *
-     * @var string
-     */
-    protected $status;
+	/**
+	 *
+	 * @var string
+	 */
+	protected $status;
 
-    /**
-     *
-     * @var string
-     */
-    protected $source;
+	/**
+	 *
+	 * @var string
+	 */
+	protected $source;
 
-    /**
-     *
-     * @var string
-     */
-    protected $target;
+	/**
+	 *
+	 * @var string
+	 */
+	protected $target;
 
-    /**
-     *
-     * @var string
-     */
-    protected $tempFile;
+	/**
+	 *
+	 * @var string
+	 */
+	protected $tempFile;
 
-    /**
-     *
-     * @var string
-     */
-    protected $type;
+	/**
+	 *
+	 * @var string
+	 */
+	protected $type;
 
-    /**
-     *
-     * @var string
-     */
-    protected $userId;
+	/**
+	 *
+	 * @var string
+	 */
+	protected $userId;
 
-    /**
-     *
-     * @var boolean
-     */
-    protected $errorDisplayed;
+	/**
+	 *
+	 * @var boolean
+	 */
+	protected $errorDisplayed;
 
-    /**
-     *
-     * @var string
-     */
-    protected $originalFilename;
+	/**
+	 *
+	 * @var string
+	 */
+	protected $originalFilename;
 
-    /**
-     *
-     * @var string
-     */
-    protected $errorLog;
+	/**
+	 *
+	 * @var string
+	 */
+	protected $errorLog;
 
-    /**
-     * OcrJob constructor.
-     * 
-     * @param string $status            
-     * @param string $source            
-     * @param string $target            
-     * @param string $tempFile            
-     * @param string $type            
-     * @param string $userId            
-     * @param boolean $errorDisplayed            
-     * @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) {
-        $this->setStatus($status);
-        $this->setSource($source);
-        $this->setTarget($target);
-        $this->setTempFile($tempFile);
-        $this->setType($type);
-        $this->setUserId($userId);
-        $this->setErrorDisplayed($errorDisplayed);
-        $this->setOriginalFilename($originalFilename);
-        $this->setErrorLog($errorLog);
-    }
+	/**
+	 * OcrJob constructor.
+	 * 
+	 * @param string $status            
+	 * @param string $source            
+	 * @param string $target            
+	 * @param string $tempFile            
+	 * @param string $type            
+	 * @param string $userId            
+	 * @param boolean $errorDisplayed            
+	 * @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) {
+		$this->setStatus($status);
+		$this->setSource($source);
+		$this->setTarget($target);
+		$this->setTempFile($tempFile);
+		$this->setType($type);
+		$this->setUserId($userId);
+		$this->setErrorDisplayed($errorDisplayed);
+		$this->setOriginalFilename($originalFilename);
+		$this->setErrorLog($errorLog);
+	}
 
-    /**
-     * Specify data which should be serialized to JSON
-     * 
-     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
-     * @return mixed data which can be serialized by <b>json_encode</b>,
-     *         which is a value of any type other than a resource.
-     * @since 5.4.0
-     */
-    function jsonSerialize() {
-        return [
-                'id' => $this->id,
-                'status' => $this->status,
-                'source' => $this->source,
-                'target' => $this->target,
-                'tempFile' => $this->tempFile,
-                'type' => $this->type,
-                'userId' => $this->userId,
-                'errorDisplayed' => $this->errorDisplayed,
-                'originalFilename' => $this->originalFilename,
-                'errorLog' => $this->errorLog
-        ];
-    }
+	/**
+	 * Specify data which should be serialized to JSON
+	 * 
+	 * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
+	 * @return mixed data which can be serialized by <b>json_encode</b>,
+	 *         which is a value of any type other than a resource.
+	 * @since 5.4.0
+	 */
+	function jsonSerialize() {
+		return [
+				'id' => $this->id,
+				'status' => $this->status,
+				'source' => $this->source,
+				'target' => $this->target,
+				'tempFile' => $this->tempFile,
+				'type' => $this->type,
+				'userId' => $this->userId,
+				'errorDisplayed' => $this->errorDisplayed,
+				'originalFilename' => $this->originalFilename,
+				'errorLog' => $this->errorLog
+		];
+	}
 }
\ No newline at end of file

lib/Db/Share.php

Indentation +13 added lines, -13 removed lines

@@ -21,18 +21,18 @@
  */
 class Share extends Entity {
 
-    /**
-     *
-     * @var string
-     */
-    protected $fileTarget;
+	/**
+	 *
+	 * @var string
+	 */
+	protected $fileTarget;
 
-    /**
-     * Share constructor.
-     * 
-     * @param null $fileTarget            
-     */
-    public function __construct($fileTarget = null) {
-        $this->fileTarget = $fileTarget;
-    }
+	/**
+	 * Share constructor.
+	 * 
+	 * @param null $fileTarget            
+	 */
+	public function __construct($fileTarget = null) {
+		$this->fileTarget = $fileTarget;
+	}
 }
\ No newline at end of file

lib/Db/ShareMapper.php

Indentation +24 added lines, -24 removed lines

@@ -21,29 +21,29 @@
  */
 class ShareMapper extends Mapper {
 
-    /**
-     * ShareMapper constructor.
-     * 
-     * @param IDBConnection $db            
-     */
-    public function __construct(IDBConnection $db) {
-        parent::__construct($db, 'share', 'OCA\Ocr\Db\Share');
-    }
+	/**
+	 * ShareMapper constructor.
+	 * 
+	 * @param IDBConnection $db            
+	 */
+	public function __construct(IDBConnection $db) {
+		parent::__construct($db, 'share', 'OCA\Ocr\Db\Share');
+	}
 
-    /**
-     * Find the right name for a shared file
-     * 
-     * @param integer $fileid            
-     * @param string $shareWith            
-     * @param string $owner            
-     * @return Share
-     */
-    public function find($fileid, $shareWith, $owner) {
-        $sql = 'SELECT file_target FROM *PREFIX*share WHERE file_source = ? AND share_with = ? AND uid_owner = ?';
-        return $this->findEntity($sql, [
-                $fileid,
-                $shareWith,
-                $owner
-        ]);
-    }
+	/**
+	 * Find the right name for a shared file
+	 * 
+	 * @param integer $fileid            
+	 * @param string $shareWith            
+	 * @param string $owner            
+	 * @return Share
+	 */
+	public function find($fileid, $shareWith, $owner) {
+		$sql = 'SELECT file_target FROM *PREFIX*share WHERE file_source = ? AND share_with = ? AND uid_owner = ?';
+		return $this->findEntity($sql, [
+				$fileid,
+				$shareWith,
+				$owner
+		]);
+	}
 }
\ No newline at end of file

lib/Db/OcrJobMapper.php

Indentation +77 added lines, -77 removed lines

@@ -22,86 +22,86 @@
  */
 class OcrJobMapper extends Mapper {
 
-    /**
-     * OcrJobMapper constructor.
-     * 
-     * @param IDBConnection $db            
-     */
-    public function __construct(IDBConnection $db) {
-        parent::__construct($db, 'ocr_jobs', 'OCA\Ocr\Db\OcrJob');
-    }
+	/**
+	 * OcrJobMapper constructor.
+	 * 
+	 * @param IDBConnection $db            
+	 */
+	public function __construct(IDBConnection $db) {
+		parent::__construct($db, 'ocr_jobs', 'OCA\Ocr\Db\OcrJob');
+	}
 
-    /**
-     * Find a specific job entity
-     * 
-     * @param
-     *            $id
-     * @return OcrJob
-     */
-    public function find($id) {
-        $sql = 'SELECT * FROM *PREFIX*ocr_jobs WHERE id = ?';
-        return $this->findEntity($sql, [
-                $id
-        ]);
-    }
+	/**
+	 * Find a specific job entity
+	 * 
+	 * @param
+	 *            $id
+	 * @return OcrJob
+	 */
+	public function find($id) {
+		$sql = 'SELECT * FROM *PREFIX*ocr_jobs WHERE id = ?';
+		return $this->findEntity($sql, [
+				$id
+		]);
+	}
 
-    /**
-     * Finds all user specific jobs entities
-     * 
-     * @param
-     *            $userId
-     * @return OcrJob[]
-     */
-    public function findAll($userId) {
-        $sql = 'SELECT * FROM *PREFIX*ocr_jobs WHERE user_id = ?';
-        return $this->findEntities($sql, [
-                $userId
-        ]);
-    }
+	/**
+	 * Finds all user specific jobs entities
+	 * 
+	 * @param
+	 *            $userId
+	 * @return OcrJob[]
+	 */
+	public function findAll($userId) {
+		$sql = 'SELECT * FROM *PREFIX*ocr_jobs WHERE user_id = ?';
+		return $this->findEntities($sql, [
+				$userId
+		]);
+	}
 
-    /**
-     * Finds all jobs PROCESSED entities for a given userid
-     * 
-     * @param
-     *            $userId
-     * @return OcrJob[]
-     */
-    public function findAllProcessed($userId) {
-        $sql = 'SELECT * FROM *PREFIX*ocr_jobs WHERE user_id = ? AND status = ?';
-        return $this->findEntities($sql, [
-                $userId,
-                OcrConstants::STATUS_PROCESSED
-        ]);
-    }
+	/**
+	 * Finds all jobs PROCESSED entities for a given userid
+	 * 
+	 * @param
+	 *            $userId
+	 * @return OcrJob[]
+	 */
+	public function findAllProcessed($userId) {
+		$sql = 'SELECT * FROM *PREFIX*ocr_jobs WHERE user_id = ? AND status = ?';
+		return $this->findEntities($sql, [
+				$userId,
+				OcrConstants::STATUS_PROCESSED
+		]);
+	}
 
-    /**
-     * Finds all jobs PENDING entities for a given userid.
-     * 
-     * @param
-     *            $userId
-     * @return OcrJob[]
-     */
-    public function findAllPending($userId) {
-        $sql = 'SELECT * FROM *PREFIX*ocr_jobs WHERE user_id = ? AND status = ?';
-        return $this->findEntities($sql, [
-                $userId,
-                OcrConstants::STATUS_PENDING
-        ]);
-    }
+	/**
+	 * Finds all jobs PENDING entities for a given userid.
+	 * 
+	 * @param
+	 *            $userId
+	 * @return OcrJob[]
+	 */
+	public function findAllPending($userId) {
+		$sql = 'SELECT * FROM *PREFIX*ocr_jobs WHERE user_id = ? AND status = ?';
+		return $this->findEntities($sql, [
+				$userId,
+				OcrConstants::STATUS_PENDING
+		]);
+	}
 
-    /**
-     * Finds all jobs FAILED entities for a given userid, which were not displayed yet.
-     * 
-     * @param
-     *            $userId
-     * @return OcrJob[]
-     */
-    public function findAllFailed($userId) {
-        $sql = 'SELECT * FROM *PREFIX*ocr_jobs WHERE user_id = ? AND status = ? AND error_displayed = ?';
-        return $this->findEntities($sql, [
-                $userId,
-                OcrConstants::STATUS_FAILED,
-                false
-        ]);
-    }
+	/**
+	 * Finds all jobs FAILED entities for a given userid, which were not displayed yet.
+	 * 
+	 * @param
+	 *            $userId
+	 * @return OcrJob[]
+	 */
+	public function findAllFailed($userId) {
+		$sql = 'SELECT * FROM *PREFIX*ocr_jobs WHERE user_id = ? AND status = ? AND error_displayed = ?';
+		return $this->findEntities($sql, [
+				$userId,
+				OcrConstants::STATUS_FAILED,
+				false
+		]);
+	}
 }
\ No newline at end of file

lib/Db/FileMapper.php

Indentation +23 added lines, -23 removed lines

@@ -21,28 +21,28 @@
  */
 class FileMapper extends Mapper {
 
-    /**
-     * FileMapper constructor.
-     * ATTENTION: the common methods like 'delete' 'update' and things like that will not work because we join and
-     * cleanup some columns!!!
-     * 
-     * @param IDBConnection $db            
-     */
-    public function __construct(IDBConnection $db) {
-        parent::__construct($db, 'filecache', 'OCA\Ocr\Db\File');
-    }
+	/**
+	 * FileMapper constructor.
+	 * ATTENTION: the common methods like 'delete' 'update' and things like that will not work because we join and
+	 * cleanup some columns!!!
+	 * 
+	 * @param IDBConnection $db            
+	 */
+	public function __construct(IDBConnection $db) {
+		parent::__construct($db, 'filecache', 'OCA\Ocr\Db\File');
+	}
 
-    /**
-     * Find a specific file entity
-     * 
-     * @param
-     *            $fileid
-     * @return File
-     */
-    public function find($fileid) {
-        $sql = 'SELECT f.fileid AS fileid, f.path AS path, f.name as name, m.mimetype AS mimetype, s.id AS storagename FROM *PREFIX*filecache AS f, *PREFIX*mimetypes AS m, *PREFIX*storages AS s WHERE f.fileid = ? AND f.mimetype = m.id AND f.storage = s.numeric_id';
-        return $this->findEntity($sql, [
-                $fileid
-        ]);
-    }
+	/**
+	 * Find a specific file entity
+	 * 
+	 * @param
+	 *            $fileid
+	 * @return File
+	 */
+	public function find($fileid) {
+		$sql = 'SELECT f.fileid AS fileid, f.path AS path, f.name as name, m.mimetype AS mimetype, s.id AS storagename FROM *PREFIX*filecache AS f, *PREFIX*mimetypes AS m, *PREFIX*storages AS s WHERE f.fileid = ? AND f.mimetype = m.id AND f.storage = s.numeric_id';
+		return $this->findEntity($sql, [
+				$fileid
+		]);
+	}
 }
\ No newline at end of file

lib/Db/File.php

Indentation +41 added lines, -41 removed lines

@@ -25,50 +25,50 @@
  */
 class File extends Entity {
 
-    /**
-     *
-     * @var integer
-     */
-    protected $fileid;
+	/**
+	 *
+	 * @var integer
+	 */
+	protected $fileid;
 
-    /**
-     *
-     * @var string
-     */
-    protected $path;
+	/**
+	 *
+	 * @var string
+	 */
+	protected $path;
 
-    /**
-     *
-     * @var string
-     */
-    protected $name;
+	/**
+	 *
+	 * @var string
+	 */
+	protected $name;
 
-    /**
-     *
-     * @var string
-     */
-    protected $mimetype;
+	/**
+	 *
+	 * @var string
+	 */
+	protected $mimetype;
 
-    /**
-     *
-     * @var string
-     */
-    protected $storagename;
+	/**
+	 *
+	 * @var string
+	 */
+	protected $storagename;
 
-    /**
-     * File constructor.
-     * 
-     * @param null $fileid            
-     * @param null $path            
-     * @param null $name            
-     * @param null $mimetype            
-     * @param null $storagename            
-     */
-    public function __construct($fileid = null, $path = null, $name = null, $mimetype = null, $storagename = null) {
-        $this->fileid = $fileid;
-        $this->path = $path;
-        $this->name = $name;
-        $this->mimetype = $mimetype;
-        $this->storagename = $storagename;
-    }
+	/**
+	 * File constructor.
+	 * 
+	 * @param null $fileid            
+	 * @param null $path            
+	 * @param null $name            
+	 * @param null $mimetype            
+	 * @param null $storagename            
+	 */
+	public function __construct($fileid = null, $path = null, $name = null, $mimetype = null, $storagename = null) {
+		$this->fileid = $fileid;
+		$this->path = $path;
+		$this->name = $name;
+		$this->mimetype = $mimetype;
+		$this->storagename = $storagename;
+	}
 }
\ No newline at end of file