Added the command getgeiss. Work on start script to use Geiss.

.travis.yml

@@ -28,6 +28,6 @@ script:
   - coverage report --fail-under=44
 
   - DJANGO_SETTINGS_MODULE='tests.settings' coverage run ./manage.py test tests.integration
-  - coverage report --fail-under=73
+  - coverage report --fail-under=70
 
   - DJANGO_SETTINGS_MODULE='tests.old.settings' ./manage.py test tests.old

CHANGELOG

@@ -115,7 +115,8 @@ Other:
 - Added function utils.auth.anonymous_is_enabled which returns true, if it is.
 - Changed has_perm to support an user id or None (for anyonmous) as first argument.
 - Removed our AnonymousUser. Make sure not to use user.has_perm() anymore.
-- Added Russia translation (Thanks to Andreas Engler).
+- Add the command getgeiss to download the latest version of Geiss.
+- Added Russian translation (Thanks to Andreas Engler).
 
 
 Version 2.0 (2016-04-18)

openslides/__main__.py

@@ -1,19 +1,22 @@
 #!/usr/bin/env python
 
 import os
+import subprocess
 import sys
 
-from django.core.management import execute_from_command_line
+import django
+from django.core.management import call_command, execute_from_command_line
 
 from openslides import __version__ as openslides_version
 from openslides.utils.main import (
     ExceptionArgumentParser,
     UnknownCommand,
     get_default_settings_path,
+    get_geiss_path,
     get_local_settings_path,
     is_local_installation,
+    open_browser,
     setup_django_settings_module,
-    start_browser,
     write_settings,
 )
 
@@ -177,29 +180,54 @@ def start(args):
     # Set the django setting module and run migrations
     # A manual given environment variable will be overwritten
     setup_django_settings_module(settings_path, local_installation=local_installation)
+    django.setup()
+    from django.conf import settings
 
-    execute_from_command_line(['manage.py', 'migrate'])
+    call_command('migrate')
 
-    # Open the browser
-    if not args.no_browser:
-        if args.host == '0.0.0.0':
-            # Windows does not support 0.0.0.0, so use 'localhost' instead
-            start_browser('http://localhost:%s' % args.port)
-        else:
-            start_browser('http://%s:%s' % (args.host, args.port))
+    use_geiss = True
+    if use_geiss:
+        # Make sure redis is used.
+        if settings.CHANNEL_LAYERS['default']['BACKEND'] != 'asgi_redis.RedisChannelLayer':
+            raise RuntimeError("You have to use the asgi redis backend in the settings to use Geiss.")
 
-    # Start the webserver
-    # Use flag --noreload to tell Django not to reload the server.
-    # Use flag --insecure to serve static files even if DEBUG is False.
-    # Use flag --nothreading to tell Django Channels to run in single thread mode.
-    execute_from_command_line([
-        'manage.py',
-        'runserver',
-        '{}:{}'.format(args.host, args.port),
-        '--noreload',
-        '--insecure',
-        '--nothreading',
-    ])
+        # Download Geiss and collect the static files.
+        call_command('getgeiss')
+        call_command('collectstatic', interactive=False)
+
+        # Open the browser
+        if not args.no_browser:
+            open_browser(args.host, args.port)
+
+        # Start Geiss in its own thread
+        subprocess.Popen([
+            get_geiss_path(),
+            '--host', args.host,
+            '--port', args.port,
+            '--static', '/static/:{}'.format(settings.STATIC_ROOT),
+            '--static', '/media/:{}'.format(settings.MEDIA_ROOT),
+        ])
+
+        # Start one worker in this thread. There can be only one worker as long
+        # as sqlite is used.
+        call_command('runworker')
+
+    else:
+        # Open the browser
+        if not args.no_browser:
+            open_browser(args.host, args.port)
+
+        # Start the webserver
+        # Use flag --noreload to tell Django not to reload the server.
+        # Use flag --insecure to serve static files even if DEBUG is False.
+        # Use flag --nothreading to tell Django Channels to run in single thread mode.
+        call_command(
+            'runserver',
+            '{}:{}'.format(args.host, args.port),
+            noreload=True,
+            insecure=True,
+            nothreading=True,
+        )
 
 
 def createsettings(args):

openslides/core/management/commands/getgeiss.py

@@ -0,0 +1,73 @@
+import json
+import os
+import stat
+import sys
+from urllib.request import urlopen, urlretrieve
+
+from django.core.management.base import BaseCommand, CommandError
+
+from openslides.utils.main import get_geiss_path
+
+
+class Command(BaseCommand):
+    """
+    Command to get the latest release of Geiss from GitHub.
+    """
+    help = 'Get the latest Geiss release from GitHub.'
+
+    def handle(self, *args, **options):
+        geiss_name = get_geiss_name()
+        download_file = get_geiss_path()
+
+        if os.path.isfile(download_file):
+            # Geiss does probably exist. Do Nothing.
+            # TODO: Add an update flag, that downloads geiss anyway.
+            return
+
+        response = urlopen(get_geiss_url()).read()
+        release = json.loads(response.decode())
+        download_url = None
+        for asset in release['assets']:
+            if asset['name'] == geiss_name:
+                download_url = asset['browser_download_url']
+                break
+        if download_url is None:
+            raise CommandError("Could not find download URL in release.")
+
+        urlretrieve(download_url, download_file)
+
+        # Set the executable bit on the file. This will do nothing on windows
+        st = os.stat(download_file)
+        os.chmod(download_file, st.st_mode | stat.S_IEXEC)
+
+
+def get_geiss_url():
+    """
+    Returns the URL to the API which gives the information which geiss binary
+    has to be downloaded.
+
+    Currently this is a static github-url to the repo where geiss is at the
+    moment. Could be changed to use a setting or a flag in the future.
+    """
+    return 'https://api.github.com/repos/ostcar/geiss/releases/latest'
+
+
+def get_geiss_name():
+    """
+    Returns the name of the Geiss executable for the current operating system.
+
+    For example geiss_windows_64.exe on a windows64 platform.
+    """
+    # This will be 32 if the current python interpreter has only
+    # 32 bit, even if it is run on a 64 bit operating sysem.
+    bits = '64' if sys.maxsize > 2**32 else '32'
+
+    geiss_names = {
+        'linux': 'geiss_linux_{bits}',
+        'win32': 'geiss_windows_{bits}.exe',  # Yes, it is win32, even on a win64 system!
+        'darwin': 'geiss_mac_{bits}'}
+
+    try:
+        return geiss_names[sys.platform].format(bits=bits)
+    except KeyError:
+        raise CommandError("Plattform {} is not supported by Geiss".format(sys.platform))

openslides/utils/main.py

@@ -281,6 +281,14 @@ def start_browser(browser_url):
         thread.start()
 
 
+def open_browser(host, port):
+    if host == '0.0.0.0':
+        # Windows does not support 0.0.0.0, so use 'localhost' instead
+        start_browser('http://localhost:%s' % port)
+    else:
+        start_browser('http://%s:%s' % (host, port))
+
+
 def get_database_path_from_settings():
     """
     Retrieves the database path out of the settings file. Returns None,
@@ -323,3 +331,20 @@ def is_local_installation():
     This is the case if manage.py is used, or when the --local-installation flag is set.
     """
     return True if '--local-installation' in sys.argv or 'manage.py' in sys.argv[0] else False
+
+
+def get_geiss_path():
+    """
+    Returns the path and file to the geis binary.
+    """
+    from django.conf import settings
+    download_path = getattr(settings, 'OPENSLIDES_USER_DATA_PATH', '')
+    bin_name = 'geiss.exe' if is_windows() else 'geiss'
+    return os.path.join(download_path, bin_name)
+
+
+def is_windows():
+    """
+    Returns True when the current system is windows. Returns False otherwise.
+    """
+    return sys.platform == 'win32'

openslides/utils/utils.py

@@ -1,6 +1,6 @@
 import re
-import roman
 
+import roman
 
 CAMEL_CASE_TO_PSEUDO_SNAKE_CASE_CONVERSION_REGEX_1 = re.compile('(.)([A-Z][a-z]+)')
 CAMEL_CASE_TO_PSEUDO_SNAKE_CASE_CONVERSION_REGEX_2 = re.compile('([a-z0-9])([A-Z])')