janis91 / ocr

lib/Migration/DropOldTable.php

Indentation +38 added lines, -38 removed lines

@@ -17,42 +17,42 @@
 
 class DropOldTable implements IRepairStep {
 
-    /** @var IDBConnection */
-    protected $connection;
-
-    /**
-     *
-     * @param IDBConnection $connection            
-     */
-    public function __construct(IDBConnection $connection) {
-        $this->connection = $connection;
-    }
-
-    /**
-     * Returns the step's name
-     * 
-     * @return string
-     */
-    public function getName() {
-        return 'Drop old database table';
-    }
-
-    /**
-     * Run repair step.
-     * Must throw exception on error.
-     * 
-     * @throws \Exception in case of failure
-     */
-    public function run(IOutput $output) {
-        $output->startProgress(1);
-        if ($this->connection->tableExists('ocr_jobs')) {
-            $this->connection->dropTable('ocr_jobs');
-        }
-        // still needed for downwards compatibility
-        if ($this->connection->tableExists('ocr_status')) {
-            $this->connection->dropTable('ocr_status');
-        }
-        $output->advance(1, "Drop old database table: ocr_jobs");
-        $output->finishProgress();
-    }
+	/** @var IDBConnection */
+	protected $connection;
+
+	/**
+	 *
+	 * @param IDBConnection $connection            
+	 */
+	public function __construct(IDBConnection $connection) {
+		$this->connection = $connection;
+	}
+
+	/**
+	 * Returns the step's name
+	 * 
+	 * @return string
+	 */
+	public function getName() {
+		return 'Drop old database table';
+	}
+
+	/**
+	 * Run repair step.
+	 * Must throw exception on error.
+	 * 
+	 * @throws \Exception in case of failure
+	 */
+	public function run(IOutput $output) {
+		$output->startProgress(1);
+		if ($this->connection->tableExists('ocr_jobs')) {
+			$this->connection->dropTable('ocr_jobs');
+		}
+		// still needed for downwards compatibility
+		if ($this->connection->tableExists('ocr_status')) {
+			$this->connection->dropTable('ocr_status');
+		}
+		$output->advance(1, "Drop old database table: ocr_jobs");
+		$output->finishProgress();
+	}
 }
\ No newline at end of file

lib/Controller/PersonalSettingsController.php

Indentation +18 added lines, -18 removed lines

@@ -17,23 +17,23 @@
 
 class PersonalSettingsController extends Controller {
 
-    /**
-     * PersonalSettingsController constructor.
-     * 
-     * @param string $AppName            
-     * @param IRequest $request            
-     */
-    public function __construct($AppName, IRequest $request) {
-        parent::__construct($AppName, $request);
-    }
+	/**
+	 * PersonalSettingsController constructor.
+	 * 
+	 * @param string $AppName            
+	 * @param IRequest $request            
+	 */
+	public function __construct($AppName, IRequest $request) {
+		parent::__construct($AppName, $request);
+	}
 
-    /**
-     * @NoAdminRequired
-     * 
-     * @return Template
-     */
-    public function displayPanel() {
-        $tmpl = new Template('ocr', 'settings-personal');
-        return $tmpl;
-    }
+	/**
+	 * @NoAdminRequired
+	 * 
+	 * @return Template
+	 */
+	public function displayPanel() {
+		$tmpl = new Template('ocr', 'settings-personal');
+		return $tmpl;
+	}
 }
\ No newline at end of file

lib/Controller/Errors.php

Indentation +14 added lines, -14 removed lines

@@ -23,18 +23,18 @@
  */
 trait Errors {
 
-    /**
-     * handles the thrown Errors for all Controllers
-     * and sends a DataResponse with the ErrorMessage of the service
-     * 
-     * @param Closure $callback            
-     * @return DataResponse
-     */
-    protected function handleNotFound(Closure $callback) {
-        try {
-            return new DataResponse($callback());
-        } catch (NotFoundException $e) {
-            return new DataResponse($e->getMessage(), Http::STATUS_NOT_FOUND);
-        }
-    }
+	/**
+	 * handles the thrown Errors for all Controllers
+	 * and sends a DataResponse with the ErrorMessage of the service
+	 * 
+	 * @param Closure $callback            
+	 * @return DataResponse
+	 */
+	protected function handleNotFound(Closure $callback) {
+		try {
+			return new DataResponse($callback());
+		} catch (NotFoundException $e) {
+			return new DataResponse($e->getMessage(), Http::STATUS_NOT_FOUND);
+		}
+	}
 }
\ No newline at end of file

lib/Controller/AdminSettingsController.php

Indentation +85 added lines, -85 removed lines

@@ -22,95 +22,95 @@
 
 class AdminSettingsController extends Controller {
 
-    /** @var IL10N */
-    private $l10n;
+	/** @var IL10N */
+	private $l10n;
 
-    /** @var AppConfigService */
-    private $appConfig;
-    use Errors;
+	/** @var AppConfigService */
+	private $appConfig;
+	use Errors;
 
-    /**
-     * Constructor
-     * 
-     * @param string $appName            
-     * @param IRequest $request            
-     * @param IL10N $l10n            
-     * @param AppConfigService $appConfig            
-     * @param string $userId            
-     */
-    public function __construct($appName, IRequest $request, IL10N $l10n, AppConfigService $appConfig, $userId) {
-        parent::__construct($appName, $request);
-        $this->l10n = $l10n;
-        $this->appConfig = $appConfig;
-    }
+	/**
+	 * Constructor
+	 * 
+	 * @param string $appName            
+	 * @param IRequest $request            
+	 * @param IL10N $l10n            
+	 * @param AppConfigService $appConfig            
+	 * @param string $userId            
+	 */
+	public function __construct($appName, IRequest $request, IL10N $l10n, AppConfigService $appConfig, $userId) {
+		parent::__construct($appName, $request);
+		$this->l10n = $l10n;
+		$this->appConfig = $appConfig;
+	}
 
-    /**
-     * @NoAdminRequired
-     * 
-     * @return DataResponse
-     */
-    public function getLanguages() {
-        return $this->handleNotFound(
-                function () {
-                    return [
-                            'languages' => $this->appConfig->getAppValue(OcrConstants::LANGUAGES_CONFIG_KEY)
-                    ];
-                });
-    }
+	/**
+	 * @NoAdminRequired
+	 * 
+	 * @return DataResponse
+	 */
+	public function getLanguages() {
+		return $this->handleNotFound(
+				function () {
+					return [
+							'languages' => $this->appConfig->getAppValue(OcrConstants::LANGUAGES_CONFIG_KEY)
+					];
+				});
+	}
 
-    /**
-     * @NoAdminRequired
-     * 
-     * @return DataResponse
-     */
-    public function evaluateRedisSettings() {
-        return $this->handleNotFound(
-                function () {
-                    return [
-                            'set' => $this->appConfig->evaluateRedisSettings()
-                    ];
-                });
-    }
+	/**
+	 * @NoAdminRequired
+	 * 
+	 * @return DataResponse
+	 */
+	public function evaluateRedisSettings() {
+		return $this->handleNotFound(
+				function () {
+					return [
+							'set' => $this->appConfig->evaluateRedisSettings()
+					];
+				});
+	}
 
-    /**
-     * Sets the languages that are supported by the docker worker instance.
-     * 
-     * @param string $languages            
-     * @return DataResponse
-     */
-    public function setLanguages($languages) {
-        return $this->handleNotFound(
-                function () use ($languages) {
-                    if ($languages !== null) {
-                        $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.'));
-                    }
-                });
-    }
+	/**
+	 * Sets the languages that are supported by the docker worker instance.
+	 * 
+	 * @param string $languages            
+	 * @return DataResponse
+	 */
+	public function setLanguages($languages) {
+		return $this->handleNotFound(
+				function () use ($languages) {
+					if ($languages !== null) {
+						$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.'));
+					}
+				});
+	}
 
-    /**
-     * Sets the Redis settings.
-     * 
-     * @param string $redisHost            
-     * @param string $redisPort            
-     * @param string $redisDb            
-     * @return DataResponse
-     */
-    public function setRedis($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');
-                    } else {
-                        throw new NotFoundException(
-                                $this->l10n->t('The Redis settings do not have the right format.'));
-                    }
-                });
-    }
+	/**
+	 * Sets the Redis settings.
+	 * 
+	 * @param string $redisHost            
+	 * @param string $redisPort            
+	 * @param string $redisDb            
+	 * @return DataResponse
+	 */
+	public function setRedis($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');
+					} else {
+						throw new NotFoundException(
+								$this->l10n->t('The Redis settings do not have the right format.'));
+					}
+				});
+	}
 }
\ No newline at end of file

lib/Controller/JobController.php

Indentation +62 added lines, -62 removed lines

@@ -23,71 +23,71 @@
  */
 class JobController extends Controller {
 
-    /**
-     *
-     * @var string
-     */
-    private $userId;
+	/**
+	 *
+	 * @var string
+	 */
+	private $userId;
 
-    /**
-     *
-     * @var OcrService
-     */
-    private $service;
-    use Errors;
+	/**
+	 *
+	 * @var OcrService
+	 */
+	private $service;
+	use Errors;
 
-    /**
-     * JobController constructor.
-     * 
-     * @param string $AppName            
-     * @param IRequest $request            
-     * @param JobService $service            
-     * @param
-     *            $UserId
-     */
-    public function __construct($AppName, IRequest $request, JobService $service, $UserId) {
-        parent::__construct($AppName, $request);
-        $this->userId = $UserId;
-        $this->service = $service;
-    }
+	/**
+	 * JobController constructor.
+	 * 
+	 * @param string $AppName            
+	 * @param IRequest $request            
+	 * @param JobService $service            
+	 * @param
+	 *            $UserId
+	 */
+	public function __construct($AppName, IRequest $request, JobService $service, $UserId) {
+		parent::__construct($AppName, $request);
+		$this->userId = $UserId;
+		$this->service = $service;
+	}
 
-    /**
-     * Processing the srcFile(s)
-     * @NoAdminRequired
-     * 
-     * @param string[] $languages
-     *            - deu, eng...
-     * @param array $files            
-     * @return DataResponse
-     */
-    public function process($languages, $files) {
-        return $this->handleNotFound(
-                function () use ($languages, $files) {
-                    return $this->service->process($languages, $files);
-                });
-    }
+	/**
+	 * Processing the srcFile(s)
+	 * @NoAdminRequired
+	 * 
+	 * @param string[] $languages
+	 *            - deu, eng...
+	 * @param array $files            
+	 * @return DataResponse
+	 */
+	public function process($languages, $files) {
+		return $this->handleNotFound(
+				function () use ($languages, $files) {
+					return $this->service->process($languages, $files);
+				});
+	}
 
-    /**
-     * @NoAdminRequired
-     * 
-     * @return \OCP\AppFramework\Http\DataResponse
-     */
-    public function getAllJobs() {
-        return $this->handleNotFound(function () {
-            return $this->service->getAllJobsForUser($this->userId);
-        });
-    }
+	/**
+	 * @NoAdminRequired
+	 * 
+	 * @return \OCP\AppFramework\Http\DataResponse
+	 */
+	public function getAllJobs() {
+		return $this->handleNotFound(function () {
+			return $this->service->getAllJobsForUser($this->userId);
+		});
+	}
 
-    /**
-     * @NoAdminRequired
-     * 
-     * @param integer $id            
-     * @return \OCP\AppFramework\Http\DataResponse
-     */
-    public function deleteJob($id) {
-        return $this->handleNotFound(
-                function () use ($id) {
-                    return $this->service->deleteJob($id, $this->userId);
-                });
-    }
+	/**
+	 * @NoAdminRequired
+	 * 
+	 * @param integer $id            
+	 * @return \OCP\AppFramework\Http\DataResponse
+	 */
+	public function deleteJob($id) {
+		return $this->handleNotFound(
+				function () use ($id) {
+					return $this->service->deleteJob($id, $this->userId);
+				});
+	}
 }
\ No newline at end of file

lib/Controller/StatusController.php

Indentation +28 added lines, -28 removed lines

@@ -17,34 +17,34 @@
 
 class StatusController extends Controller {
 
-    /**
-     *
-     * @var OcrService
-     */
-    private $service;
-    use Errors;
+	/**
+	 *
+	 * @var OcrService
+	 */
+	private $service;
+	use Errors;
 
-    /**
-     * StatusController constructor.
-     * 
-     * @param string $AppName            
-     * @param IRequest $request            
-     * @param StatusService $service            
-     */
-    public function __construct($AppName, IRequest $request, StatusService $service) {
-        parent::__construct($AppName, $request);
-        $this->service = $service;
-    }
+	/**
+	 * StatusController constructor.
+	 * 
+	 * @param string $AppName            
+	 * @param IRequest $request            
+	 * @param StatusService $service            
+	 */
+	public function __construct($AppName, IRequest $request, StatusService $service) {
+		parent::__construct($AppName, $request);
+		$this->service = $service;
+	}
 
-    /**
-     * Get the current status.
-     * @NoAdminRequired
-     * 
-     * @return DataResponse
-     */
-    public function getStatus() {
-        return $this->handleNotFound(function () {
-            return $this->service->getStatus();
-        });
-    }
+	/**
+	 * Get the current status.
+	 * @NoAdminRequired
+	 * 
+	 * @return DataResponse
+	 */
+	public function getStatus() {
+		return $this->handleNotFound(function () {
+			return $this->service->getStatus();
+		});
+	}
 }

lib/Service/JobService.php

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

lib/Service/FileService.php

Indentation +251 added lines, -251 removed lines

@@ -25,272 +25,272 @@
  */
 class FileService {
 
-    /**
-     *
-     * @var ILogger
-     */
-    private $logger;
+	/**
+	 *
+	 * @var ILogger
+	 */
+	private $logger;
 
-    /**
-     *
-     * @var FileMapper
-     */
-    private $fileMapper;
+	/**
+	 *
+	 * @var FileMapper
+	 */
+	private $fileMapper;
 
-    /**
-     *
-     * @var ShareMapper
-     */
-    private $shareMapper;
+	/**
+	 *
+	 * @var ShareMapper
+	 */
+	private $shareMapper;
 
-    /**
-     *
-     * @var string
-     */
-    private $userId;
+	/**
+	 *
+	 * @var string
+	 */
+	private $userId;
 
-    /**
-     *
-     * @var IL10N
-     */
-    private $l10n;
+	/**
+	 *
+	 * @var IL10N
+	 */
+	private $l10n;
 
-    public function __construct(IL10N $l10n, ILogger $logger, $userId, FileMapper $fileMapper, ShareMapper $shareMapper) {
-        $this->l10n = $l10n;
-        $this->logger = $logger;
-        $this->userId = $userId;
-        $this->fileMapper = $fileMapper;
-        $this->shareMapper = $shareMapper;
-    }
+	public function __construct(IL10N $l10n, ILogger $logger, $userId, FileMapper $fileMapper, ShareMapper $shareMapper) {
+		$this->l10n = $l10n;
+		$this->logger = $logger;
+		$this->userId = $userId;
+		$this->fileMapper = $fileMapper;
+		$this->shareMapper = $shareMapper;
+	}
 
-    /**
-     * Checks if shared with the process initiator
-     * 
-     * @param File $fileInfo            
-     * @return boolean|null
-     */
-    public function checkSharedWithInitiator($fileInfo) {
-        $owner = str_replace('home::', '', $fileInfo->getStoragename());
-        if ($this->userId === $owner) {
-            // user is owner (no shared file)
-            return false;
-        } else {
-            // user is not owner (shared file)
-            return true;
-        }
-    }
+	/**
+	 * Checks if shared with the process initiator
+	 * 
+	 * @param File $fileInfo            
+	 * @return boolean|null
+	 */
+	public function checkSharedWithInitiator($fileInfo) {
+		$owner = str_replace('home::', '', $fileInfo->getStoragename());
+		if ($this->userId === $owner) {
+			// user is owner (no shared file)
+			return false;
+		} else {
+			// user is not owner (shared file)
+			return true;
+		}
+	}
 
-    /**
-     * Builds the target name.
-     * 
-     * @param File $fileInfo            
-     * @param boolean $shared            
-     * @return string
-     */
-    public function buildTarget($fileInfo, $shared) {
-        if ($shared) {
-            $target = $this->buildTargetForShared($fileInfo);
-        } else {
-            $target = $this->buildTargetNotForShared($fileInfo);
-        }
-        return $target;
-    }
+	/**
+	 * Builds the target name.
+	 * 
+	 * @param File $fileInfo            
+	 * @param boolean $shared            
+	 * @return string
+	 */
+	public function buildTarget($fileInfo, $shared) {
+		if ($shared) {
+			$target = $this->buildTargetForShared($fileInfo);
+		} else {
+			$target = $this->buildTargetNotForShared($fileInfo);
+		}
+		return $target;
+	}
 
-    /**
-     * Builds the source name.
-     * 
-     * @param File $fileInfo            
-     * @param boolean $shared            
-     * @return string
-     */
-    public function buildSource($fileInfo, $shared) {
-        $source = $fileInfo->getPath();
-        if ($shared) {
-            $source = str_replace('home::', '', $fileInfo->getStoragename()) . '/' . $source;
-        } else {
-            $source = $this->userId . '/' . $source;
-        }
-        return $source;
-    }
+	/**
+	 * Builds the source name.
+	 * 
+	 * @param File $fileInfo            
+	 * @param boolean $shared            
+	 * @return string
+	 */
+	public function buildSource($fileInfo, $shared) {
+		$source = $fileInfo->getPath();
+		if ($shared) {
+			$source = str_replace('home::', '', $fileInfo->getStoragename()) . '/' . $source;
+		} else {
+			$source = $this->userId . '/' . $source;
+		}
+		return $source;
+	}
 
-    /**
-     * Returns the fileInfo for each file in files and checks
-     * if it has a allowed MIME type and some other conditions.
-     * 
-     * @param array $files            
-     * @return File[]
-     * @throws NotFoundException
-     */
-    public function buildFileInfo($files) {
-        $fileArray = array();
-        foreach ($files as $file) {
-            // Check if anything is missing and file type is correct
-            if (!empty($file['id'])) {
-                $fileInfo = $this->fileMapper->find($file['id']);
-                $this->checkMimeType($fileInfo);
-                array_push($fileArray, $fileInfo);
-            } else {
-                throw new NotFoundException($this->l10n->t('Wrong parameter.'));
-            }
-        }
-        return $fileArray;
-    }
+	/**
+	 * Returns the fileInfo for each file in files and checks
+	 * if it has a allowed MIME type and some other conditions.
+	 * 
+	 * @param array $files            
+	 * @return File[]
+	 * @throws NotFoundException
+	 */
+	public function buildFileInfo($files) {
+		$fileArray = array();
+		foreach ($files as $file) {
+			// Check if anything is missing and file type is correct
+			if (!empty($file['id'])) {
+				$fileInfo = $this->fileMapper->find($file['id']);
+				$this->checkMimeType($fileInfo);
+				array_push($fileArray, $fileInfo);
+			} else {
+				throw new NotFoundException($this->l10n->t('Wrong parameter.'));
+			}
+		}
+		return $fileArray;
+	}
 
-    /**
-     * Determines the correct type for the ocr process worker.
-     * 
-     * @param File $fileInfo            
-     * @return integer
-     */
-    public function getCorrectType($fileInfo) {
-        if ($fileInfo->getMimetype() === OcrConstants::MIME_TYPE_PDF) {
-            return OcrConstants::OCRmyPDF;
-        } else {
-            return OcrConstants::TESSERACT;
-        }
-    }
+	/**
+	 * Determines the correct type for the ocr process worker.
+	 * 
+	 * @param File $fileInfo            
+	 * @return integer
+	 */
+	public function getCorrectType($fileInfo) {
+		if ($fileInfo->getMimetype() === OcrConstants::MIME_TYPE_PDF) {
+			return OcrConstants::OCRmyPDF;
+		} else {
+			return OcrConstants::TESSERACT;
+		}
+	}
 
-    /**
-     * Executes the exec function with a remove statement for a given file path.
-     * @codeCoverageIgnore
-     * 
-     * @param string $pathToFile            
-     */
-    public function execRemove($pathToFile) {
-        exec('rm ' . $pathToFile);
-    }
+	/**
+	 * Executes the exec function with a remove statement for a given file path.
+	 * @codeCoverageIgnore
+	 * 
+	 * @param string $pathToFile            
+	 */
+	public function execRemove($pathToFile) {
+		exec('rm ' . $pathToFile);
+	}
 
-    /**
-     * Wraps the static file_get_contents method of php.
-     * @codeCoverageIgnore
-     * 
-     * @param string $pathToFile            
-     * @return string
-     */
-    public function getFileContents($pathToFile) {
-        return file_get_contents($pathToFile);
-    }
+	/**
+	 * Wraps the static file_get_contents method of php.
+	 * @codeCoverageIgnore
+	 * 
+	 * @param string $pathToFile            
+	 * @return string
+	 */
+	public function getFileContents($pathToFile) {
+		return file_get_contents($pathToFile);
+	}
 
-    /**
-     * Wraps the static file_exists method of php.
-     * @codeCoverageIgnore
-     * 
-     * @param string $pathToFile            
-     * @return boolean
-     */
-    public function fileExists($pathToFile) {
-        return file_exists($pathToFile);
-    }
+	/**
+	 * Wraps the static file_exists method of php.
+	 * @codeCoverageIgnore
+	 * 
+	 * @param string $pathToFile            
+	 * @return boolean
+	 */
+	public function fileExists($pathToFile) {
+		return file_exists($pathToFile);
+	}
 
-    /**
-     * Wraps the static function \OCP\Files::buildNotExistingFileName() in order to be able to test everything else.
-     * @codeCoverageIgnore
-     * 
-     * @param string $filePath            
-     * @param string $fileName            
-     * @return string
-     */
-    public function buildNotExistingFilename($filePath, $fileName) {
-        return \OCP\Files::buildNotExistingFileName($filePath, $fileName . '_OCR.pdf');
-    }
+	/**
+	 * Wraps the static function \OCP\Files::buildNotExistingFileName() in order to be able to test everything else.
+	 * @codeCoverageIgnore
+	 * 
+	 * @param string $filePath            
+	 * @param string $fileName            
+	 * @return string
+	 */
+	public function buildNotExistingFilename($filePath, $fileName) {
+		return \OCP\Files::buildNotExistingFileName($filePath, $fileName . '_OCR.pdf');
+	}
 
-    /**
-     * Returns a not existing file name for pdf or image processing
-     * protected as of testing issues with static methods.
-     * (Actually
-     * it will be mocked partially) FIXME: Change this behaviour as soon as the buidlNotExistingFileName function is not
-     * static anymore
-     * @codeCoverageIgnore
-     * 
-     * @param File $fileInfo            
-     * @return string
-     */
-    private function buildTargetForShared(File $fileInfo) {
-        $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'
-                                                                                                         // 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'
-                                                              // eliminate the file name from the path
-        $filePath = dirname($share->getFileTarget()); // '/thedom.png' => '/' || '/Test/thedom.png' => '/Test'
-                                                          // replace the first slash
-        $pos = strpos($filePath, '/');
-        if ($pos !== false) {
-            $filePath = substr_replace($filePath, '', $pos, strlen('/')); // '/' => '' || '/Test/' => 'Test'
-        }
-        if ($fileInfo->getMimetype() === OcrConstants::MIME_TYPE_PDF) {
-            // PDFs:
-            return $this->buildNotExistingFilename($filePath, $fileName . '_OCR.pdf');
-        } else {
-            // IMAGES:
-            return $this->buildNotExistingFilename($filePath, $fileName . '_OCR.txt');
-        }
-    }
+	/**
+	 * Returns a not existing file name for pdf or image processing
+	 * protected as of testing issues with static methods.
+	 * (Actually
+	 * it will be mocked partially) FIXME: Change this behaviour as soon as the buidlNotExistingFileName function is not
+	 * static anymore
+	 * @codeCoverageIgnore
+	 * 
+	 * @param File $fileInfo            
+	 * @return string
+	 */
+	private function buildTargetForShared(File $fileInfo) {
+		$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'
+																										 // 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'
+															  // eliminate the file name from the path
+		$filePath = dirname($share->getFileTarget()); // '/thedom.png' => '/' || '/Test/thedom.png' => '/Test'
+														  // replace the first slash
+		$pos = strpos($filePath, '/');
+		if ($pos !== false) {
+			$filePath = substr_replace($filePath, '', $pos, strlen('/')); // '/' => '' || '/Test/' => 'Test'
+		}
+		if ($fileInfo->getMimetype() === OcrConstants::MIME_TYPE_PDF) {
+			// PDFs:
+			return $this->buildNotExistingFilename($filePath, $fileName . '_OCR.pdf');
+		} else {
+			// IMAGES:
+			return $this->buildNotExistingFilename($filePath, $fileName . '_OCR.txt');
+		}
+	}
 
-    /**
-     * Returns a not existing file name for PDF or image processing
-     * protected as of testing issues with static methods.
-     * (Actually
-     * it will be mocked partially) FIXME: Change this behaviour as soon as the buidlNotExistingFileName function is not
-     * static anymore
-     * @codeCoverageIgnore
-     * 
-     * @param File $fileInfo            
-     * @return string
-     */
-    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'
-                                                                                                   // eliminate the file
-                                                                                                   // name from the path
-        $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/' => '/'
-                                                            // remove the last slash
-        $filePath = substr_replace($filePath, '', strrpos($filePath, '/'), strlen('/')); // '/Test/' => '/Test'
-                                                                                                  // || '/' => ''
-                                                                                                  // replace the first
-                                                                                                  // slash
-        $pos = strpos($filePath, '/');
-        if ($pos !== false) {
-            $filePath = substr_replace($filePath, '', $pos, strlen('/')); // '/Test' => '// 'Test' || '/' => ''
-        }
-        if ($fileInfo->getMimetype() === OcrConstants::MIME_TYPE_PDF) {
-            // PDFs:
-            return $this->buildNotExistingFilename($filePath, $fileName . '_OCR.pdf');
-        } else {
-            // IMAGES:
-            return $this->buildNotExistingFilename($filePath, $fileName . '_OCR.txt');
-        }
-    }
+	/**
+	 * Returns a not existing file name for PDF or image processing
+	 * protected as of testing issues with static methods.
+	 * (Actually
+	 * it will be mocked partially) FIXME: Change this behaviour as soon as the buidlNotExistingFileName function is not
+	 * static anymore
+	 * @codeCoverageIgnore
+	 * 
+	 * @param File $fileInfo            
+	 * @return string
+	 */
+	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'
+																								   // eliminate the file
+																								   // name from the path
+		$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/' => '/'
+															// remove the last slash
+		$filePath = substr_replace($filePath, '', strrpos($filePath, '/'), strlen('/')); // '/Test/' => '/Test'
+																								  // || '/' => ''
+																								  // replace the first
+																								  // slash
+		$pos = strpos($filePath, '/');
+		if ($pos !== false) {
+			$filePath = substr_replace($filePath, '', $pos, strlen('/')); // '/Test' => '// 'Test' || '/' => ''
+		}
+		if ($fileInfo->getMimetype() === OcrConstants::MIME_TYPE_PDF) {
+			// PDFs:
+			return $this->buildNotExistingFilename($filePath, $fileName . '_OCR.pdf');
+		} else {
+			// IMAGES:
+			return $this->buildNotExistingFilename($filePath, $fileName . '_OCR.txt');
+		}
+	}
 
-    /**
-     * Checks a MIME type for a specifically given FileInfo.
-     * 
-     * @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.'));
-        }
-    }
+	/**
+	 * Checks a MIME type for a specifically given FileInfo.
+	 * 
+	 * @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.'));
+		}
+	}
 }
\ No newline at end of file

lib/Service/AppConfigService.php

Indentation +83 added lines, -83 removed lines

@@ -17,93 +17,93 @@
 
 class AppConfigService {
 
-    /**
-     *
-     * @var string
-     */
-    private $appName = 'ocr';
+	/**
+	 *
+	 * @var string
+	 */
+	private $appName = 'ocr';
 
-    /**
-     *
-     * @var IConfig
-     */
-    private $config;
+	/**
+	 *
+	 * @var IConfig
+	 */
+	private $config;
 
-    /**
-     *
-     * @var IL10N
-     */
-    private $l10n;
+	/**
+	 *
+	 * @var IL10N
+	 */
+	private $l10n;
 
-    /**
-     * Constructor
-     * 
-     * @param IConfig $config            
-     * @param IL10N $l10n            
-     */
-    public function __construct(IConfig $config, IL10N $l10n) {
-        $this->config = $config;
-        $this->l10n = $l10n;
-    }
+	/**
+	 * Constructor
+	 * 
+	 * @param IConfig $config            
+	 * @param IL10N $l10n            
+	 */
+	public function __construct(IConfig $config, IL10N $l10n) {
+		$this->config = $config;
+		$this->l10n = $l10n;
+	}
 
-    /**
-     * Get a value by key
-     * 
-     * @param string $key            
-     * @return string
-     */
-    public function getAppValue($key) {
-        return $this->config->getAppValue($this->appName, $key);
-    }
+	/**
+	 * Get a value by key
+	 * 
+	 * @param string $key            
+	 * @return string
+	 */
+	public function getAppValue($key) {
+		return $this->config->getAppValue($this->appName, $key);
+	}
 
-    /**
-     * Evaluate if all redis related settings are set.
-     * 
-     * @return boolean
-     */
-    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) !== '') {
-            return true;
-        } else {
-            return false;
-        }
-    }
+	/**
+	 * Evaluate if all redis related settings are set.
+	 * 
+	 * @return boolean
+	 */
+	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) !== '') {
+			return true;
+		} else {
+			return false;
+		}
+	}
 
-    /**
-     * Set a value by key
-     * 
-     * @param string $key            
-     * @param string $value            
-     * @return string
-     */
-    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 ($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 ($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.'));
-            }
-        }
-        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.'));
-            }
-        }
-        return $this->config->setAppValue($this->appName, $key, $value);
-    }
+	/**
+	 * Set a value by key
+	 * 
+	 * @param string $key            
+	 * @param string $value            
+	 * @return string
+	 */
+	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 ($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 ($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.'));
+			}
+		}
+		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.'));
+			}
+		}
+		return $this->config->setAppValue($this->appName, $key, $value);
+	}
 }
\ No newline at end of file