From fa2035dfdbb2e6b810c8eab321435dd8a624911d Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Sat, 18 May 2019 11:35:52 +0200 Subject: [PATCH] update and install locat timside --- app/bin/app.sh | 1 + app/bin/worker.sh | 1 + app/settings.py | 1 + docker-compose.yml | 1 + env/dev.yml | 2 +- lib/TimeSide | 2 +- .../management/commands/telemeta-run-timeside-experience.py | 4 ++-- 7 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/bin/app.sh b/app/bin/app.sh index 84e0e246..8b9bd605 100755 --- a/app/bin/app.sh +++ b/app/bin/app.sh @@ -22,6 +22,7 @@ gid='www-data' # pip install django-debug-toolbar==1.6 # pip install -e git+https://github.com/Parisson/django-jqchat.git@dj1.8#egg=django-jqchat # pip install -e git+https://github.com/Parisson/saved_searches.git@dj1.8#egg=saved_searches-2.0.0-beta +pip install youtube-dl # waiting for other network services sh $app/bin/wait.sh diff --git a/app/bin/worker.sh b/app/bin/worker.sh index 3eb7b40f..8de6e129 100755 --- a/app/bin/worker.sh +++ b/app/bin/worker.sh @@ -12,6 +12,7 @@ concurrency=12 # pip install django-debug-toolbar==1.6 # pip install -e git+https://github.com/Parisson/django-jqchat.git@dj1.8#egg=django-jqchat # pip install -e git+https://github.com/Parisson/saved_searches.git@dj1.8#egg=saved_searches-2.0.0-beta +pip install youtube-dl # waiting for other services bash $app/bin/wait.sh diff --git a/app/settings.py b/app/settings.py index ca94f0f9..5315f6b5 100644 --- a/app/settings.py +++ b/app/settings.py @@ -218,6 +218,7 @@ RESOURCE_CODE_REGEX = '[A-Za-z0-9._-]*' AUTH_PROFILE_MODULE = 'telemeta.userprofile' SESSION_EXPIRE_AT_BROWSER_CLOSE = False +AUTH_USER_MODEL = 'auth.User' LOGIN_URL = '/login/' LOGIN_REDIRECT_URL = '/desk/lists/' diff --git a/docker-compose.yml b/docker-compose.yml index dfa8ab50..2f0b8bca 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -55,6 +55,7 @@ app: volumes: - ./app:/srv/app - ./telemeta:/srv/lib/telemeta/telemeta + - ./lib/TimeSide:/srv/lib/timeside volumes_from: - data env_file: diff --git a/env/dev.yml b/env/dev.yml index c0cde07a..5b33658e 100644 --- a/env/dev.yml +++ b/env/dev.yml @@ -1,4 +1,4 @@ - # -*- coding: utf-8 -*- +# -*- coding: utf-8 -*- # # Copyright (c) 2015-2016 Parisson SARL diff --git a/lib/TimeSide b/lib/TimeSide index 0618d75c..484f6ad7 160000 --- a/lib/TimeSide +++ b/lib/TimeSide @@ -1 +1 @@ -Subproject commit 0618d75cd2f16021afcfd3d5b77f692adad76ea5 +Subproject commit 484f6ad709401ea85fba35417567caf6a912b461 diff --git a/telemeta/management/commands/telemeta-run-timeside-experience.py b/telemeta/management/commands/telemeta-run-timeside-experience.py index 2b1d084c..7b943114 100644 --- a/telemeta/management/commands/telemeta-run-timeside-experience.py +++ b/telemeta/management/commands/telemeta-run-timeside-experience.py @@ -74,10 +74,10 @@ class Command(BaseCommand): self.selection, c = Selection.objects.get_or_create(title=selection_title) items = self.selection.items.all() - + print(items) for tm_item in tm_items: if tm_item.file: - path = os.sep.join([self.media_root, tm_item.file]) + path = tm_item.file.path item, c = Item.objects.get_or_create(title=tm_item.title, source_file=path) if not item in items: -- 2.39.5