Remove utility classes

13 files changed, 119 insertions, 102 deletions

diff --git a/appinfo/application.php b/appinfo/application.php
index 715494f1..de96c4e2 100644
--- a/appinfo/application.php
+++ b/appinfo/application.php
@@ -37,8 +37,9 @@ use OCA\GalleryPlus\Service\PreviewService;
 use OCA\GalleryPlus\Service\DownloadService;
 use OCA\GalleryPlus\Middleware\SharingCheckMiddleware;
 use OCA\GalleryPlus\Middleware\EnvCheckMiddleware;
-use OCA\GalleryPlus\Utility\SmarterLogger;
-use OCA\GalleryPlus\Utility\Normalizer;
+
+use OCA\OcUtility\AppInfo\Application as OcUtility;
+use OCA\OcUtility\Service\SmarterLogger as SmarterLogger;
 
 /**
  * Class Application
@@ -76,7 +77,7 @@ class Application extends App {
 				$c->query('AppName'),
 				$c->query('Request'),
 				$c->query('ConfigService'),
-				$c->query('SmarterLogger')
+				$c->query('Logger')
 			);
 		}
 		);
@@ -86,7 +87,7 @@ class Application extends App {
 				$c->query('AppName'),
 				$c->query('Request'),
 				$c->query('ConfigService'),
-				$c->query('SmarterLogger')
+				$c->query('Logger')
 			);
 		}
 		);
@@ -98,7 +99,7 @@ class Application extends App {
 				$c->query('FilesService'),
 				$c->query('ConfigService'),
 				$c->query('SearchMediaService'),
-				$c->query('SmarterLogger')
+				$c->query('Logger')
 			);
 		}
 		);
@@ -110,7 +111,7 @@ class Application extends App {
 				$c->query('FilesService'),
 				$c->query('ConfigService'),
 				$c->query('SearchMediaService'),
-				$c->query('SmarterLogger')
+				$c->query('Logger')
 			);
 		}
 		);
@@ -124,7 +125,7 @@ class Application extends App {
 				$c->query('PreviewService'),
 				$c->query('DownloadService'),
 				$c->query('OCP\IEventSource'),
-				$c->query('SmarterLogger')
+				$c->query('Logger')
 			);
 		}
 		);
@@ -138,7 +139,7 @@ class Application extends App {
 				$c->query('PreviewService'),
 				$c->query('DownloadService'),
 				$c->query('OCP\IEventSource'),
-				$c->query('SmarterLogger')
+				$c->query('Logger')
 			);
 		}
 		);
@@ -191,25 +192,11 @@ class Application extends App {
 		}
 		);
 		$container->registerService(
-			'Normalizer', function () {
-			return new Normalizer();
-		}
-		);
-		$container->registerService(
-			'SmarterLogger', function (IContainer $c) {
-			return new SmarterLogger(
-				$c->query('AppName'),
-				$c->query('OCP\ILogger'),
-				$c->query('Normalizer')
-			);
-		}
-		);
-		$container->registerService(
 			'CustomPreviewManager', function (IContainer $c) {
 			return new Preview(
 				$c->query('OCP\IConfig'),
 				$c->query('OCP\IPreview'),
-				$c->query('SmarterLogger')
+				$c->query('Logger')
 			);
 		}
 		);
@@ -221,7 +208,7 @@ class Application extends App {
 				$c->query('UserFolder'),
 				$c->query('OCP\IUserManager'),
 				$c->query('OCP\IServerContainer'),
-				$c->query('SmarterLogger')
+				$c->query('Logger')
 			);
 		}
 		);
@@ -235,7 +222,39 @@ class Application extends App {
 				->getEnvironment($token);
 		}
 		);*/
+		/**
+		 * OCA External
+		 */
+		if (\OCP\App::isEnabled('ocutility')) {
+			$container->registerService(
+				'UtilityContainer', function () {
+				$app = new OcUtility();
 
+				return $app->getContainer();
+			}
+			);
+			$container->registerService(
+				'Helper', function (IContainer $c) {
+				return $c->query('UtilityContainer')
+						 ->query('OCA\OcUtility\Service\Helper');
+			}
+			);
+			$container->registerService(
+				'Logger', function (IContainer $c) {
+				return new SmarterLogger(
+					$c->query('AppName'),
+					$c->query('OCP\ILogger')
+				);
+
+			}
+			);
+		} else {
+			$container->registerService(
+				'Logger', function (IContainer $c) {
+				return $c->query('OCP\ILogger');
+			}
+			);
+		}
 		/**
 		 * Services
 		 */
@@ -244,7 +263,7 @@ class Application extends App {
 			return new FilesService(
 				$c->query('AppName'),
 				$c->query('Environment'),
-				$c->query('SmarterLogger')
+				$c->query('Logger')
 
 			);
 		}
@@ -255,7 +274,7 @@ class Application extends App {
 				$c->query('AppName'),
 				$c->query('Environment'),
 				$c->query('ConfigParser'),
-				$c->query('SmarterLogger')
+				$c->query('Logger')
 
 			);
 		}
@@ -265,7 +284,7 @@ class Application extends App {
 			return new SearchMediaService(
 				$c->query('AppName'),
 				$c->query('Environment'),
-				$c->query('SmarterLogger')
+				$c->query('Logger')
 
 			);
 		}
@@ -281,7 +300,7 @@ class Application extends App {
 				$c->query('AppName'),
 				$c->query('Environment'),
 				$c->query('CustomPreviewManager'),
-				$c->query('SmarterLogger')
+				$c->query('Logger')
 
 			);
 		}
@@ -291,7 +310,7 @@ class Application extends App {
 			return new DownloadService(
 				$c->query('AppName'),
 				$c->query('Environment'),
-				$c->query('SmarterLogger')
+				$c->query('Logger')
 			);
 		}
 		);
@@ -308,7 +327,7 @@ class Application extends App {
 					$c->query('OCP\IConfig'),
 					$c->query('OCP\AppFramework\Utility\IControllerMethodReflector'),
 					$c->query('OCP\IURLGenerator'),
-					$c->query('SmarterLogger')
+					$c->query('Logger')
 				);
 			}
 		);
@@ -323,7 +342,7 @@ class Application extends App {
 					$c->query('Environment'),
 					$c->query('OCP\AppFramework\Utility\IControllerMethodReflector'),
 					$c->query('OCP\IURLGenerator'),
-					$c->query('SmarterLogger')
+					$c->query('Logger')
 				);
 			}
 		);
diff --git a/composer.json b/composer.json
index b582c9bd..074d717b 100644
--- a/composer.json
+++ b/composer.json
@@ -1,28 +1,29 @@
 {
-    "type": "project",
-    "license": "AGPL",
-    "description": "Media gallery for ownCloud which includes previews for all media types supported by your ownCloud installation.",
-    "homepage": "https://github.com/interfasys/galleryplus",
-    "authors": [
-        {
-            "name": "Olivier Paroz",
-            "email": "owncloud@interfasys.ch",
-            "role": "Developer",
-            "homepage": "http://www.interfasys.ch"
-        },
-        {
-            "name": "Robin Appelman",
-            "email": "icewind@owncloud.com",
-            "role": "Developer",
-            "homepage": "https://github.com/icewind1991"
-        }
-    ],
-    "support": {
-        "issues": "https://github.com/interfasys/galleryplus/issues",
-        "wiki": "https://github.com/interfasys/galleryplus/wiki",
-        "source": "https://github.com/interfasys/galleryplus"
+  "name": "interfasys/galleryplus",
+  "type": "project",
+  "description": "Media gallery for ownCloud which includes previews for all media types supported by your ownCloud installation.",
+  "license": "AGPL 3.0",
+  "homepage": "https://github.com/interfasys/galleryplus",
+  "authors": [
+    {
+      "name": "Olivier Paroz",
+      "email": "owncloud@interfasys.ch",
+      "role": "Developer",
+      "homepage": "http://www.interfasys.ch"
     },
-    "require": {
-        "symfony/yaml": "~2.6"
+    {
+      "name": "Robin Appelman",
+      "email": "icewind@owncloud.com",
+      "role": "Developer",
+      "homepage": "https://github.com/icewind1991"
     }
+  ],
+  "support": {
+    "issues": "https://github.com/interfasys/galleryplus/issues",
+    "wiki": "https://github.com/interfasys/galleryplus/wiki",
+    "source": "https://github.com/interfasys/galleryplus"
+  },
+  "require": {
+    "symfony/yaml": "~2.6"
+  }
 }
diff --git a/controller/configcontroller.php b/controller/configcontroller.php
index d1441816..828deb30 100644
--- a/controller/configcontroller.php
+++ b/controller/configcontroller.php
@@ -13,12 +13,12 @@
 namespace OCA\GalleryPlus\Controller;
 
 use OCP\IRequest;
+use OCP\ILogger;
 
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
 
 use OCA\GalleryPlus\Service\ConfigService;
-use OCA\GalleryPlus\Utility\SmarterLogger;
 
 /**
  * Class ConfigController
@@ -34,7 +34,7 @@ class ConfigController extends Controller {
 	 */
 	private $configService;
 	/**
-	 * @var SmarterLogger
+	 * @var ILogger
 	 */
 	private $logger;
 
@@ -44,13 +44,13 @@ class ConfigController extends Controller {
 	 * @param string $appName
 	 * @param IRequest $request
 	 * @param ConfigService $configService
-	 * @param SmarterLogger $logger
+	 * @param ILogger $logger
 	 */
 	public function __construct(
 		$appName,
 		IRequest $request,
 		ConfigService $configService,
-		SmarterLogger $logger
+		ILogger $logger
 	) {
 		parent::__construct($appName, $request);
 
diff --git a/controller/filescontroller.php b/controller/filescontroller.php
index b2408918..01451e1e 100644
--- a/controller/filescontroller.php
+++ b/controller/filescontroller.php
@@ -16,6 +16,7 @@ namespace OCA\GalleryPlus\Controller;
 
 use OCP\IRequest;
 use OCP\Files\Folder;
+use OCP\ILogger;
 
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
@@ -23,7 +24,6 @@ use OCP\AppFramework\Http;
 use OCA\GalleryPlus\Service\FilesService;
 use OCA\GalleryPlus\Service\ConfigService;
 use OCA\GalleryPlus\Service\SearchMediaService;
-use OCA\GalleryPlus\Utility\SmarterLogger;
 
 /**
  * Class FilesController
@@ -47,7 +47,7 @@ class FilesController extends Controller {
 	 */
 	private $searchMediaService;
 	/**
-	 * @var SmarterLogger
+	 * @var ILogger
 	 */
 	private $logger;
 
@@ -59,7 +59,7 @@ class FilesController extends Controller {
 	 * @param FilesService $filesService
 	 * @param ConfigService $configService
 	 * @param SearchMediaService $searchMediaService
-	 * @param SmarterLogger $logger
+	 * @param ILogger $logger
 	 */
 	public function __construct(
 		$appName,
@@ -67,7 +67,7 @@ class FilesController extends Controller {
 		FilesService $filesService,
 		ConfigService $configService,
 		SearchMediaService $searchMediaService,
-		SmarterLogger $logger
+		ILogger $logger
 	) {
 		parent::__construct($appName, $request);
 
diff --git a/controller/previewcontroller.php b/controller/previewcontroller.php
index c5550e40..f92fde01 100644
--- a/controller/previewcontroller.php
+++ b/controller/previewcontroller.php
@@ -17,6 +17,7 @@ namespace OCA\GalleryPlus\Controller;
 use OCP\IRequest;
 use OCP\IURLGenerator;
 use OCP\IEventSource;
+use OCP\ILogger;
 
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
@@ -26,7 +27,6 @@ use OCA\GalleryPlus\Service\ServiceException;
 use OCA\GalleryPlus\Service\ThumbnailService;
 use OCA\GalleryPlus\Service\PreviewService;
 use OCA\GalleryPlus\Service\DownloadService;
-use OCA\GalleryPlus\Utility\SmarterLogger;
 
 /**
  * Class PreviewController
@@ -58,7 +58,7 @@ class PreviewController extends Controller {
 	 */
 	private $eventSource;
 	/**
-	 * @var SmarterLogger
+	 * @var ILogger
 	 */
 	private $logger;
 
@@ -72,7 +72,7 @@ class PreviewController extends Controller {
 	 * @param PreviewService $previewService
 	 * @param DownloadService $downloadService
 	 * @param IEventSource $eventSource
-	 * @param SmarterLogger $logger
+	 * @param ILogger $logger
 	 */
 	public function __construct(
 		$appName,
@@ -82,7 +82,7 @@ class PreviewController extends Controller {
 		PreviewService $previewService,
 		DownloadService $downloadService,
 		IEventSource $eventSource,
-		SmarterLogger $logger
+		ILogger $logger
 	) {
 		parent::__construct($appName, $request);
 
diff --git a/environment/environment.php b/environment/environment.php
index 28749fb5..280fa785 100644
--- a/environment/environment.php
+++ b/environment/environment.php
@@ -17,13 +17,12 @@ namespace OCA\GalleryPlus\Environment;
 use OCP\IServerContainer;
 use OCP\IUserManager;
 use OCP\Share;
+use OCP\ILogger;
 use OCP\Files\Folder;
 use OCP\Files\Node;
 use OCP\Files\File;
 use OCP\Files\NotFoundException;
 
-use OCA\GalleryPlus\Utility\SmarterLogger;
-
 /**
  * Builds the environment so that the services have access to the files and folders' owner
  *
@@ -62,7 +61,7 @@ class Environment {
 	 */
 	private $serverContainer;
 	/**
-	 * @var SmarterLogger
+	 * @var ILogger
 	 */
 	private $logger;
 	/**
@@ -89,7 +88,7 @@ class Environment {
 	 * @param Folder|null $userFolder
 	 * @param IUserManager $userManager
 	 * @param IServerContainer $serverContainer
-	 * @param SmarterLogger $logger
+	 * @param ILogger $logger
 	 */
 	public function __construct(
 		$appName,
@@ -97,7 +96,7 @@ class Environment {
 		$userFolder,
 		IUserManager $userManager,
 		IServerContainer $serverContainer,
-		SmarterLogger $logger
+		ILogger $logger
 	) {
 		$this->appName = $appName;
 		$this->userId = $userId;
diff --git a/middleware/checkmiddleware.php b/middleware/checkmiddleware.php
index b7a78c7a..4bf899af 100644
--- a/middleware/checkmiddleware.php
+++ b/middleware/checkmiddleware.php
@@ -16,14 +16,13 @@ namespace OCA\GalleryPlus\Middleware;
 
 use OCP\IURLGenerator;
 use OCP\IRequest;
+use OCP\ILogger;
 
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\AppFramework\Http\RedirectResponse;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Middleware;
 
-use OCA\GalleryPlus\Utility\SmarterLogger;
-
 /**
  * Checks that we have a valid token linked to a valid resource and that the
  * user is authorised to access it
@@ -45,7 +44,7 @@ abstract class CheckMiddleware extends Middleware {
 	 */
 	private $urlGenerator;
 	/**
-	 * @var SmarterLogger
+	 * @var ILogger
 	 */
 	protected $logger;
 
@@ -55,13 +54,13 @@ abstract class CheckMiddleware extends Middleware {
 	 * @param string $appName
 	 * @param IRequest $request
 	 * @param IURLGenerator $urlGenerator
-	 * @param SmarterLogger $logger
+	 * @param ILogger $logger
 	 */
 	public function __construct(
 		$appName,
 		IRequest $request,
 		IURLGenerator $urlGenerator,
-		SmarterLogger $logger
+		ILogger $logger
 	) {
 		$this->appName = $appName;
 		$this->request = $request;
@@ -81,7 +80,7 @@ abstract class CheckMiddleware extends Middleware {
 			$message = $exception->getMessage();
 			$code = $exception->getCode();
 
-			$this->logger->debug("[TokenCheckException] {exception}", ['exception' => $exception]);
+			$this->logger->debug("[TokenCheckException] {exception}", ['exception' => $message]);
 
 			return $this->computeResponse($message, $code);
 		}
diff --git a/middleware/envcheckmiddleware.php b/middleware/envcheckmiddleware.php
index cc2a954d..657d3d61 100644
--- a/middleware/envcheckmiddleware.php
+++ b/middleware/envcheckmiddleware.php
@@ -19,6 +19,7 @@ namespace OCA\GalleryPlus\Middleware;
 use OCP\IRequest;
 use OCP\IURLGenerator;
 use OCP\ISession;
+use OCP\ILogger;
 use OCP\Share;
 use OCP\Security\IHasher;
 
@@ -27,7 +28,6 @@ use OCP\AppFramework\Utility\IControllerMethodReflector;
 
 use OCA\GalleryPlus\Environment\Environment;
 use OCA\GalleryPlus\Service\ServiceException;
-use OCA\GalleryPlus\Utility\SmarterLogger;
 
 /**
  * Checks that we have a valid token linked to a valid resource and that the
@@ -60,14 +60,13 @@ class EnvCheckMiddleware extends CheckMiddleware {
 	 * Constructor
 	 *
 	 * @param string $appName
+	 * @param IRequest $request
 	 * @param IHasher $hasher
 	 * @param ISession $session
-	 * @param IRequest $request
+	 * @param Environment $environment
 	 * @param IControllerMethodReflector $reflector
 	 * @param IURLGenerator $urlGenerator
-	 * @param SmarterLogger $logger
-	 * @param Environment $environment
-	 * @param SmarterLogger $logger
+	 * @param ILogger $logger
 	 */
 	public function __construct(
 		$appName,
@@ -77,7 +76,7 @@ class EnvCheckMiddleware extends CheckMiddleware {
 		Environment $environment,
 		IControllerMethodReflector $reflector,
 		IURLGenerator $urlGenerator,
-		SmarterLogger $logger
+		ILogger $logger
 	) {
 		parent::__construct(
 			$appName,
diff --git a/middleware/sharingcheckmiddleware.php b/middleware/sharingcheckmiddleware.php
index d3d55c35..d1c05a5e 100644
--- a/middleware/sharingcheckmiddleware.php
+++ b/middleware/sharingcheckmiddleware.php
@@ -16,13 +16,12 @@ namespace OCA\GalleryPlus\Middleware;
 
 use OCP\IConfig;
 use OCP\IRequest;
+use OCP\ILogger;
 use OCP\IURLGenerator;
 
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Utility\IControllerMethodReflector;
 
-use OCA\GalleryPlus\Utility\SmarterLogger;
-
 /**
  * Checks whether the "sharing check" is enabled
  *
@@ -47,7 +46,7 @@ class SharingCheckMiddleware extends CheckMiddleware {
 	 * @param IConfig $appConfig
 	 * @param IControllerMethodReflector $reflector
 	 * @param IURLGenerator $urlGenerator
-	 * @param SmarterLogger $logger
+	 * @param ILogger $logger
 	 */
 	public function __construct(
 		$appName,
@@ -55,7 +54,7 @@ class SharingCheckMiddleware extends CheckMiddleware {
 		IConfig $appConfig,
 		IControllerMethodReflector $reflector,
 		IURLGenerator $urlGenerator,
-		SmarterLogger $logger
+		ILogger $logger
 	) {
 		parent::__construct(
 			$appName,
diff --git a/preview/preview.php b/preview/preview.php
index e416b225..0d0207b5 100644
--- a/preview/preview.php
+++ b/preview/preview.php
@@ -16,9 +16,9 @@ use OCP\IConfig;
 use OCP\Image;
 use OCP\Files\File;
 use OCP\IPreview;
+use OCP\ILogger;
 use OCP\Template;
 
-use OCA\GalleryPlus\Utility\SmarterLogger;
 
 /**
  * Generates previews
@@ -38,7 +38,7 @@ class Preview {
 	 */
 	private $previewManager;
 	/**
-	 * @var SmarterLogger
+	 * @var ILogger
 	 */
 	private $logger;
 	/**
@@ -67,12 +67,12 @@ class Preview {
 	 *
 	 * @param IConfig $config
 	 * @param IPreview $previewManager
-	 * @param SmarterLogger $logger
+	 * @param ILogger $logger
 	 */
 	public function __construct(
 		IConfig $config,
 		IPreview $previewManager,
-		SmarterLogger $logger
+		ILogger $logger
 	) {
 		$this->dataDir = $config->getSystemValue('datadirectory');
 		$this->previewManager = $previewManager;
diff --git a/service/configservice.php b/service/configservice.php
index 098cccc7..77ed404d 100644
--- a/service/configservice.php
+++ b/service/configservice.php
@@ -13,9 +13,9 @@
 namespace OCA\GalleryPlus\Service;
 
 use OCP\Files\Folder;
+use OCP\ILogger;
 
 use OCA\GalleryPlus\Environment\Environment;
-use OCA\GalleryPlus\Utility\SmarterLogger;
 
 /**
  * Finds configurations files and returns a configuration array
@@ -50,13 +50,13 @@ class ConfigService extends FilesService {
 	 * @param string $appName
 	 * @param Environment $environment
 	 * @param ConfigParser $configParser
-	 * @param SmarterLogger $logger
+	 * @param ILogger $logger
 	 */
 	public function __construct(
 		$appName,
 		Environment $environment,
 		ConfigParser $configParser,
-		SmarterLogger $logger
+		ILogger $logger
 	) {
 		parent::__construct($appName, $environment, $logger);
 
diff --git a/service/previewservice.php b/service/previewservice.php
index 7e96b092..57c4cd80 100644
--- a/service/previewservice.php
+++ b/service/previewservice.php
@@ -14,11 +14,11 @@ namespace OCA\GalleryPlus\Service;
 
 use OCP\Files\File;
 use OCP\Template;
+use OCP\ILogger;
 
 use OCA\GalleryPlus\Environment\Environment;
 use OCA\GalleryPlus\Environment\NotFoundEnvException;
 use OCA\GalleryPlus\Preview\Preview;
-use OCA\GalleryPlus\Utility\SmarterLogger;
 
 /**
  * Generates previews
@@ -67,13 +67,13 @@ class PreviewService extends Service {
 	 * @param string $appName
 	 * @param Environment $environment
 	 * @param Preview $previewManager
-	 * @param SmarterLogger $logger
+	 * @param ILogger $logger
 	 */
 	public function __construct(
 		$appName,
 		Environment $environment,
 		Preview $previewManager,
-		SmarterLogger $logger
+		ILogger $logger
 	) {
 		parent::__construct($appName, $environment, $logger);
 
diff --git a/service/service.php b/service/service.php
index e658421e..8ce22553 100644
--- a/service/service.php
+++ b/service/service.php
@@ -12,8 +12,9 @@
 
 namespace OCA\GalleryPlus\Service;
 
+use OCP\ILogger;
+
 use OCA\GalleryPlus\Environment\Environment;
-use OCA\GalleryPlus\Utility\SmarterLogger;
 
 /**
  * Contains methods which all services will need
@@ -31,7 +32,7 @@ abstract class Service {
 	 */
 	protected $environment;
 	/**
-	 * @var SmarterLogger
+	 * @var ILogger
 	 */
 	protected $logger;
 
@@ -40,12 +41,12 @@ abstract class Service {
 	 *
 	 * @param string $appName
 	 * @param Environment $environment
-	 * @param SmarterLogger $logger
+	 * @param ILogger $logger
 	 */
 	public function __construct(
 		$appName,
 		Environment $environment,
-		SmarterLogger $logger
+		ILogger $logger
 	) {
 		$this->appName = $appName;
 		$this->environment = $environment;