Move window, timeline and project creation into management commands

Author: einarf

demosys/__init__.py

@@ -1,16 +1,9 @@
+from demosys.conf import settings
 
-def setup(settings_override=None):
-    """
-    Initialize effects and prepare for running
 
-    :param settings_override: (dict) keyword overrides for settings
-    """
-    from demosys.effects.registry import effects
-    from demosys.conf import settings
-    if settings_override:
-        settings.update(**settings_override)
-
-    effects.polulate(settings.EFFECTS)
+def setup(**kwargs):
+    """Initialize"""
+    settings.update(**kwargs)
 
 
 def run(*args, **kwargs):

demosys/management/base.py

@@ -1,6 +1,9 @@
 import argparse
 from importlib import import_module
 
+from demosys.conf import settings
+from demosys.utils.module_loading import import_string
+
 
 class CommandError(Exception):
     pass
@@ -100,3 +103,19 @@ def try_import(self, name):
             pass
         else:
             raise ImportError("{} conflicts with an existing python module".format(name))
+
+
+class RunCommand(BaseCommand):
+
+    def create_window(self):
+        window_cls_name = settings.WINDOW.get('class', 'demosys.context.glfw.GLFW_Window')
+        window_cls = import_string(window_cls_name)
+        window = window_cls()
+        window.print_context_info()
+        return window
+
+    def create_project(self):
+        return import_string(settings.PROJECT)()
+
+    def create_timeline(self, project):
+        return import_string(settings.TIMELINE)(project)

demosys/management/commands/run.py

@@ -1,27 +1,20 @@
 import demosys
-from demosys.management.base import BaseCommand
+from demosys.management.base import RunCommand
 from demosys.exceptions import ImproperlyConfigured
 from demosys.utils.module_loading import import_string
 from demosys.conf import settings
 
 
-class Command(BaseCommand):
+class Command(RunCommand):
     help = "Run using the configured effect manager"
 
     def add_arguments(self, parser):
         pass
 
     def handle(self, *args, **options):
         demosys.setup()
-        manager_path = getattr(settings, 'EFFECT_MANAGER')
-        if not manager_path:
-            raise ImproperlyConfigured("EFFECT_MANAGER not properly configured in settings")
-        print(manager_path)
-        try:
-            manager_cls = import_string(manager_path)
-        except ImportError as err:
-            raise ImproperlyConfigured(
-                "EFFECT_MANAGER '{}' failed to initialize: {}".format(manager_path, err))
+        window = self.create_window()
+        project = self.create_project()
+        timeline = self.create_timeline(project)
 
-        manager = manager_cls()
-        demosys.run(manager=manager)
+        demosys.run(window=window, project=project, timeline=timeline)

demosys/management/commands/runeffect.py

@@ -2,17 +2,21 @@
 Run a specific effect
 """
 import demosys
-from demosys.management.base import CreateCommand
+from demosys.management.base import RunCommand
 from demosys.project.default import Project
+from demosys.timeline.single import Timeline
 
 
-class Command(CreateCommand):
+class Command(RunCommand):
     help = "Runs an effect"
 
     def add_arguments(self, parser):
         parser.add_argument("name", help="Name of the effect")
 
     def handle(self, *args, **options):
-        demosys.setup(settings_override={'EFFECTS': [options['name']]})
+        demosys.setup(EFFECTS=[options['name']])
+        window = self.create_window()
         project = Project(effect_module=options['name'])
-        demosys.run(project=project)
+        timeline = Timeline(project)
+
+        demosys.run(window=window, project=project, timeline=timeline)