Fix empty cache, disable TS server for 1.7

diff --git a/app/scripts/app.sh b/app/scripts/app.sh
index 06fbf590d690fe8e56fca2da8d6128685dd4763e..887bb88fca04719a3b0d577b9088d00f926e5067 100755 (executable)
--- 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 e052b98c313b660742c7caf354afa8f5d7e1035b..1dd4ecc9b0c4d7bedaee325f351c089b3ffe0578 100755 (executable)
--- 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 9eb3af712a3e1a7c0099b429e1ee0322fb854bcd..1c474d9e5867d953375c1cb9a4112ecad515ddb0 100644 (file)
--- 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 3dc154a0e6ebf7e5892bf15a7d5364a06d5b47fb..7ddf05deaa3f913c5e591d6875919bde985a1778 160000 (submodule)
--- 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 f26fa5d408a0908b684ef1186616a0bed3f66579..fe0618ed92e267e22f68351ee99d7cc0d8b6cdd0 100644 (file)
--- 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 48d85ac4b88ac995bd13038a8469f0230c229b72..9f14275864a0ceebf71a39cc698733e9132c8c25 100644 (file)
--- 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')),
 
 
 ]