update and install locat timside

diff --git a/app/bin/app.sh b/app/bin/app.sh
index 84e0e2468b231ec17e76e15fce51884c96b52106..8b9bd6055b777edb223bcfe5f02f84b390ac3ccd 100755 (executable)
--- 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 3eb7b40f0013c4c3e5e942edaea855dda5410519..8de6e1295760998b601d6a206dec7e79904745db 100755 (executable)
--- 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 ca94f0f9c46ab17842405bbbb815ca8fa6ef53d3..5315f6b5b3c6975bb7d4d35ab3597f59f76066ea 100644 (file)
--- 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 dfa8ab508f636908ed0a1a0f1fbe93f4a1b6b36a..2f0b8bcaa67d0f910a3f836d51f16a7edb99c86c 100644 (file)
--- 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 c0cde07ac81329358608dff28690eeb13f1b1ecc..5b33658e6f0132c15913aadf05d28da7aa247a3c 100644 (file)
--- 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 0618d75cd2f16021afcfd3d5b77f692adad76ea5..484f6ad709401ea85fba35417567caf6a912b461 160000 (submodule)
--- 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 2b1d084c049df0e474a6ac416a824cc5cee57461..7b943114e7a2798ba303ebb03421428652062e2d 100644 (file)
--- 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: