janis91 / ocr

lib/Service/StatusService.php

Indentation +83 added lines, -83 removed lines

@@ -23,94 +23,94 @@
  */
 class StatusService {
 
-    /**
-     *
-     * @var ILogger
-     */
-    private $logger;
+	/**
+	 *
+	 * @var ILogger
+	 */
+	private $logger;
 
-    /**
-     *
-     * @var String
-     */
-    private $userId;
+	/**
+	 *
+	 * @var String
+	 */
+	private $userId;
 
-    /**
-     *
-     * @var IL10N
-     */
-    private $l10n;
+	/**
+	 *
+	 * @var IL10N
+	 */
+	private $l10n;
 
-    /**
-     *
-     * @var OcrJobMapper
-     */
-    private $jobMapper;
+	/**
+	 *
+	 * @var OcrJobMapper
+	 */
+	private $jobMapper;
 
-    /**
-     *
-     * @var JobService
-     */
-    private $jobService;
+	/**
+	 *
+	 * @var JobService
+	 */
+	private $jobService;
 
-    /**
-     * StatusService constructor.
-     * 
-     * @param IL10N $l10n            
-     * @param ILogger $logger            
-     * @param unknown $userId            
-     * @param OcrJobMapper $mapper            
-     * @param JobService $jobService            
-     */
-    public function __construct(IL10N $l10n, ILogger $logger, $userId, OcrJobMapper $mapper, JobService $jobService) {
-        $this->logger = $logger;
-        $this->jobMapper = $mapper;
-        $this->userId = $userId;
-        $this->l10n = $l10n;
-        $this->jobService = $jobService;
-    }
+	/**
+	 * StatusService constructor.
+	 * 
+	 * @param IL10N $l10n            
+	 * @param ILogger $logger            
+	 * @param unknown $userId            
+	 * @param OcrJobMapper $mapper            
+	 * @param JobService $jobService            
+	 */
+	public function __construct(IL10N $l10n, ILogger $logger, $userId, OcrJobMapper $mapper, JobService $jobService) {
+		$this->logger = $logger;
+		$this->jobMapper = $mapper;
+		$this->userId = $userId;
+		$this->l10n = $l10n;
+		$this->jobService = $jobService;
+	}
 
-    /**
-     * A function which returns the JSONResponse for all required status checks and tasks.
-     * It will check for already processed, pending and failed ocr tasks and return them as needed.
-     * @codeCoverageIgnore
-     * 
-     * @return string
-     */
-    public function getStatus() {
-        try {
-            // TODO: For now this will be placed in the regular check, but in the future this could be done in another
-            // way
-            $this->jobService->checkForFinishedJobs();
-            // returns user specific processed files
-            $processed = $this->jobMapper->findAllProcessed($this->userId);
-            $this->jobService->handleProcessed();
-            // return user specific pending state
-            $pending = $this->jobMapper->findAllPending($this->userId);
-            // return user specific failed state and set up error
-            $failed = $this->jobMapper->findAllFailed($this->userId);
-            $this->jobService->handleFailed();
-            return [
-                    'processed' => count($processed),
-                    'failed' => count($failed),
-                    'pending' => count($pending)
-            ];
-        } catch (Exception $e) {
-            $this->handleException($e);
-        }
-    }
+	/**
+	 * A function which returns the JSONResponse for all required status checks and tasks.
+	 * It will check for already processed, pending and failed ocr tasks and return them as needed.
+	 * @codeCoverageIgnore
+	 * 
+	 * @return string
+	 */
+	public function getStatus() {
+		try {
+			// TODO: For now this will be placed in the regular check, but in the future this could be done in another
+			// way
+			$this->jobService->checkForFinishedJobs();
+			// returns user specific processed files
+			$processed = $this->jobMapper->findAllProcessed($this->userId);
+			$this->jobService->handleProcessed();
+			// return user specific pending state
+			$pending = $this->jobMapper->findAllPending($this->userId);
+			// return user specific failed state and set up error
+			$failed = $this->jobMapper->findAllFailed($this->userId);
+			$this->jobService->handleFailed();
+			return [
+					'processed' => count($processed),
+					'failed' => count($failed),
+					'pending' => count($pending)
+			];
+		} catch (Exception $e) {
+			$this->handleException($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 status 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 status service function processing'
+		]);
+		throw $e;
+	}
 }
\ No newline at end of file

lib/Constants/OcrConstants.php

Indentation +114 added lines, -114 removed lines

@@ -13,118 +13,118 @@
 
 abstract class OcrConstants {
 
-    /**
-     * The pending status.
-     * 
-     * @var string
-     */
-    const STATUS_PENDING = 'PENDING';
-
-    /**
-     * The processed status.
-     * 
-     * @var string
-     */
-    const STATUS_PROCESSED = 'PROCESSED';
-
-    /**
-     * The failed status.
-     * 
-     * @var string
-     */
-    const STATUS_FAILED = 'FAILED';
-
-    /**
-     * Supported MIME types for OCR processing.
-     * 
-     * @var array
-     */
-    const ALLOWED_MIME_TYPES = [
-            'application/pdf',
-            'image/png',
-            'image/jpeg',
-            'image/tiff',
-            'image/jp2',
-            'image/jpm',
-            'image/jpx',
-            'image/webp',
-            'image/gif'
-    ];
-
-    /**
-     * The correct MIME type for a PDF file.
-     * 
-     * @var string
-     */
-    const MIME_TYPE_PDF = 'application/pdf';
-
-    /**
-     * The type of a job (OCRmyPDF).
-     * 
-     * @var integer
-     */
-    const OCRmyPDF = 1;
-
-    /**
-     * The type of a job (Tesseract).
-     * 
-     * @var integer
-     */
-    const TESSERACT = 0;
-
-    /**
-     * The name of the message queue that waits for now jobs.
-     * 
-     * @var string
-     */
-    const REDIS_NEW_JOBS_QUEUE = 'incoming';
-
-    /**
-     * The name of the message queue that waits for finished jobs.
-     * 
-     * @var string
-     */
-    const REDIS_FINISHED_JOBS_QUEUE = 'finished';
-
-    /**
-     * The name of the languages config key.
-     * 
-     * @var string
-     */
-    const LANGUAGES_CONFIG_KEY = 'languages';
-
-    /**
-     * The name of the redis host config key.
-     * 
-     * @var string
-     */
-    const REDIS_CONFIG_KEY_HOST = 'redisHost';
-
-    /**
-     * The name of the redis port config key.
-     * 
-     * @var string
-     */
-    const REDIS_CONFIG_KEY_PORT = 'redisPort';
-
-    /**
-     * The name of the redis db config key.
-     * 
-     * @var string
-     */
-    const REDIS_CONFIG_KEY_DB = 'redisDb';
-
-    /**
-     * The prefix for the redis key.
-     * 
-     * @var string
-     */
-    const REDIS_KEY_PREFIX = 'ocr:';
-
-    /**
-     * The prefix for the tempfiles that are created.
-     * 
-     * @var string
-     */
-    const TEMPFILE_PREFIX = 'ocr_';
+	/**
+	 * The pending status.
+	 * 
+	 * @var string
+	 */
+	const STATUS_PENDING = 'PENDING';
+
+	/**
+	 * The processed status.
+	 * 
+	 * @var string
+	 */
+	const STATUS_PROCESSED = 'PROCESSED';
+
+	/**
+	 * The failed status.
+	 * 
+	 * @var string
+	 */
+	const STATUS_FAILED = 'FAILED';
+
+	/**
+	 * Supported MIME types for OCR processing.
+	 * 
+	 * @var array
+	 */
+	const ALLOWED_MIME_TYPES = [
+			'application/pdf',
+			'image/png',
+			'image/jpeg',
+			'image/tiff',
+			'image/jp2',
+			'image/jpm',
+			'image/jpx',
+			'image/webp',
+			'image/gif'
+	];
+
+	/**
+	 * The correct MIME type for a PDF file.
+	 * 
+	 * @var string
+	 */
+	const MIME_TYPE_PDF = 'application/pdf';
+
+	/**
+	 * The type of a job (OCRmyPDF).
+	 * 
+	 * @var integer
+	 */
+	const OCRmyPDF = 1;
+
+	/**
+	 * The type of a job (Tesseract).
+	 * 
+	 * @var integer
+	 */
+	const TESSERACT = 0;
+
+	/**
+	 * The name of the message queue that waits for now jobs.
+	 * 
+	 * @var string
+	 */
+	const REDIS_NEW_JOBS_QUEUE = 'incoming';
+
+	/**
+	 * The name of the message queue that waits for finished jobs.
+	 * 
+	 * @var string
+	 */
+	const REDIS_FINISHED_JOBS_QUEUE = 'finished';
+
+	/**
+	 * The name of the languages config key.
+	 * 
+	 * @var string
+	 */
+	const LANGUAGES_CONFIG_KEY = 'languages';
+
+	/**
+	 * The name of the redis host config key.
+	 * 
+	 * @var string
+	 */
+	const REDIS_CONFIG_KEY_HOST = 'redisHost';
+
+	/**
+	 * The name of the redis port config key.
+	 * 
+	 * @var string
+	 */
+	const REDIS_CONFIG_KEY_PORT = 'redisPort';
+
+	/**
+	 * The name of the redis db config key.
+	 * 
+	 * @var string
+	 */
+	const REDIS_CONFIG_KEY_DB = 'redisDb';
+
+	/**
+	 * The prefix for the redis key.
+	 * 
+	 * @var string
+	 */
+	const REDIS_KEY_PREFIX = 'ocr:';
+
+	/**
+	 * The prefix for the tempfiles that are created.
+	 * 
+	 * @var string
+	 */
+	const TEMPFILE_PREFIX = 'ocr_';
 }
\ No newline at end of file

lib/Settings/Admin.php

Indentation +43 added lines, -43 removed lines

@@ -18,51 +18,51 @@
 
 class Admin implements ISettings {
 
-    /** @var IConfig */
-    private $config;
+	/** @var IConfig */
+	private $config;
 
-    /**
-     *
-     * @param IConfig $config            
-     */
-    public function __construct(IConfig $config) {
-        $this->config = $config;
-    }
+	/**
+	 *
+	 * @param IConfig $config            
+	 */
+	public function __construct(IConfig $config) {
+		$this->config = $config;
+	}
 
-    /**
-     *
-     * @return TemplateResponse
-     */
-    public function getForm() {
-        return new TemplateResponse('ocr', 'settings-admin', 
-                [
-                        OcrConstants::LANGUAGES_CONFIG_KEY => $this->config->getAppValue('ocr', 
-                                OcrConstants::LANGUAGES_CONFIG_KEY),
-                        OcrConstants::REDIS_CONFIG_KEY_HOST => $this->config->getAppValue('ocr', 
-                                OcrConstants::REDIS_CONFIG_KEY_HOST),
-                        OcrConstants::REDIS_CONFIG_KEY_PORT => $this->config->getAppValue('ocr', 
-                                OcrConstants::REDIS_CONFIG_KEY_PORT),
-                        OcrConstants::REDIS_CONFIG_KEY_DB => $this->config->getAppValue('ocr', 
-                                OcrConstants::REDIS_CONFIG_KEY_DB)
-                ], 'blank');
-    }
+	/**
+	 *
+	 * @return TemplateResponse
+	 */
+	public function getForm() {
+		return new TemplateResponse('ocr', 'settings-admin', 
+				[
+						OcrConstants::LANGUAGES_CONFIG_KEY => $this->config->getAppValue('ocr', 
+								OcrConstants::LANGUAGES_CONFIG_KEY),
+						OcrConstants::REDIS_CONFIG_KEY_HOST => $this->config->getAppValue('ocr', 
+								OcrConstants::REDIS_CONFIG_KEY_HOST),
+						OcrConstants::REDIS_CONFIG_KEY_PORT => $this->config->getAppValue('ocr', 
+								OcrConstants::REDIS_CONFIG_KEY_PORT),
+						OcrConstants::REDIS_CONFIG_KEY_DB => $this->config->getAppValue('ocr', 
+								OcrConstants::REDIS_CONFIG_KEY_DB)
+				], 'blank');
+	}
 
-    /**
-     *
-     * @return string the section ID, e.g. 'sharing'
-     */
-    public function getSection() {
-        return 'ocr';
-    }
+	/**
+	 *
+	 * @return string the section ID, e.g. 'sharing'
+	 */
+	public function getSection() {
+		return 'ocr';
+	}
 
-    /**
-     *
-     * @return int whether the form should be rather on the top or bottom of
-     *         the admin section. The forms are arranged in ascending order of the
-     *         priority values. It is required to return a value between 0 and 100.
-     *         keep the server setting at the top, right after "server settings"
-     */
-    public function getPriority() {
-        return 0;
-    }
+	/**
+	 *
+	 * @return int whether the form should be rather on the top or bottom of
+	 *         the admin section. The forms are arranged in ascending order of the
+	 *         priority values. It is required to return a value between 0 and 100.
+	 *         keep the server setting at the top, right after "server settings"
+	 */
+	public function getPriority() {
+		return 0;
+	}
 }
\ No newline at end of file

lib/Settings/Section.php

Indentation +41 added lines, -41 removed lines

@@ -16,50 +16,50 @@
 
 class Section implements IIconSection {
 
-    /** @var IL10N */
-    private $l;
+	/** @var IL10N */
+	private $l;
 
-    /**
-     *
-     * @param IL10N $l            
-     */
-    public function __construct(IL10N $l) {
-        $this->l = $l;
-    }
+	/**
+	 *
+	 * @param IL10N $l            
+	 */
+	public function __construct(IL10N $l) {
+		$this->l = $l;
+	}
 
-    /**
-     *
-     * {@inheritdoc}
-     *
-     */
-    public function getID() {
-        return 'ocr';
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 *
+	 */
+	public function getID() {
+		return 'ocr';
+	}
 
-    /**
-     *
-     * {@inheritdoc}
-     *
-     */
-    public function getName() {
-        return $this->l->t('OCR');
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 *
+	 */
+	public function getName() {
+		return $this->l->t('OCR');
+	}
 
-    /**
-     *
-     * {@inheritdoc}
-     *
-     */
-    public function getPriority() {
-        return 75;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 *
+	 */
+	public function getPriority() {
+		return 75;
+	}
 
-    /**
-     *
-     * {@inheritdoc}
-     *
-     */
-    public function getIcon() {
-        return '/apps/ocr/img/icon/ocr.svg';
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 *
+	 */
+	public function getIcon() {
+		return '/apps/ocr/img/icon/ocr.svg';
+	}
 }
\ No newline at end of file