Merge pull request #12360 from owncloud/files-tags

Add favorites to files app

2 files changed, 63 insertions, 6 deletions

diff --git a/apps/files/appinfo/application.php b/apps/files/appinfo/application.php
index 7ca48bab474..13ff60daf89 100644
--- a/apps/files/appinfo/application.php
+++ b/apps/files/appinfo/application.php
@@ -11,6 +11,8 @@ namespace OCA\Files\Appinfo;
 use OC\AppFramework\Utility\SimpleContainer;
 use OCA\Files\Controller\ApiController;
 use OCP\AppFramework\App;
+use \OCA\Files\Service\TagService;
+use \OCP\IContainer;
 
 class Application extends App {
 	public function __construct(array $urlParams=array()) {
@@ -21,10 +23,44 @@ class Application extends App {
 		/**
 		 * Controllers
 		 */
-		$container->registerService('APIController', function (SimpleContainer $c) {
+		$container->registerService('APIController', function (IContainer $c) {
 			return new ApiController(
 				$c->query('AppName'),
-				$c->query('Request')
+				$c->query('Request'),
+				$c->query('TagService')
+			);
+		});
+
+		/**
+		 * Core
+		 */
+		$container->registerService('L10N', function(IContainer $c) {
+			return $c->query('ServerContainer')->getL10N($c->query('AppName'));
+		});
+
+		/**
+		 * Services
+		 */
+		$container->registerService('Tagger', function(IContainer $c)  {
+			return $c->query('ServerContainer')->getTagManager()->load('files');
+		});
+		$container->registerService('TagService', function(IContainer $c)  {
+			$homeFolder = $c->query('ServerContainer')->getUserFolder();
+			return new TagService(
+				$c->query('ServerContainer')->getUserSession(),
+				$c->query('Tagger'),
+				$homeFolder
+			);
+		});
+
+		/**
+		 * Controllers
+		 */
+		$container->registerService('APIController', function (IContainer $c) {
+			return new ApiController(
+				$c->query('AppName'),
+				$c->query('Request'),
+				$c->query('TagService')
 			);
 		});
 	}
diff --git a/apps/files/appinfo/routes.php b/apps/files/appinfo/routes.php
index 96790a04855..349284ec52d 100644
--- a/apps/files/appinfo/routes.php
+++ b/apps/files/appinfo/routes.php
@@ -9,10 +9,31 @@
 namespace OCA\Files\Appinfo;
 
 $application = new Application();
-$application->registerRoutes($this, array('routes' => array(
-	array('name' => 'API#getThumbnail', 'url' => '/api/v1/thumbnail/{x}/{y}/{file}', 'verb' => 'GET', 'requirements' => array('file' => '.+')),
-)));
-
+$application->registerRoutes(
+	$this,
+	array(
+		'routes' => array(
+			array(
+				'name' => 'API#getThumbnail',
+				'url' => '/api/v1/thumbnail/{x}/{y}/{file}',
+				'verb' => 'GET',
+				'requirements' => array('file' => '.+')
+			),
+			array(
+				'name' => 'API#updateFileTags',
+				'url' => '/api/v1/files/{path}',
+				'verb' => 'POST',
+				'requirements' => array('path' => '.+'),
+			),
+			array(
+				'name' => 'API#getFilesByTag',
+				'url' => '/api/v1/tags/{tagName}/files',
+				'verb' => 'GET',
+				'requirements' => array('tagName' => '.+'),
+			),
+		)
+	)
+);
 
 /** @var $this \OC\Route\Router */