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 6ba2623485
commit 4b9200f6f7
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/api.php
View File

@ -44,6 +44,7 @@ class OC_API {
$name = strtolower($method).$url; $name = strtolower($method).$url;
$name = str_replace(array('/', '{', '}'), '_', $name); $name = str_replace(array('/', '{', '}'), '_', $name);
if(!isset(self::$actions[$name])){ if(!isset(self::$actions[$name])){
OC::getRouter()->useCollection('ocs');
OC::getRouter()->create($name, $url.'.{_format}') OC::getRouter()->create($name, $url.'.{_format}')
->method($method) ->method($method)
->defaults(array('_format' => 'xml') + $defaults) ->defaults(array('_format' => 'xml') + $defaults)

22
lib/router.php
View File

@ -15,32 +15,38 @@ 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);
} }
} }
// include ocs routes // include ocs routes
require_once(OC::$SERVERROOT.'/ocs/routes.php'); require_once(OC::$SERVERROOT.'/ocs/routes.php');
$collection = $this->getCollection('ocs');
$this->root->addCollection($collection, '/ocs');
} }
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()) {
@ -51,7 +57,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'];

4
ocs/v1.php
View File

@ -25,10 +25,8 @@ require_once('../lib/base.php');
use Symfony\Component\Routing\Exception\ResourceNotFoundException; use Symfony\Component\Routing\Exception\ResourceNotFoundException;
use Symfony\Component\Routing\Exception\MethodNotAllowedException; use Symfony\Component\Routing\Exception\MethodNotAllowedException;
OC::getRouter()->useCollection('ocs');
try { try {
OC::getRouter()->match($_SERVER['PATH_INFO']); OC::getRouter()->match('/ocs'.$_SERVER['PATH_INFO']);
} catch (ResourceNotFoundException $e) { } catch (ResourceNotFoundException $e) {
OC_OCS::notFound(); OC_OCS::notFound();
} catch (MethodNotAllowedException $e) { } catch (MethodNotAllowedException $e) {