janis91 / ocr

lib/Util/PHPUtil.php

Indentation +78 added lines, -78 removed lines

@@ -22,88 +22,88 @@
  */
 class PHPUtil {
 
-    /**
-     *
-     * @var ILogger
-     */
-    private $logger;
+	/**
+	 *
+	 * @var ILogger
+	 */
+	private $logger;
 
-    /**
-     *
-     * @var IL10N
-     */
-    private $l10n;
+	/**
+	 *
+	 * @var IL10N
+	 */
+	private $l10n;
 
-    public function __construct(IL10N $l10n, ILogger $logger) {
-        $this->l10n = $l10n;
-        $this->logger = $logger;
-    }
+	public function __construct(IL10N $l10n, ILogger $logger) {
+		$this->l10n = $l10n;
+		$this->logger = $logger;
+	}
 
-    /**
-     * Wraps the php native function tempnam()
-     * @codeCoverageIgnore
-     * 
-     * @param string $dir            
-     * @param string $prefix            
-     * @throws NotFoundException
-     * @return string
-     */
-    public function tempnamWrapper($dir, $prefix) {
-        $tempFile = tempnam($dir, $prefix);
-        if ($tempFile === false) {
-            throw new NotFoundException($this->l10n->t('Temp file cannot be created.'));
-        } else {
-            return $tempFile;
-        }
-    }
+	/**
+	 * Wraps the php native function tempnam()
+	 * @codeCoverageIgnore
+	 * 
+	 * @param string $dir            
+	 * @param string $prefix            
+	 * @throws NotFoundException
+	 * @return string
+	 */
+	public function tempnamWrapper($dir, $prefix) {
+		$tempFile = tempnam($dir, $prefix);
+		if ($tempFile === false) {
+			throw new NotFoundException($this->l10n->t('Temp file cannot be created.'));
+		} else {
+			return $tempFile;
+		}
+	}
 
-    /**
-     * Wraps the php native function unlink()
-     * @codeCoverageIgnore
-     * 
-     * @param string $fileName            
-     * @throws NotFoundException
-     * @return boolean
-     */
-    public function unlinkWrapper($fileName) {
-        if (unlink($fileName)) {
-            return true;
-        } else {
-            throw new NotFoundException(
-                    $this->l10n->t('Cannot delete temporary file during temp file creation for tesseract.'));
-        }
-    }
+	/**
+	 * Wraps the php native function unlink()
+	 * @codeCoverageIgnore
+	 * 
+	 * @param string $fileName            
+	 * @throws NotFoundException
+	 * @return boolean
+	 */
+	public function unlinkWrapper($fileName) {
+		if (unlink($fileName)) {
+			return true;
+		} else {
+			throw new NotFoundException(
+					$this->l10n->t('Cannot delete temporary file during temp file creation for tesseract.'));
+		}
+	}
 
-    /**
-     * Wraps the php native function touch()
-     * @codeCoverageIgnore
-     * 
-     * @param string $fileName            
-     * @throws NotFoundException
-     * @return boolean
-     */
-    public function touchWrapper($fileName) {
-        if (touch($fileName)) {
-            return true;
-        } else {
-            throw new NotFoundException($this->l10n->t('Cannot create temporary file for tesseract.'));
-        }
-    }
+	/**
+	 * Wraps the php native function touch()
+	 * @codeCoverageIgnore
+	 * 
+	 * @param string $fileName            
+	 * @throws NotFoundException
+	 * @return boolean
+	 */
+	public function touchWrapper($fileName) {
+		if (touch($fileName)) {
+			return true;
+		} else {
+			throw new NotFoundException($this->l10n->t('Cannot create temporary file for tesseract.'));
+		}
+	}
 
-    /**
-     * Wraps the php native function chmod()
-     * @codeCoverageIgnore
-     * 
-     * @param string $fileName            
-     * @param integer $mode            
-     * @throws NotFoundException
-     * @return boolean
-     */
-    public function chmodWrapper($fileName, $mode) {
-        if (chmod($fileName, $mode)) {
-            return true;
-        } else {
-            throw new NotFoundException($this->l10n->t('Cannot set permissions to temporary file for tesseract.'));
-        }
-    }
+	/**
+	 * Wraps the php native function chmod()
+	 * @codeCoverageIgnore
+	 * 
+	 * @param string $fileName            
+	 * @param integer $mode            
+	 * @throws NotFoundException
+	 * @return boolean
+	 */
+	public function chmodWrapper($fileName, $mode) {
+		if (chmod($fileName, $mode)) {
+			return true;
+		} else {
+			throw new NotFoundException($this->l10n->t('Cannot set permissions to temporary file for tesseract.'));
+		}
+	}
 }
\ No newline at end of file

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

Spacing +4 added lines, -4 removed lines

@@ -51,7 +51,7 @@ 
      */
     public function getLanguages() {
         return $this->handleNotFound(
-                function () {
+                function() {
                     return [
                             'languages' => $this->appConfig->getAppValue(OcrConstants::LANGUAGES_CONFIG_KEY)
                     ];
@@ -65,7 +65,7 @@ 
      */
     public function evaluateRedisSettings() {
         return $this->handleNotFound(
-                function () {
+                function() {
                     return [
                             'set' => $this->appConfig->evaluateRedisSettings()
                     ];
@@ -80,7 +80,7 @@ 
      */
     public function setLanguages($languages) {
         return $this->handleNotFound(
-                function () use ($languages) {
+                function() use ($languages) {
                     if ($languages !== null) {
                         $this->appConfig->setAppValue(OcrConstants::LANGUAGES_CONFIG_KEY, $languages);
                         return $this->l10n->t('Saved');
@@ -101,7 +101,7 @@ 
      */
     public function setRedis($redisHost, $redisPort, $redisDb) {
         return $this->handleNotFound(
-                function () use ($redisHost, $redisPort, $redisDb) {
+                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);

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

Spacing +3 added lines, -3 removed lines

@@ -62,7 +62,7 @@ 
      */
     public function process($languages, $files) {
         return $this->handleNotFound(
-                function () use ($languages, $files) {
+                function() use ($languages, $files) {
                     return $this->service->process($languages, $files);
                 });
     }
@@ -73,7 +73,7 @@ 
      * @return \OCP\AppFramework\Http\DataResponse
      */
     public function getAllJobs() {
-        return $this->handleNotFound(function () {
+        return $this->handleNotFound(function() {
             return $this->service->getAllJobsForUser($this->userId);
         });
     }
@@ -86,7 +86,7 @@ 
      */
     public function deleteJob($id) {
         return $this->handleNotFound(
-                function () use ($id) {
+                function() use ($id) {
                     return $this->service->deleteJob($id, $this->userId);
                 });
     }

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();
+		});
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
      * @return DataResponse
      */
     public function getStatus() {
-        return $this->handleNotFound(function () {
+        return $this->handleNotFound(function() {
             return $this->service->getStatus();
         });
     }

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