mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Routing: combine all routes into one set

This commit is contained in:
Bart Visscher 2012-08-02 21:51:31 +02:00
parent 72b2324b68
commit f63b9b44d8
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/router.php
View File

@ -15,30 +15,34 @@ use Symfony\Component\Routing\Exception\ResourceNotFoundException;
class OC_Router { class OC_Router {
protected $collections = array(); protected $collections = array();
protected $collection = null; protected $collection = null;
protected $root = null;
public function __construct() {
// TODO cache
$this->loadRoutes();
}
/** /**
* loads the api routes * loads the api routes
*/ */
public function loadRoutes() { public function loadRoutes() {
// TODO cache // TODO cache
$this->root = $this->getCollection('root');
foreach(OC_APP::getEnabledApps() as $app){ foreach(OC_APP::getEnabledApps() as $app){
$file = OC_App::getAppPath($app).'/appinfo/routes.php'; $file = OC_App::getAppPath($app).'/appinfo/routes.php';
if(file_exists($file)){ if(file_exists($file)){
$this->useCollection($app);
require_once($file); require_once($file);
$collection = $this->getCollection($app);
$this->root->addCollection($collection, '/apps/'.$app);
} }
} }
} }
public function useCollection($name) { protected function getCollection($name) {
if (!isset($this->collections[$name])) { if (!isset($this->collections[$name])) {
$this->collections[$name] = new RouteCollection(); $this->collections[$name] = new RouteCollection();
} }
$this->collection = $this->collections[$name]; return $this->collections[$name];
}
public function useCollection($name) {
$this->collection = $this->getCollection($name);
} }
public function create($name, $pattern, array $defaults = array(), array $requirements = array()) { public function create($name, $pattern, array $defaults = array(), array $requirements = array()) {
@ -49,7 +53,7 @@ class OC_Router {
public function match($url) { public function match($url) {
$context = new RequestContext($_SERVER['REQUEST_URI'], $_SERVER['REQUEST_METHOD']); $context = new RequestContext($_SERVER['REQUEST_URI'], $_SERVER['REQUEST_METHOD']);
$matcher = new UrlMatcher($this->collection, $context); $matcher = new UrlMatcher($this->root, $context);
$parameters = $matcher->match($url); $parameters = $matcher->match($url);
if (isset($parameters['action'])) { if (isset($parameters['action'])) {
$action = $parameters['action']; $action = $parameters['action'];