From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 21 Dec 2017 19:01:54 +0000 (+0100)
Subject: Fix empty cache, disable TS server for 1.7
X-Git-Tag: 1.7.0~2^2~4^2~27
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=da8ee4868055a4fda307c6b17364d0724f83e99a;p=telemeta.git

Fix empty cache, disable TS server for 1.7
---

diff --git a/app/scripts/app.sh b/app/scripts/app.sh
index 06fbf590..887bb88f 100755
--- a/app/scripts/app.sh
+++ b/app/scripts/app.sh
@@ -18,10 +18,10 @@ uid='www-data'
 gid='www-data'
 
 # stating apps
-pip install -U django==1.8.18 django-registration-redux
 pip uninstall -y south
-pip install -e git+https://github.com/Parisson/django-jqchat.git@dj1.8#egg=django-jqchat
+pip install -U django==1.8.18 django-registration-redux djangorestframework==3.6.4
 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
 
 # waiting for other network services
diff --git a/app/scripts/worker.sh b/app/scripts/worker.sh
index e052b98c..1dd4ecc9 100755
--- a/app/scripts/worker.sh
+++ b/app/scripts/worker.sh
@@ -6,11 +6,10 @@ manage=$app'/manage.py'
 wsgi=$app'/wsgi.py'
 
 # stating apps
-pip install -U django==1.8.18
 pip uninstall -y south
-# pip install django-environ redis
-pip install -e git+https://github.com/Parisson/django-jqchat.git@dj1.8#egg=django-jqchat
+pip install -U django==1.8.18 django-registration-redux djangorestframework==3.6.4
 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
 
 
diff --git a/app/settings.py b/app/settings.py
index 9eb3af71..1c474d9e 100644
--- a/app/settings.py
+++ b/app/settings.py
@@ -166,7 +166,7 @@ INSTALLED_APPS = (
     'django_extensions',
     'telemeta',
     'timeside.player',
-    #'timeside.server',
+    # 'timeside.server',
     'jsonrpc',
     'sorl.thumbnail',
     'timezones',
diff --git a/lib/TimeSide b/lib/TimeSide
index 3dc154a0..7ddf05de 160000
--- a/lib/TimeSide
+++ b/lib/TimeSide
@@ -1 +1 @@
-Subproject commit 3dc154a0e6ebf7e5892bf15a7d5364a06d5b47fb
+Subproject commit 7ddf05deaa3f913c5e591d6875919bde985a1778
diff --git a/telemeta/cache.py b/telemeta/cache.py
index f26fa5d4..fe0618ed 100644
--- a/telemeta/cache.py
+++ b/telemeta/cache.py
@@ -55,8 +55,9 @@ class TelemetaCache(object):
     def delete_item_data(self, public_id):
         # public_id is the public_id of an item
         for file in self.files:
-            if public_id in file:
-                os.remove(self.dir + os.sep + file)
+            path = self.dir + os.sep + file
+            if public_id in file and os.path.exists(path):
+                os.remove(path)
 
     def write_bin(self, data, file):
         path = self.dir + os.sep + file
diff --git a/telemeta/urls.py b/telemeta/urls.py
index 48d85ac4..9f142758 100644
--- a/telemeta/urls.py
+++ b/telemeta/urls.py
@@ -272,7 +272,7 @@ urlpatterns = [
     url(r'^', include('jqchat.urls')),
 
     # Timeside
-    url(r'^timeside/', include('timeside.server.urls')),
+    # url(r'^timeside/', include('timeside.server.urls')),
 
 
 ]