From d2d3725eb6808cd3d65af825d46993816db300b9 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sun, 15 Apr 2012 16:00:25 +0200
Subject: [PATCH 1/3] fix agenda.test

---
 openslides/agenda/tests.py | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/openslides/agenda/tests.py b/openslides/agenda/tests.py
index 5de26ea45..2415c8fec 100644
--- a/openslides/agenda/tests.py
+++ b/openslides/agenda/tests.py
@@ -18,7 +18,6 @@ from django.db.models.query import EmptyQuerySet
 from projector.api import get_active_slide
 
 from agenda.models import Item
-from agenda.api import is_summary
 
 class ItemTest(TestCase):
     def setUp(self):
@@ -90,28 +89,16 @@ class ViewTest(TestCase):
     def testActivate(self):
         c = self.adminClient
 
-        response = c.get('/agenda/%d/activate/' % self.item1.id)
+        response = c.get('/projector/activate/%s/' % self.item1.sid)
         self.assertEqual(response.status_code, 302)
         self.assertTrue(self.item1.active)
         self.assertFalse(self.item2.active)
-        self.assertFalse(is_summary())
 
-        response = c.get('/agenda/%d/activate/summary/' % self.item2.id)
-        self.assertEqual(response.status_code, 302)
-        self.assertTrue(self.item2.active)
-        self.assertFalse(self.item1.active)
-        self.assertTrue(is_summary())
-
-        response = c.get('/agenda/%d/activate/' % 0)
+        response = c.get('/projector/activate/%s/' % 'agenda')
         self.assertEqual(response.status_code, 302)
         self.assertFalse(self.item2.active)
         self.assertFalse(self.item1.active)
-        self.assertEqual(get_active_slide(only_sid=True), 'agenda_show')
-
-        response = c.get('/agenda/%d/activate/' % 10000)
-        self.assertEqual(response.status_code, 404)
-        self.assertFalse(self.item2.active)
-        self.assertFalse(self.item1.active)
+        self.assertEqual(get_active_slide(only_sid=True), 'agenda')
 
     def testClose(self):
         c = self.adminClient

From 92305bf36374d5042c05c247a540d5d734518f89 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sun, 15 Apr 2012 16:02:13 +0200
Subject: [PATCH 2/3] use item for item sid

---
 openslides/agenda/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openslides/agenda/models.py b/openslides/agenda/models.py
index 1bf0fe4fc..c55087a73 100644
--- a/openslides/agenda/models.py
+++ b/openslides/agenda/models.py
@@ -117,7 +117,7 @@ class Item(MPTTModel, SlideMixin):
         order_insertion_by = ['weight', 'title']
 
 
-register_slidemodel(Item, model_name=_('Agenda Item'))
+register_slidemodel(Item)
 
 # TODO: put this in another file
 

From beaa3e341acdf0d001b2f5dfd07d6cc242451262 Mon Sep 17 00:00:00 2001
From: Andy Kittner <andkit@gmx.net>
Date: Sun, 15 Apr 2012 16:04:08 +0200
Subject: [PATCH 3/3] Create portable win32 binary distribution

---
 extras/win32-portable/create_portable.txt |  12 +
 extras/win32-portable/openslides.c        | 125 +++++++++
 extras/win32-portable/openslides.exe      | Bin 0 -> 7168 bytes
 extras/win32-portable/prepare_portable.py | 292 ++++++++++++++++++++++
 openslides/main.py                        | 152 +++++++++++
 start.py                                  |   6 +
 6 files changed, 587 insertions(+)
 create mode 100644 extras/win32-portable/create_portable.txt
 create mode 100644 extras/win32-portable/openslides.c
 create mode 100644 extras/win32-portable/openslides.exe
 create mode 100644 extras/win32-portable/prepare_portable.py
 create mode 100644 openslides/main.py
 create mode 100755 start.py

diff --git a/extras/win32-portable/create_portable.txt b/extras/win32-portable/create_portable.txt
new file mode 100644
index 000000000..2054e0d10
--- /dev/null
+++ b/extras/win32-portable/create_portable.txt
@@ -0,0 +1,12 @@
+How to create a new portable windows distribution of openslides:
+----------------------------------------------------------------
+1.) Follow the openslides installation instructions for windows, but add
+    the option "-Z" when executing easy_install e.g.:
+      easy_install -Z django django-mptt reportlab pil
+
+2.) in the main directory of the openslides checkout execute:
+      python extras/win32-portable/prepare_portable.py
+
+
+3.) The portable openslides distribution is now ready as a zip in the dist/
+    directory
diff --git a/extras/win32-portable/openslides.c b/extras/win32-portable/openslides.c
new file mode 100644
index 000000000..7086a7da7
--- /dev/null
+++ b/extras/win32-portable/openslides.c
@@ -0,0 +1,125 @@
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+#define _WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+#include <Python.h>
+
+static const char *site_code =
+    "import sys;"
+    "import os;"
+    "import site;"
+    "path = os.path.dirname(sys.executable);"
+    "site_dir = os.path.join(path, \"site-packages\");"
+    "site.addsitedir(site_dir);"
+    "sys.path.append(path)";
+
+static const char *run_openslides_code =
+    "import openslides.main;"
+    "openslides.main.main()";
+
+/* determine the path to the executable
+ * NOTE: Py_GetFullProgramPath() can't be used because
+ *       this would trigger pythons search-path initialization
+ *       But we need this to initialize PYTHONHOME before this happens
+ */
+static char *
+_get_module_name()
+{
+    size_t size = 1;
+    char *name = NULL;
+    int i;
+
+    /* a path > 40k would be insane, it is more likely something
+     * else has gone very wrong on the system
+     */
+    for (i = 0;i < 10; i++)
+    {
+	DWORD res;
+	char *n;
+
+	n = realloc(name, size);
+	if (!n)
+	{
+	    free(name);
+	    return NULL;
+	}
+	name = n;
+
+	res = GetModuleFileNameA(NULL, name, size);
+	if (res != 0 && res < size)
+	{
+	    return name;
+	}
+	else if (res == size)
+	{
+	    /* NOTE: Don't check GetLastError() == ERROR_INSUFFICIENT_BUFFER
+	     *       here, it isn't set consisntently across all platforms
+	     */
+
+	    size += 4096;
+	}
+	else
+	{
+	    DWORD err = GetLastError();
+	    fprintf(stderr, "WARNING: GetModuleFileName() failed "
+		"(res = %d, err = %d)", res, err);
+	    free(name);
+	    return NULL;
+
+	}
+    }
+
+    return NULL;
+}
+
+static int
+_run()
+{
+    if (PyRun_SimpleString(site_code) != 0)
+    {
+	fprintf(stderr, "ERROR: failed to initialize site path\n");
+	return 1;
+    }
+
+    if (PyRun_SimpleString(run_openslides_code) != 0)
+    {
+	fprintf(stderr, "ERROR: failed to execute openslides\n");
+	return 1;
+    }
+
+    return 0;
+}
+
+
+int
+main(int argc, char *argv[])
+{
+    int returncode;
+    char *py_home, *sep = NULL;
+
+    Py_SetProgramName(argv[0]);
+
+    py_home = _get_module_name();
+
+    if (py_home)
+	sep = strrchr(py_home, '\\');
+    /* should always be the true */
+    if (sep)
+    {
+	*sep = '\0';
+	Py_SetPythonHome(py_home);
+    }
+
+    Py_Initialize();
+    PySys_SetArgvEx(argc, argv, 0);
+
+    returncode = _run();
+
+    Py_Finalize();
+    free(py_home);
+
+    return returncode;
+}
diff --git a/extras/win32-portable/openslides.exe b/extras/win32-portable/openslides.exe
new file mode 100644
index 0000000000000000000000000000000000000000..55a24e895183383f158097748d77212bdbc8976e
GIT binary patch
literal 7168
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
Q&U05+e(=HkKg-8I07K4)E&u=k

literal 0
HcmV?d00001

diff --git a/extras/win32-portable/prepare_portable.py b/extras/win32-portable/prepare_portable.py
new file mode 100644
index 000000000..b9da42e09
--- /dev/null
+++ b/extras/win32-portable/prepare_portable.py
@@ -0,0 +1,292 @@
+import errno
+import glob
+import os
+import re
+import shutil
+import sys
+import zlib
+zlib.Z_DEFAULT_COMPRESSION = zlib.Z_BEST_COMPRESSION
+import zipfile
+
+import distutils.ccompiler
+import distutils.sysconfig
+
+from contextlib import nested
+
+import pkg_resources
+
+sys.path.insert(0, os.getcwd())
+import openslides
+
+COMMON_EXCLUDE = [
+    r".pyc$",
+    r".pyo$",
+    r".po$",
+    r".egg-info",
+    r"\blocale/(?!de/|en/)[^/]+/"
+]
+
+LIBEXCLUDE = [
+    r"^site-packages/",
+    r"^test/",
+    r"^curses/",
+    r"^idlelib/",
+    r"^lib2to3/",
+    r"^lib-tk/",
+    r"^msilib/",
+    r"^multiprocessing/",
+    r"^unittest/",
+]
+
+OPENSLIDES_EXCLUDE = [
+    r"^openslides/settings.py"
+]
+
+
+SITE_PACKAGES = {
+    "django": {
+        "copy": ["django"],
+        "exclude": [
+            r"^contrib/admindocs/",
+            r"^contrib/comments/",
+            r"^contrib/databrowse/",
+            r"^contrib/flatpages/",
+            r"^contrib/formtools/",
+            r"^contrib/gis/",
+            r"^contrib/humanize/",
+            r"^contrib/localflavor/",
+            r"^contrib/markup/",
+            r"^contrib/redirects/",
+            r"^contrib/sitemaps/",
+            r"^contrib/syndication/",
+            r"^contrib/webdesign/",
+        ]
+    },
+    "django-mptt": {
+        "copy": ["mptt"],
+    },
+    "reportlab": {
+        "copy": [
+            "reportlab",
+            "_renderPM.pyd",
+            "_rl_accel.pyd",
+            "sgmlop.pyd",
+            "pyHnj.pyd",
+        ],
+    },
+    "pil": {
+        # NOTE: PIL is a special case, see copy_pil
+        "copy": [],
+    }
+}
+
+PY_DLLS = [
+    "unicodedata.pyd",
+    "sqlite3.dll",
+    "_sqlite3.pyd",
+    "_socket.pyd",
+    "select.pyd",
+]
+
+MSVCR_PUBLIC_KEY = "1fc8b3b9a1e18e3b"
+MSVCR_VERSION = "9.0.21022.8"
+MSVCR_NAME = "Microsoft.VC90.CRT"
+
+def compile_re_list(patterns):
+    expr = "|".join("(?:{0})".format(x) for x in patterns)
+    return re.compile(expr)
+
+def relpath(base, path, addslash = False):
+    b = os.path.normpath(os.path.abspath(base))
+    p = os.path.normpath(os.path.abspath(path))
+    if p == b:
+        p = "."
+        if addslash:
+            p += "/"
+        return p
+
+    b += os.sep
+    if not p.startswith(b):
+        raise ValueError("{0!r} is not relative to {1!r}".format(path, base))
+    p = p[len(b):].replace(os.sep, "/")
+    if addslash:
+        p += "/"
+
+    return p
+
+def filter_excluded_dirs(exclude_pattern, basedir, dirpath, dnames):
+    i, l = 0, len(dnames)
+    while i < l:
+        rp = relpath(basedir, os.path.join(dirpath, dnames[i]), True)
+        if exclude_pattern.search(rp):
+            del dnames[i]
+            l -= 1
+        else:
+            i += 1
+
+def copy_dir_exclude(exclude, basedir, srcdir, destdir):
+    for dp, dnames, fnames in os.walk(srcdir):
+        filter_excluded_dirs(exclude, basedir, dp, dnames)
+
+        rp = relpath(basedir, dp)
+        target_dir = os.path.join(destdir, rp)
+        if not os.path.exists(target_dir):
+            os.makedirs(target_dir)
+
+        for fn in fnames:
+            fp = os.path.join(dp, fn)
+            rp = relpath(basedir, fp)
+            if exclude.search(rp):
+                continue
+
+            shutil.copyfile(fp, os.path.join(destdir, rp))
+
+def collect_lib(libdir, odir):
+    exclude = compile_re_list(COMMON_EXCLUDE + LIBEXCLUDE)
+    copy_dir_exclude(exclude, libdir, libdir, os.path.join(odir, "Lib"))
+
+def get_pkg_exclude(name, extra = ()):
+    exclude = COMMON_EXCLUDE[:]
+    exclude.extend(SITE_PACKAGES.get(name, {}).get("exclude", []))
+    exclude.extend(extra)
+    return compile_re_list(exclude)
+
+def copy_package(name, info, odir):
+    dist = pkg_resources.get_distribution(name)
+    exclude = get_pkg_exclude(name)
+
+    site_dir = dist.location
+    for thing in info.get("copy", []):
+        fp = os.path.join(site_dir, thing)
+        if not os.path.isdir(fp):
+            rp = relpath(site_dir, fp)
+            ofp = os.path.join(odir, rp)
+            shutil.copyfile(fp, ofp)
+        else:
+            copy_dir_exclude(exclude, site_dir, fp, odir)
+
+def copy_pil(odir):
+    dist = pkg_resources.get_distribution("pil")
+    exclude = get_pkg_exclude("pil")
+
+    dest_dir = os.path.join(odir, "PIL")
+    copy_dir_exclude(exclude, dist.location, dist.location, dest_dir)
+    fp = os.path.join(dest_dir, "PIL.pth")
+    if os.path.isfile(fp):
+        os.rename(fp, os.path.join(odir, "PIL.pth"))
+    else:
+        fp = os.path.join(os.path.dirname(dist.location), "PIL.pth")
+        shutil.copyfile(fp, os.path.join(odir, "PIL.pth"))
+
+def collect_site_packages(sitedir, odir):
+    if not os.path.exists(odir):
+        os.makedirs(odir)
+
+    for name, info in SITE_PACKAGES.iteritems():
+        copy_package(name, info, odir)
+
+    assert "pil" in SITE_PACKAGES
+    copy_pil(odir)
+
+def compile_openslides_launcher():
+    cc = distutils.ccompiler.new_compiler()
+    cc.add_include_dir(distutils.sysconfig.get_python_inc())
+    cc.add_library_dir(os.path.join(sys.exec_prefix, "Libs"))
+
+    objs = cc.compile(["extras/win32-portable/openslides.c"])
+    cc.link_executable(objs, "extras/win32-portable/openslides")
+
+def copy_dlls(odir):
+    dll_src = os.path.join(sys.exec_prefix, "DLLs")
+    dll_dest = os.path.join(odir, "DLLs")
+    if not os.path.exists(dll_dest):
+        os.makedirs(dll_dest)
+
+    for dll_name in PY_DLLS:
+        src = os.path.join(dll_src, dll_name)
+        dest = os.path.join(dll_dest, dll_name)
+        shutil.copyfile(src, dest)
+
+    pydllname = "python{0}{1}.dll".format(*sys.version_info[:2])
+    src = os.path.join(os.environ["WINDIR"], "System32", pydllname)
+    dest = os.path.join(odir, pydllname)
+    shutil.copyfile(src, dest)
+
+def copy_msvcr(odir):
+    candidates = glob.glob("{0}/x86_*{1}_{2}*".format(
+        os.path.join(os.environ["WINDIR"], "winsxs"),
+        MSVCR_NAME, MSVCR_PUBLIC_KEY))
+
+    msvcr_local_name = None
+    msvcr_dll_dir = None
+    for dp in candidates:
+        bn = os.path.basename(dp)
+        if MSVCR_VERSION in bn:
+            msvcr_local_name = bn
+            msvcr_dll_dir = dp
+            break
+    else:
+        sys.stderr.write("Warning could not determine msvcr runtime location\n")
+        sys.stderr.write("Private asssembly for VC runtime must be added manually\n")
+        return
+
+
+    msvcr_dest_dir = os.path.join(odir, MSVCR_NAME)
+    if not os.path.exists(msvcr_dest_dir):
+        os.makedirs(msvcr_dest_dir)
+
+    for fn in os.listdir(msvcr_dll_dir):
+        src = os.path.join(msvcr_dll_dir, fn)
+        dest = os.path.join(msvcr_dest_dir, fn)
+        shutil.copyfile(src, dest)
+
+    src = os.path.join(os.environ["WINDIR"], "winsxs", "Manifests",
+        "{0}.manifest".format(msvcr_local_name))
+    dest = os.path.join(msvcr_dest_dir, "{0}.manifest".format(MSVCR_NAME))
+    shutil.copyfile(src, dest)
+
+def main():
+    prefix = os.path.dirname(sys.executable)
+    libdir = os.path.join(prefix, "Lib")
+    sitedir = os.path.join(libdir, "site-packages")
+    odir = "dist/openslides-{0}-portable".format(openslides.get_version())
+
+    try:
+        shutil.rmtree(odir)
+    except OSError as e:
+        if e.errno != errno.ENOENT:
+            raise
+
+    os.makedirs(odir)
+
+    collect_lib(libdir, odir)
+    collect_site_packages(sitedir, os.path.join(odir, "site-packages"))
+
+    exclude = get_pkg_exclude("openslides", OPENSLIDES_EXCLUDE)
+    copy_dir_exclude(exclude, ".", "openslides", odir)
+
+    try:
+        compile_openslides_launcher()
+    except distutils.errors.DistutilsError:
+        sys.stderr.write("openslides.exe could not be build, "
+            "trying to use existing file\n")
+
+    shutil.copyfile("extras/win32-portable/openslides.exe",
+        os.path.join(odir, "openslides.exe"))
+
+    copy_dlls(odir)
+    copy_msvcr(odir)
+
+    fp = os.path.join("dist", "openslides-{0}-portable.zip".format(
+        openslides.get_version()))
+
+    with zipfile.ZipFile(fp, "w", zipfile.ZIP_DEFLATED) as zf:
+        for dp, dnames, fnames in os.walk(odir):
+            for fn in fnames:
+                fp = os.path.join(dp, fn)
+                rp = relpath(odir, fp)
+                zf.write(fp, rp)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/openslides/main.py b/openslides/main.py
new file mode 100644
index 000000000..f9f81a9c3
--- /dev/null
+++ b/openslides/main.py
@@ -0,0 +1,152 @@
+from __future__ import with_statement
+
+import os
+import sys
+import optparse
+import socket
+import time
+import threading
+import webbrowser
+from contextlib import nested
+
+import django.conf
+from django.core.management import execute_from_command_line
+from django.utils.crypto import get_random_string
+
+import openslides
+
+
+def main(argv = None):
+    if argv is None:
+        argv = sys.argv[1:]
+
+    parser = optparse.OptionParser(description = "Run openslides using "
+        "django's builtin webserver")
+    parser.add_option("-a", "--address", help = "IP Address to listen on")
+    parser.add_option("-p", "--port", type = "int", help = "Port to listen on")
+    parser.add_option("--nothread", action = "store_true",
+        help = "Do not use threading")
+    parser.add_option("--syncdb", action = "store_true",
+        help = "Update/create database before starting the server")
+    parser.add_option("--reset-admin", action = "store_true",
+        help = "Make sure the user 'admin' exists and uses 'admin' as password")
+
+    opts, args = parser.parse_args(argv)
+    if args:
+        sys.stderr.write("This command does not take arguments!\n\n")
+        parser.print_help()
+        sys.exit(1)
+
+    if not prepare_openslides(opts.syncdb):
+        sys.exit(1)
+
+    if opts.reset_admin:
+        create_or_reset_admin_user()
+
+    argv = ["", "runserver", "--noreload"]
+    if opts.nothread:
+        argv.append("--nothread")
+
+    addr, port = detect_listen_opts(opts.address, opts.port)
+    argv.append("%s:%d" % (addr, port))
+
+    start_browser(addr, port)
+    execute_from_command_line(argv)
+
+def detect_listen_opts(address, port):
+    if address is None:
+        address = socket.gethostbyname(socket.gethostname())
+
+    if port is None:
+        # test if we can use port 80
+        s = socket.socket()
+        port = 80
+        try:
+            s.bind((address, port))
+            s.listen(-1)
+        except socket.error:
+            port = 8000
+        finally:
+            s.close()
+
+    return address, port
+
+def start_browser(addr, port):
+    if port == 80:
+        url = "http://%s" % (addr, )
+    else:
+        url = "http://%s:%d" % (addr, port)
+    browser = webbrowser.get()
+    def f():
+        time.sleep(1)
+        browser.open(url)
+
+    t = threading.Thread(target = f)
+    t.start()
+
+def prepare_openslides(always_syncdb = False):
+    settings_module = os.environ.get(django.conf.ENVIRONMENT_VARIABLE)
+    if not settings_module:
+        os.environ[django.conf.ENVIRONMENT_VARIABLE] = "openslides.settings"
+        settings_module = "openslides.settings"
+
+    try:
+        # settings is a lazy object, force the settings module
+        # to be imported
+        dir(django.conf.settings)
+    except ImportError:
+        pass
+    else:
+        if always_syncdb:
+            run_syncdb()
+        return True # import worked, settings are already configured
+
+
+    if settings_module != "openslides.settings":
+        sys.stderr.write("Settings module '%s' cannot be imported.\n"
+            % (django.conf.ENVIRONMENT_VARIABLE, ))
+        return False
+
+    openslides_dir = os.path.dirname(openslides.__file__)
+    src_fp = os.path.join(openslides_dir, "default.settings.py")
+    dest_fp = os.path.join(openslides_dir, "settings.py")
+
+    with nested(open(dest_fp, "w"), open(src_fp, "r")) as (dest, src):
+        for l in src:
+            if l.startswith("SECRET_KEY ="):
+                l = "SECRET_KEY = '%s'\n" % (generate_secret_key(), )
+            dest.write(l)
+
+
+    run_syncdb()
+    create_or_reset_admin_user()
+    return True
+
+def run_syncdb():
+    # now initialize the database
+    argv = ["", "syncdb", "--noinput"]
+    execute_from_command_line(argv)
+
+def create_or_reset_admin_user():
+    from django.contrib.auth.models import User
+
+    try:
+        obj = User.objects.get(username = "admin")
+    except User.DoesNotExist:
+        User.objects.create_superuser(
+            username = "admin",
+            password = "admin",
+            email = "admin@example.com")
+        return
+
+    obj.set_password("admin")
+    obj.save()
+
+
+def generate_secret_key():
+    # same chars/ length as used in djangos startproject command
+    chars = "abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*(-_=+)"
+    return get_random_string(50, chars)
+
+if __name__ == "__main__":
+    main()
diff --git a/start.py b/start.py
new file mode 100755
index 000000000..a5bbf1d65
--- /dev/null
+++ b/start.py
@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+
+import openslides.main
+
+if __name__ == "__main__":
+    openslides.main.main()