janis91 / ocr

templates/settings-personal.php

Indentation +2 added lines, -2 removed lines

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

appinfo/routes.php

Indentation +43 added lines, -43 removed lines

@@ -8,47 +8,47 @@
  * @copyright Janis Koehr 2017
  */
 return [
-        'routes' => [
-                [
-                        'name' => 'Job#process',
-                        'url' => '/',
-                        'verb' => 'POST'
-                ],
-                [
-                        'name' => 'Job#deleteJob',
-                        'url' => '/',
-                        'verb' => 'DELETE'
-                ],
-                [
-                        'name' => 'Job#getAllJobs',
-                        'url' => '/',
-                        'verb' => 'GET'
-                ],
-                [
-                        'name' => 'Status#getStatus',
-                        'url' => '/status',
-                        'verb' => 'GET'
-                ],
-                // settings
-                [
-                        'name' => 'AdminSettings#setLanguages',
-                        'url' => '/admin/languages',
-                        'verb' => 'POST'
-                ],
-                [
-                        'name' => 'AdminSettings#setRedis',
-                        'url' => '/admin/redis',
-                        'verb' => 'POST'
-                ],
-                [
-                        'name' => 'AdminSettings#getLanguages',
-                        'url' => '/languages',
-                        'verb' => 'GET'
-                ],
-                [
-                        'name' => 'AdminSettings#evaluateRedisSettings',
-                        'url' => '/redis',
-                        'verb' => 'GET'
-                ]
-        ]
+		'routes' => [
+				[
+						'name' => 'Job#process',
+						'url' => '/',
+						'verb' => 'POST'
+				],
+				[
+						'name' => 'Job#deleteJob',
+						'url' => '/',
+						'verb' => 'DELETE'
+				],
+				[
+						'name' => 'Job#getAllJobs',
+						'url' => '/',
+						'verb' => 'GET'
+				],
+				[
+						'name' => 'Status#getStatus',
+						'url' => '/status',
+						'verb' => 'GET'
+				],
+				// settings
+				[
+						'name' => 'AdminSettings#setLanguages',
+						'url' => '/admin/languages',
+						'verb' => 'POST'
+				],
+				[
+						'name' => 'AdminSettings#setRedis',
+						'url' => '/admin/redis',
+						'verb' => 'POST'
+				],
+				[
+						'name' => 'AdminSettings#getLanguages',
+						'url' => '/languages',
+						'verb' => 'GET'
+				],
+				[
+						'name' => 'AdminSettings#evaluateRedisSettings',
+						'url' => '/redis',
+						'verb' => 'GET'
+				]
+		]
 ];
\ No newline at end of file

lib/Db/OcrJob.php

Indentation +92 added lines, -92 removed lines

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

lib/Db/Share.php

Indentation +13 added lines, -13 removed lines

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

lib/Db/ShareMapper.php

Indentation +24 added lines, -24 removed lines

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

lib/Db/OcrJobMapper.php

Indentation +77 added lines, -77 removed lines

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

lib/Db/FileMapper.php

Indentation +23 added lines, -23 removed lines

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

lib/Db/File.php

Indentation +41 added lines, -41 removed lines

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

lib/AppInfo/Application.php

Indentation +154 added lines, -154 removed lines

@@ -35,159 +35,159 @@
  */
 class Application extends App {
 
-    /**
-     * Application constructor.
-     * 
-     * @param array $urlParams            
-     */
-    public function __construct(array $urlParams = array()) {
-        parent::__construct('ocr', $urlParams);
-        $container = $this->getContainer();
-        /**
-         * Add the js and style if OCA\Files app is loaded
-         */
-        $eventDispatcher = \OC::$server->getEventDispatcher();
-        $eventDispatcher->addListener('OCA\Files::loadAdditionalScripts', 
-                function () {
-                    script('ocr', 'dist/ocrapp');
-                    style('ocr', 'ocrstyle');
-                    // if not loaded before - load select2 for multi select languages
-                    vendor_script('select2/select2');
-                    vendor_style('select2/select2');
-                });
-        /**
-         * Register core services
-         */
-        $container->registerService('CurrentUID', 
-                function (IContainer $c) {
-                    /** @var \OC\Server $server */
-                    $server = $c->query('ServerContainer');
-                    $user = $server->getUserSession()
-                        ->getUser();
-                    return ($user) ? $user->getUID() : '';
-                });
-        // Allow automatic DI for the View, until they migrated to Nodes API
-        $container->registerService(View::class, function () {
-            return new View('');
-        }, false);
-        /**
-         * Register the PHPUtil
-         */
-        $container->registerService('PHPUtil', 
-                function (IContainer $c) {
-                    /** @var \OC\Server $server */
-                    $server = $c->query('ServerContainer');
-                    return new PHPUtil($server->getL10N('ocr'), $server->getLogger());
-                });
-        /**
-         * Register the Ocr Job mapper
-         */
-        $container->registerService('OcrJobMapper', 
-                function (IContainer $c) {
-                    /** @var \OC\Server $server */
-                    $server = $c->query('ServerContainer');
-                    return new OcrJobMapper($server->getDatabaseConnection());
-                });
-        /**
-         * Register the File mapper
-         */
-        $container->registerService('FileMapper', 
-                function (IContainer $c) {
-                    /** @var \OC\Server $server */
-                    $server = $c->query('ServerContainer');
-                    return new FileMapper($server->getDatabaseConnection());
-                });
-        /**
-         * Register the Share mapper
-         */
-        $container->registerService('ShareMapper', 
-                function (IContainer $c) {
-                    /** @var \OC\Server $server */
-                    $server = $c->query('ServerContainer');
-                    return new ShareMapper($server->getDatabaseConnection());
-                });
-        /**
-         * Register the App Config Service
-         */
-        $container->registerService('AppConfigService', 
-                function (IAppContainer $c) {
-                    /** @var \OC\Server $server */
-                    $server = $c->query('ServerContainer');
-                    return new AppConfigService($server->getConfig(), $server->getL10N('ocr'));
-                });
-        /**
-         * Register the Job Service
-         */
-        $container->registerService('FileService', 
-                function (IAppContainer $c) {
-                    /** @var \OC\Server $server */
-                    $server = $c->query('ServerContainer');
-                    return new FileService($server->getL10N('ocr'), $server->getLogger(), $c->query('CurrentUID'), 
-                            $c->query('FileMapper'), $c->query('ShareMapper'));
-                });
-        /**
-         * Register the Redis Service
-         */
-        $container->registerService('RedisService', 
-                function (IAppContainer $c) {
-                    /** @var \OC\Server $server */
-                    $server = $c->query('ServerContainer');
-                    return new RedisService($c->query('OcrJobMapper'), $c->query('FileService'), $server->getConfig(), 
-                            $server->getL10N('ocr'), $server->getLogger());
-                });
-        /**
-         * Register the Job Service
-         */
-        $container->registerService('JobService', 
-                function (IAppContainer $c) {
-                    /** @var \OC\Server $server */
-                    $server = $c->query('ServerContainer');
-                    return new JobService($server->getL10N('ocr'), $server->getLogger(), $c->query('CurrentUID'), 
-                            new View('/' . $c->query('CurrentUID') . '/files'), $server->getTempManager(), 
-                            $c->query('RedisService'), $c->query('OcrJobMapper'), $c->query('FileService'), 
-                            $c->query('AppConfigService'), $c->query('PHPUtil'));
-                });
-        /**
-         * Register the Status Service
-         */
-        $container->registerService('StatusService', 
-                function (IAppContainer $c) {
-                    /** @var \OC\Server $server */
-                    $server = $c->query('ServerContainer');
-                    return new StatusService($server->getL10N('ocr'), $server->getLogger(), $c->query('CurrentUID'), 
-                            $c->query('OcrJobMapper'), $c->query('JobService'));
-                });
-        /**
-         * Controller
-         */
-        $container->registerService('StatusController', 
-                function (IAppContainer $c) {
-                    /** @var \OC\Server $server */
-                    $server = $c->query('ServerContainer');
-                    return new StatusController($c->getAppName(), $server->getRequest(), $c->query('StatusService'));
-                });
-        /**
-         * Controller
-         */
-        $container->registerService('JobController', 
-                function (IAppContainer $c) {
-                    /** @var \OC\Server $server */
-                    $server = $c->query('ServerContainer');
-                    return new JobController($c->getAppName(), $server->getRequest(), $c->query('JobService'), 
-                            $c->query('CurrentUID'));
-                });
-        /**
-         * Controller
-         */
-        $container->registerAlias('PersonalSettingsController', PersonalSettingsController::class);
-    }
+	/**
+	 * Application constructor.
+	 * 
+	 * @param array $urlParams            
+	 */
+	public function __construct(array $urlParams = array()) {
+		parent::__construct('ocr', $urlParams);
+		$container = $this->getContainer();
+		/**
+		 * Add the js and style if OCA\Files app is loaded
+		 */
+		$eventDispatcher = \OC::$server->getEventDispatcher();
+		$eventDispatcher->addListener('OCA\Files::loadAdditionalScripts', 
+				function () {
+					script('ocr', 'dist/ocrapp');
+					style('ocr', 'ocrstyle');
+					// if not loaded before - load select2 for multi select languages
+					vendor_script('select2/select2');
+					vendor_style('select2/select2');
+				});
+		/**
+		 * Register core services
+		 */
+		$container->registerService('CurrentUID', 
+				function (IContainer $c) {
+					/** @var \OC\Server $server */
+					$server = $c->query('ServerContainer');
+					$user = $server->getUserSession()
+						->getUser();
+					return ($user) ? $user->getUID() : '';
+				});
+		// Allow automatic DI for the View, until they migrated to Nodes API
+		$container->registerService(View::class, function () {
+			return new View('');
+		}, false);
+		/**
+		 * Register the PHPUtil
+		 */
+		$container->registerService('PHPUtil', 
+				function (IContainer $c) {
+					/** @var \OC\Server $server */
+					$server = $c->query('ServerContainer');
+					return new PHPUtil($server->getL10N('ocr'), $server->getLogger());
+				});
+		/**
+		 * Register the Ocr Job mapper
+		 */
+		$container->registerService('OcrJobMapper', 
+				function (IContainer $c) {
+					/** @var \OC\Server $server */
+					$server = $c->query('ServerContainer');
+					return new OcrJobMapper($server->getDatabaseConnection());
+				});
+		/**
+		 * Register the File mapper
+		 */
+		$container->registerService('FileMapper', 
+				function (IContainer $c) {
+					/** @var \OC\Server $server */
+					$server = $c->query('ServerContainer');
+					return new FileMapper($server->getDatabaseConnection());
+				});
+		/**
+		 * Register the Share mapper
+		 */
+		$container->registerService('ShareMapper', 
+				function (IContainer $c) {
+					/** @var \OC\Server $server */
+					$server = $c->query('ServerContainer');
+					return new ShareMapper($server->getDatabaseConnection());
+				});
+		/**
+		 * Register the App Config Service
+		 */
+		$container->registerService('AppConfigService', 
+				function (IAppContainer $c) {
+					/** @var \OC\Server $server */
+					$server = $c->query('ServerContainer');
+					return new AppConfigService($server->getConfig(), $server->getL10N('ocr'));
+				});
+		/**
+		 * Register the Job Service
+		 */
+		$container->registerService('FileService', 
+				function (IAppContainer $c) {
+					/** @var \OC\Server $server */
+					$server = $c->query('ServerContainer');
+					return new FileService($server->getL10N('ocr'), $server->getLogger(), $c->query('CurrentUID'), 
+							$c->query('FileMapper'), $c->query('ShareMapper'));
+				});
+		/**
+		 * Register the Redis Service
+		 */
+		$container->registerService('RedisService', 
+				function (IAppContainer $c) {
+					/** @var \OC\Server $server */
+					$server = $c->query('ServerContainer');
+					return new RedisService($c->query('OcrJobMapper'), $c->query('FileService'), $server->getConfig(), 
+							$server->getL10N('ocr'), $server->getLogger());
+				});
+		/**
+		 * Register the Job Service
+		 */
+		$container->registerService('JobService', 
+				function (IAppContainer $c) {
+					/** @var \OC\Server $server */
+					$server = $c->query('ServerContainer');
+					return new JobService($server->getL10N('ocr'), $server->getLogger(), $c->query('CurrentUID'), 
+							new View('/' . $c->query('CurrentUID') . '/files'), $server->getTempManager(), 
+							$c->query('RedisService'), $c->query('OcrJobMapper'), $c->query('FileService'), 
+							$c->query('AppConfigService'), $c->query('PHPUtil'));
+				});
+		/**
+		 * Register the Status Service
+		 */
+		$container->registerService('StatusService', 
+				function (IAppContainer $c) {
+					/** @var \OC\Server $server */
+					$server = $c->query('ServerContainer');
+					return new StatusService($server->getL10N('ocr'), $server->getLogger(), $c->query('CurrentUID'), 
+							$c->query('OcrJobMapper'), $c->query('JobService'));
+				});
+		/**
+		 * Controller
+		 */
+		$container->registerService('StatusController', 
+				function (IAppContainer $c) {
+					/** @var \OC\Server $server */
+					$server = $c->query('ServerContainer');
+					return new StatusController($c->getAppName(), $server->getRequest(), $c->query('StatusService'));
+				});
+		/**
+		 * Controller
+		 */
+		$container->registerService('JobController', 
+				function (IAppContainer $c) {
+					/** @var \OC\Server $server */
+					$server = $c->query('ServerContainer');
+					return new JobController($c->getAppName(), $server->getRequest(), $c->query('JobService'), 
+							$c->query('CurrentUID'));
+				});
+		/**
+		 * Controller
+		 */
+		$container->registerAlias('PersonalSettingsController', PersonalSettingsController::class);
+	}
 
-    /**
-     * Registers the Personal Settings Page for deletion of status objects and such things.
-     * @codeCoverageIgnore
-     */
-    public function registerPersonal() {
-        \OCP\App::registerPersonal($this->getContainer()
-            ->getAppName(), 'personal');
-    }
+	/**
+	 * Registers the Personal Settings Page for deletion of status objects and such things.
+	 * @codeCoverageIgnore
+	 */
+	public function registerPersonal() {
+		\OCP\App::registerPersonal($this->getContainer()
+			->getAppName(), 'personal');
+	}
 }

Spacing +14 added lines, -14 removed lines

@@ -48,7 +48,7 @@ 
          */
         $eventDispatcher = \OC::$server->getEventDispatcher();
         $eventDispatcher->addListener('OCA\Files::loadAdditionalScripts', 
-                function () {
+                function() {
                     script('ocr', 'dist/ocrapp');
                     style('ocr', 'ocrstyle');
                     // if not loaded before - load select2 for multi select languages
@@ -59,7 +59,7 @@ 
          * Register core services
          */
         $container->registerService('CurrentUID', 
-                function (IContainer $c) {
+                function(IContainer $c) {
                     /** @var \OC\Server $server */
                     $server = $c->query('ServerContainer');
                     $user = $server->getUserSession()
@@ -67,14 +67,14 @@ 
                     return ($user) ? $user->getUID() : '';
                 });
         // Allow automatic DI for the View, until they migrated to Nodes API
-        $container->registerService(View::class, function () {
+        $container->registerService(View::class, function() {
             return new View('');
         }, false);
         /**
          * Register the PHPUtil
          */
         $container->registerService('PHPUtil', 
-                function (IContainer $c) {
+                function(IContainer $c) {
                     /** @var \OC\Server $server */
                     $server = $c->query('ServerContainer');
                     return new PHPUtil($server->getL10N('ocr'), $server->getLogger());
@@ -83,7 +83,7 @@ 
          * Register the Ocr Job mapper
          */
         $container->registerService('OcrJobMapper', 
-                function (IContainer $c) {
+                function(IContainer $c) {
                     /** @var \OC\Server $server */
                     $server = $c->query('ServerContainer');
                     return new OcrJobMapper($server->getDatabaseConnection());
@@ -92,7 +92,7 @@ 
          * Register the File mapper
          */
         $container->registerService('FileMapper', 
-                function (IContainer $c) {
+                function(IContainer $c) {
                     /** @var \OC\Server $server */
                     $server = $c->query('ServerContainer');
                     return new FileMapper($server->getDatabaseConnection());
@@ -101,7 +101,7 @@ 
          * Register the Share mapper
          */
         $container->registerService('ShareMapper', 
-                function (IContainer $c) {
+                function(IContainer $c) {
                     /** @var \OC\Server $server */
                     $server = $c->query('ServerContainer');
                     return new ShareMapper($server->getDatabaseConnection());
@@ -110,7 +110,7 @@ 
          * Register the App Config Service
          */
         $container->registerService('AppConfigService', 
-                function (IAppContainer $c) {
+                function(IAppContainer $c) {
                     /** @var \OC\Server $server */
                     $server = $c->query('ServerContainer');
                     return new AppConfigService($server->getConfig(), $server->getL10N('ocr'));
@@ -119,7 +119,7 @@ 
          * Register the Job Service
          */
         $container->registerService('FileService', 
-                function (IAppContainer $c) {
+                function(IAppContainer $c) {
                     /** @var \OC\Server $server */
                     $server = $c->query('ServerContainer');
                     return new FileService($server->getL10N('ocr'), $server->getLogger(), $c->query('CurrentUID'), 
@@ -129,7 +129,7 @@ 
          * Register the Redis Service
          */
         $container->registerService('RedisService', 
-                function (IAppContainer $c) {
+                function(IAppContainer $c) {
                     /** @var \OC\Server $server */
                     $server = $c->query('ServerContainer');
                     return new RedisService($c->query('OcrJobMapper'), $c->query('FileService'), $server->getConfig(), 
@@ -139,7 +139,7 @@ 
          * Register the Job Service
          */
         $container->registerService('JobService', 
-                function (IAppContainer $c) {
+                function(IAppContainer $c) {
                     /** @var \OC\Server $server */
                     $server = $c->query('ServerContainer');
                     return new JobService($server->getL10N('ocr'), $server->getLogger(), $c->query('CurrentUID'), 
@@ -151,7 +151,7 @@ 
          * Register the Status Service
          */
         $container->registerService('StatusService', 
-                function (IAppContainer $c) {
+                function(IAppContainer $c) {
                     /** @var \OC\Server $server */
                     $server = $c->query('ServerContainer');
                     return new StatusService($server->getL10N('ocr'), $server->getLogger(), $c->query('CurrentUID'), 
@@ -161,7 +161,7 @@ 
          * Controller
          */
         $container->registerService('StatusController', 
-                function (IAppContainer $c) {
+                function(IAppContainer $c) {
                     /** @var \OC\Server $server */
                     $server = $c->query('ServerContainer');
                     return new StatusController($c->getAppName(), $server->getRequest(), $c->query('StatusService'));
@@ -170,7 +170,7 @@ 
          * Controller
          */
         $container->registerService('JobController', 
-                function (IAppContainer $c) {
+                function(IAppContainer $c) {
                     /** @var \OC\Server $server */
                     $server = $c->query('ServerContainer');
                     return new JobController($c->getAppName(), $server->getRequest(), $c->query('JobService'),