archive/attract
0
0
Fork 0
Code Issues 7 Pull Requests Projects Releases Wiki Activity

Moved task stuff into a new attract.tasks package

Browse Source
This commit is contained in:
Sybren A. Stüvel
2016-09-22 11:48:37 +02:00
parent c45613b5fa
commit 7dee8f7c44
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
attract/__init__.py
View File

@@ -4,7 +4,7 @@ import flask
from werkzeug.local import LocalProxy from werkzeug.local import LocalProxy
from pillar.extension import PillarExtension from pillar.extension import PillarExtension
import attract.task_manager import attract.tasks
import attract.shot_manager import attract.shot_manager
EXTENSION_NAME = 'attract' EXTENSION_NAME = 'attract'
@@ -13,7 +13,7 @@ EXTENSION_NAME = 'attract'
class AttractExtension(PillarExtension): class AttractExtension(PillarExtension):
def __init__(self): def __init__(self):
self._log = logging.getLogger('%s.AttractExtension' % __name__) self._log = logging.getLogger('%s.AttractExtension' % __name__)
self.task_manager = attract.task_manager.TaskManager() self.task_manager = attract.tasks.TaskManager()
self.shot_manager = attract.shot_manager.ShotManager() self.shot_manager = attract.shot_manager.ShotManager()
@property @property
@@ -54,12 +54,13 @@ class AttractExtension(PillarExtension):
:rtype: list of flask.Blueprint objects. :rtype: list of flask.Blueprint objects.
""" """
from . import modules, tasks, shots from . import modules, shots
import attract.tasks.routes
return [ return [
modules.blueprint, modules.blueprint,
tasks.blueprint, attract.tasks.routes.blueprint,
tasks.perproject_blueprint, attract.tasks.routes.perproject_blueprint,
shots.blueprint, shots.blueprint,
shots.perproject_blueprint, shots.perproject_blueprint,
] ]

4
attract/task_manager.py → attract/tasks/__init__.py
View File

@@ -6,8 +6,8 @@ import flask_login
import pillarsdk import pillarsdk
from pillar.web.system_util import pillar_api from pillar.web.system_util import pillar_api
from . import attrs_extra from attract import attrs_extra
from .node_types.task import node_type_task from attract.node_types.task import node_type_task
@attr.s @attr.s

6
attract/tasks.py → attract/tasks/routes.py
View File

@@ -7,9 +7,9 @@ import pillarsdk
from pillar.web.system_util import pillar_api from pillar.web.system_util import pillar_api
import pillar.api.utils import pillar.api.utils
from .modules import attract_project_view from attract.modules import attract_project_view
from .node_types.task import node_type_task from attract.node_types.task import node_type_task
from . import current_attract from attract import current_attract
blueprint = Blueprint('attract.tasks', __name__, url_prefix='/tasks') blueprint = Blueprint('attract.tasks', __name__, url_prefix='/tasks')
perproject_blueprint = Blueprint('attract.tasks.perproject', __name__, perproject_blueprint = Blueprint('attract.tasks.perproject', __name__,