raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

move core endpoint definitions

Browse Source
This commit is contained in:
Tim Bentley 2016-08-10 22:19:00 +01:00
parent e31f3b8603
commit 0da295f834
5 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openlp/core/api/controller.py
View File

@ -21,7 +21,11 @@
###############################################################################
import logging
from openlp.core.api.http import register_endpoint
from openlp.core.api.http.server import HttpServer
from openlp.core.api.http.endpoint.controller import controller_endpoint, api_controller_endpoint
from openlp.core.api.http.endpoint.core import stage_endpoint, blank_endpoint, main_endpoint
from openlp.core.api.http.endpoint.service import service_endpoint, api_service_endpoint
from openlp.core.api.websockets import WebSocketServer
from openlp.core.api.poll import Poller
from openlp.core.common import OpenLPMixin, Registry, RegistryMixin, RegistryProperties
@ -40,6 +44,13 @@ class ApiController(RegistryMixin, OpenLPMixin, RegistryProperties):
Constructor
"""
super(ApiController, self).__init__(parent)
register_endpoint(controller_endpoint)
register_endpoint(api_controller_endpoint)
register_endpoint(stage_endpoint)
register_endpoint(blank_endpoint)
register_endpoint(main_endpoint)
register_endpoint(service_endpoint)
register_endpoint(api_service_endpoint)
def bootstrap_post_set_up(self):
"""

4
openlp/core/api/http/endpoint/__init__.py
View File

@ -76,8 +76,4 @@ class Endpoint(object):
kwargs['assets_url'] = '/assets'
return Template(filename=path, input_encoding='utf-8').render(**kwargs)
from .controller import controller_endpoint
from .core import stage_endpoint
from .service import service_endpoint
from .pluginhelpers import search, live, service

5
openlp/core/api/http/endpoint/controller.py
View File

@ -26,7 +26,7 @@ import urllib.error
import json
from openlp.core.api.http.endpoint import Endpoint
from openlp.core.api.http import register_endpoint, requires_auth
from openlp.core.api.http import requires_auth
from openlp.core.common import Registry, AppLocation, Settings
from openlp.core.lib import ItemCapabilities, create_thumb
@ -129,6 +129,3 @@ def controller_direction(request, controller, action):
format(controller=controller, action=action))
event.emit()
return {'results': {'success': True}}
register_endpoint(controller_endpoint)
register_endpoint(api_controller_endpoint)

4
openlp/core/api/http/endpoint/core.py
View File

@ -167,7 +167,3 @@ def get_content_type(file_name):
ext = os.path.splitext(file_name)[1]
content_type = FILE_TYPES.get(ext, 'text/plain')
return ext, content_type
register_endpoint(stage_endpoint)
register_endpoint(blank_endpoint)
register_endpoint(main_endpoint)

3
openlp/core/api/http/endpoint/service.py
View File

@ -98,6 +98,3 @@ def get_service_items():
'selected': (service_item.unique_identifier == current_unique_identifier)
})
return service_items
register_endpoint(service_endpoint)
register_endpoint(api_service_endpoint)