janis91 / ocr

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

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
-     * TODO: switch case and too much if statements
-     * @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
+	 * TODO: switch case and too much if statements
+	 * @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