# HG changeset patch # User grandjoncl # Date 1354102287 -3600 # Node ID 563d51c73231d32df2ed1ffce38449ef23fde80f # Parent 89941a72e69fbacbb6506d4316a26deb73cfb953# Parent 94f9d36371f6078821a0347ae2643320019de797 Merge with 8251c6a02d6fc48c19f241f8055ceac0017ac457 diff -r 94f9d36371f6 -r 563d51c73231 .DS_Store Binary file .DS_Store has changed diff -r 94f9d36371f6 -r 563d51c73231 .hgignore --- a/.hgignore Wed Nov 28 12:27:08 2012 +0100 +++ b/.hgignore Wed Nov 28 12:31:27 2012 +0100 @@ -1,19 +1,8 @@ syntax: regexp -^web/index$ -^web/log$ -^virtualenv/web/env/ .*\.pyc$ -^virtualenv/web/project-boot\.py$ -^web/ldtplatform/config\.py$ -^web/ldtplatform/\.htaccess$ -^web/\.htaccess$ -^virtualenv/web/distribute-0\.6\.14\.tar\.gz$ ^src/ldt/Ldt\.egg-info$ ^src/ldt/dist$ -^web/static/media/ldt$ -^web/static/site/admin$ -^web/static/site/ldt$ ^virtualenv/setup/project-boot\.py$ ^virtualenv/setup/env/ ^src/ldt/build$ @@ -23,16 +12,5 @@ ^src/ldt/MANIFEST\.in$ ^src/ldt/MANIFEST$ ^\.pydevproject$ -^web/static/media/cache$ ^\.settings/org\.eclipse\.core\.resources\.prefs$ -^web/static/media/thumbnails$ -^virtualenv/sync/env - -syntax: regexp -^sbin/sync/config\.py$ -syntax: regexp -^virtualenv/sync/project-boot\.py$ -relre:^.metadata - -syntax: regexp -^web/\.htusers$ \ No newline at end of file +\.DS_Store$ diff -r 94f9d36371f6 -r 563d51c73231 .hgtags --- a/.hgtags Wed Nov 28 12:27:08 2012 +0100 +++ b/.hgtags Wed Nov 28 12:31:27 2012 +0100 @@ -127,3 +127,7 @@ d49f0e0e0a52880228a8bf83e75ad02971db569e V01.30 ba35e8803c76b87d68a4c95f180cebf35d71b73f V01.31 10b2e464af09e56809b3c9e4209f88297fa7f5c0 V01.32 +caa3a2695cb7710bbab7970ebd0e0b28eea140a9 V01.33 +caa3a2695cb7710bbab7970ebd0e0b28eea140a9 V01.33 +41eb88128c8fad65408b2db4965ffda6c75d21bc V01.33 +659ca382a67d90fd7fdda8c4f422091434c97d86 V01.34 diff -r 94f9d36371f6 -r 563d51c73231 .settings/org.eclipse.core.resources.prefs --- a/.settings/org.eclipse.core.resources.prefs Wed Nov 28 12:27:08 2012 +0100 +++ b/.settings/org.eclipse.core.resources.prefs Wed Nov 28 12:31:27 2012 +0100 @@ -38,7 +38,4 @@ encoding//src/ldt/ldt/user/migrations/0001_initial.py=utf-8 encoding//src/ldt/ldt/user/migrations/0008_auto__chg_field_groupprofile_image__chg_field_groupprofile_group__chg_.py=utf-8 encoding//virtualenv/web/env/guardianenv/Lib/site-packages/guardian/migrations/0001_initial.py=utf-8 -encoding//virtualenv/web/env/venv_platform/lib/python2.7/site-packages/haystack/backends/__init__.py=utf-8 -encoding//web/ldtplatform/config.py=utf-8 -encoding//web/ldtplatform/settings.py=utf-8 encoding/=UTF-8 diff -r 94f9d36371f6 -r 563d51c73231 sbin/sync/config.py.tmpl --- a/sbin/sync/config.py.tmpl Wed Nov 28 12:27:08 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,60 +0,0 @@ -from fabric.api import env - -env.hosts = ['iri@web.iri.centrepompidou.fr'] - -env.web_group = 'www-data' -env.folders = ['log', 'static/media'] - -env.base_export_path = "~/tmp" -env.export_prefix = "platform" -env.remote_web_path = "/iridata/www/ldt/" -env.platform_web_module = "ldtplatform" -env.remote_ldt_base_path = "/tmp" -env.remote_virtualenv_path = "/iridata/virtualenv/ldt" -env.remote_venv_export_path = "/iridata/users/iri/tmp" -env.remote_baseline_venv = "/iridata/virtualenv/baseline2.7" -env.web_rsync_filters = [ - "+ core", - "P .htpasswd", - "P .htaccess", - "P ldtplatform/.htaccess", - "P ldtplatform/config.py", - "P ldtplatform/modwsgi.wsgi", - "P robots.txt", - "P env/***", - "P log/***", - "P index/***", - "P static/media/***", - "P crossdomain.xml", -] -env.venv_rsync_filters = [ - "+ core", -] -env.web_relaunch_cmd = "supervisorctl restart platform" - -env.base_url = "/" -env.web_url = "http://ldt.iri.centrepompidou.fr" -env.stream_url = "rtmp://media.iri.centrepompidou.fr/ddc_player/" - -env.stream_src_prefix = "" -env.ffmpeg_path = "/usr/bin/ffmpeg" - -env.db_engine = 'django.db.backends.postgresql_psycopg2' -env.db_name = 'platform' -env.db_user = 'iriuser' -env.db_password = '' -env.db_host = 'sql.iri.centrepompidou.fr' -env.db_port = 5432 - -env.log_file = env.remote_web_path + '/log/log.txt' - -env.google_analytics_code = "" - -env.email_use_tls = True -env.email_host = "" -env.email_host_user = "" -env.email_host_user = "" -env.email_port = "" - -env.forbidden_stream_url = "rtmp://media.iri.centrepompidou.fr/ddc_player/mp4:video/forbidden_stream.mp4?old_path=" - diff -r 94f9d36371f6 -r 563d51c73231 sbin/sync/fabfile.py --- a/sbin/sync/fabfile.py Wed Nov 28 12:27:08 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,282 +0,0 @@ -from fabric.api import task, run, local, env, cd, put, prefix, sudo -from fabric.colors import green -from fabric.contrib.project import rsync_project -from fabric.contrib.files import exists, upload_template -from fabric.context_managers import settings -from mercurial import commands, ui, hg, cmdutil -import imp -import os, os.path -import shutil -import sys - -import config - -def get_export_path(version): - base_path = os.path.join(env.base_export_path,env.export_prefix).rstrip("/") - return os.path.expanduser(base_path) + "_%s" % (str(version)) - -def clean_export_folder(path): - print("Removing %s" % path) - if os.path.isdir(path): - shutil.rmtree(path, ignore_errors=True) - -def do_export_version(path, version): - print("Export version %s"%str(version)) - - local("hg archive -r \'%s\' \"%s\"" % (str(version),path)) - print("Export version %s done"%str(version)) - - -def get_remote_env(remotepath, remotevirtualenvpath, platform_web_module, settings_key): - activate_path = os.path.join(remotevirtualenvpath, "bin/activate") - res = "" - with prefix("source \"%s\"" % activate_path), prefix("export PYTHONPATH=\"%s\"" % remotepath), cd(remotepath): - tempfilepath = run("mktemp -t ldtplatform.XXXXXX") - with settings(warn_only=True): - run("echo \"import os\" > %s" % (tempfilepath)) - map(lambda str: run("echo \"%s\" >> %s" % (str, tempfilepath)), - ["os.environ.setdefault('DJANGO_SETTINGS_MODULE', '%s.settings')" % (platform_web_module), - "from django.conf import settings", - "print settings.%s" % (settings_key)]) - res = run("python < %s" % (tempfilepath)) - run("rm -f \"%s\"" % (tempfilepath)) - return res - - - -def rsync_export(path, remotepath, filters): - print("Rsync %s to %s",(path,remotepath)) - - filter_option_str = "--progress --stats" - if filters: - filter_option_str += " " + " ".join(["--filter \"%s\"" % (f) for f in filters]) - - run("mkdir -p \"%s\"" % remotepath) - rsync_project(remotepath, local_dir=path, extra_opts=filter_option_str, delete=True) - print("Rsync %s to %s done",(path,remotepath)) - -def clean_rsync_folder(remotepath): - print("clean rsync folder %s" % remotepath) - run("rm -fr \"%s\"" % remotepath) - -def build_src(path): - print("Build source dist at %s" % path) - f = None - try: - f, pathname, description = imp.find_module("setup", [path]) - print(" 2 Build source dist at %s" % path) - setup_mod = imp.load_module("setup", f, pathname, description) - print(" 3 Build source dist at %s" % path) - finally: - if f: - f.close() - - setup_mod.launch_setup("setup.py", ['sdist']) - - print("Build source dist at %s done" % path) - - -def get_src_version(path): - print("get src version at %s" % path) - f = None - try: - f, pathname, description = imp.find_module("ldt", [path]) - ldt_mod = imp.load_module("ldt", f, pathname, description) - finally: - if f: - f.close() - version = ldt_mod.VERSION - version_str = ldt_mod.get_version() - - return (version, version_str) - - -def sync_build(path): - print("Sync build %s" % path) - with cd(env.remote_ldt_base_path): - filename = os.path.basename(path) - res_trans = put(path, os.path.join(env.remote_ldt_base_path, filename)) - print("Sync build %s to %s" % (path,repr(res_trans))) - return res_trans - -def remove_build(path): - print("remove build build %s" % path) - run("rm \"%s\"" % path) - - -def install_build(remotepath, remotevirtualenvpath): - print("Install build %s in %s" % (remotepath, remotevirtualenvpath)) - activate_path = os.path.join(remotevirtualenvpath, "bin/activate") - - with prefix("source %s" % activate_path): - run("pip install \"%s\"" % remotepath) - -def collectstatic(remotepath, remotevirtualenvpath, platform_web_module): - print("Collect static in %s with %s" % (remotepath, remotevirtualenvpath)) - remotestaticsitepath = get_remote_env(remotepath, remotevirtualenvpath, platform_web_module, "STATIC_ROOT") - activate_path = os.path.join(remotevirtualenvpath, "bin/activate") - with prefix("source \"%s\"" % activate_path), prefix("export PYTHONPATH=\"%s\"" % remotepath), cd(remotepath): - #remocve old files optio -c of collect static fail ! - run("rm -fr \"%s\"" % (remotestaticsitepath)) - run("python manage.py collectstatic --noinput") - -def create_config(export_path): - print("Create config from %s" % (export_path,)) - remotepath = env.remote_web_path - remote_config_path = os.path.join(remotepath, env.platform_web_module, "config.py") - template_path = os.path.join(export_path, "web", env.platform_web_module, "config.py.tmpl") - - context = { - 'base_dir': os.path.join(remotepath, env.platform_web_module).rstrip("/")+"/", - 'base_url': env.base_url, - 'web_url': env.web_url, - 'stream_url': env.stream_url, - 'stream_src_prefix': env.stream_src_prefix, - 'ffmpeg_path': env.ffmpeg_path, - 'db_engine': env.db_engine, - 'db_name': env.db_name, - 'db_user': env.db_user, - 'db_password': env.db_password, - 'db_host': env.db_host, - 'db_port': env.db_port, - 'log_file': env.log_file, - 'google_analytics_code': env.google_analytics_code, - 'email_use_tls': env.email_use_tls, - 'email_host': env.email_host, - 'email_host_user': env.email_host_user, - 'email_host_user': env.email_host_user, - 'email_port': env.email_port, - 'forbidden_stream_url': env.forbidden_stream_url, - } - - if not exists(remote_config_path, verbose=True): - upload_template(template_path, remote_config_path, context=context) - -def export_version(version): - print("export version %s" % str(version)) - - export_path = get_export_path(version) - - clean_export_folder(export_path) - do_export_version(export_path,version) - - return export_path - -def do_create_virtualenv(remote_venv_export_path, remotevirtualenvpath): - print("Create virtualenv export_path : %s - remote venvpath : %s" % (remote_venv_export_path, remotevirtualenvpath)) - activate_path = os.path.join(remotevirtualenvpath, "bin/activate") - if "remote_baseline_venv" in env and env.remote_baseline_venv: - prefix_str = "source \"%s\"" % os.path.join(env.remote_baseline_venv, "bin/activate") - else: - prefix_str = "echo" - with settings(warn_only=True): - run("rm -fr \"%s\"" % remotevirtualenvpath) - run("mkdir -p \"%s\"" % remotevirtualenvpath) - with prefix(prefix_str), cd(os.path.join(remote_venv_export_path,"virtualenv","web")): - run("python create_python_env.py") - run("python project-boot.py \"%s\"" % remotevirtualenvpath) - with prefix("source \"%s\"" % activate_path): - run("pip install -r \"%s\"" % os.path.join(remote_venv_export_path,"virtualenv","web","res","srvr_requirements.txt")) - -def do_sync_ldt(version, export_path): - print("do_sync_ldt with version %s and path %s" % (version,export_path)) - src_path = export_path + "/src/ldt" - build_src(src_path) - (_,version_str) = get_src_version(src_path) - build_path = os.path.join(src_path,"dist","ldt-%s.tar.gz" % version_str) - sync_install_build(build_path) - - -def sync_install_build(build_path): - res_trans = None - try: - res_trans = sync_build(build_path) - install_build(res_trans[0], env.remote_virtualenv_path) - finally: - if res_trans: - remove_build(res_trans[0]) - - -def do_sync_web(version, export_path): - print("do_sync_web with version %s and path %s" % (version,export_path)) - web_path = os.path.join(export_path,"web/") - rsync_export(web_path, env.remote_web_path, env.web_rsync_filters) - -def check_folder_access(): - print("Check folder access") - # get remote user - for folder_path in env.folders: - if not os.path.isabs(folder_path): - folder_path = env.remote_web_path.rstrip("/")+ "/" + folder_path - with settings(warn_only=True): - if not exists(folder_path): - run("mkdir -p \"%s\"" % folder_path) - run("chown -R -c :%s \"%s\"" % (env.web_group, folder_path)) - run("chmod -R -c g+w \"%s\"" % folder_path) -@task -def relaunch_server(do_collectstatic=True): - print("Relaunch server") - check_folder_access() - if do_collectstatic: - collectstatic(env.remote_web_path, env.remote_virtualenv_path, env.platform_web_module) - sudo(env.web_relaunch_cmd, shell=False) - -@task -def sync_web(version): - print(green("sync web with version %s" % version)) - export_path = export_version(version) - do_sync_web(version, export_path) - create_config(export_path) - clean_export_folder(export_path) - relaunch_server() - -@task -def sync_ldt(version): - print(green("sync ldt with version %s" % version)) - export_path = export_version(version) - do_sync_ldt(version, export_path) - clean_export_folder(export_path) - relaunch_server() - -@task -def update_lib(version, package): - print(green("update ldt with version %s" % version)) - export_path = export_version(version) - lib_path = os.path.join(export_path, "virtualenv", "res", "lib") - - f, pathname, description = imp.find_module("patch", [lib_path]) - patch = imp.load_module("patch", f, pathname, description) - f, pathname, description = imp.find_module("lib_create_env", [lib_path]) - lib_create_env = imp.load_module("lib_create_env", f, pathname, description) - - package_path = os.path.join(export_path, "virtualenv", "res", "src", lib_create_env.URLS[package]['local']) - - sync_install_build(package_path) - clean_export_folder(export_path) - relaunch_server() - -@task -def sync_platform(version): - print(green("sync platform with version %s" % version)) - export_path = export_version(version) - do_sync_ldt(version, export_path) - do_sync_web(version, export_path) - create_config(export_path) - clean_export_folder(export_path) - relaunch_server() - -@task -def create_virtualenv(version): - print(green("create virtualenv with version %s" % version)) - export_path = export_version(version) - venv_remote_export_path = "" - try: - virtualenv_path = os.path.join(export_path, "virtualenv") - - venv_remote_export_path = os.path.join(env.remote_venv_export_path, env.export_prefix, version,"virtualenv") - rsync_export(virtualenv_path, venv_remote_export_path, env.venv_rsync_filters) - do_create_virtualenv(venv_remote_export_path, env.remote_virtualenv_path) - finally: - clean_export_folder(export_path) - if venv_remote_export_path: - clean_rsync_folder(venv_remote_export_path) diff -r 94f9d36371f6 -r 563d51c73231 sbin/sync/sync_ldt_platform --- a/sbin/sync/sync_ldt_platform Wed Nov 28 12:27:08 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +0,0 @@ -#!/usr/bin/env bash -set -e -if [ -d ~/tmp/platform_V$1 ]; then - rm -fr ~/tmp/platform_V$1; -fi - -hg archive -r V$1 ~/tmp/platform_V$1 - -#text2unix ~/tmp/platform_V$1 - -if [ -d ~/tmp/platform_V$1 ]; then - cat <'); } _this.$.find(".Ldt-Annotation-Title").html(title || "(" + _this.l10n.untitled + ")"); if (description) { @@ -100,6 +100,7 @@ _text = _this.l10n.watching + _annotation.title + (_this.site_name ? _this.l10n.on_site + _this.site_name : ''), _tags = _annotation.getTags(), _tagblock = _this.$.find(".Ldt-Annotation-Tags"); + _tagblock.empty(); if (_tags.length) { _this.$.find(".Ldt-Annotation-Tags-Block").removeClass("Ldt-Annotation-EmptyBlock"); _tags.forEach(function(_tag) { diff -r 94f9d36371f6 -r 563d51c73231 src/ldt/ldt/static/ldt/metadataplayer/KnowledgeConcierge.js --- a/src/ldt/ldt/static/ldt/metadataplayer/KnowledgeConcierge.js Wed Nov 28 12:27:08 2012 +0100 +++ b/src/ldt/ldt/static/ldt/metadataplayer/KnowledgeConcierge.js Wed Nov 28 12:31:27 2012 +0100 @@ -60,8 +60,8 @@ currentNodesList = "", relatedCache = {}, relatedRequests = {}, - relatedTemplate = '