Temporarily remove timeside.server app

Conflicts:
	app/scripts/app.sh

diff --git a/app/settings.py b/app/settings.py
index bffc96e2847708464f33dbe1827286cadd60ed48..d7f3035566ed8102bd711fd871f406f2a8a0b57d 100644 (file)
--- a/app/settings.py
+++ b/app/settings.py
@@ -154,7 +154,7 @@ INSTALLED_APPS = (
     'django_extensions',
     'telemeta',
     'timeside.player',
-    'timeside.server',
+    #'timeside.server',
     'jsonrpc',
     'south',
     'sorl.thumbnail',

diff --git a/telemeta/management/commands/telemeta-create-boilerplate.py b/telemeta/management/commands/telemeta-create-boilerplate.py
index 4a9a07c9e41d77986a7166a6508dea81cd5f4c57..00dd2eb14ff24ac543d9fe6d34d847fdcc841515 100644 (file)
--- a/telemeta/management/commands/telemeta-create-boilerplate.py
+++ b/telemeta/management/commands/telemeta-create-boilerplate.py
@@ -28,25 +28,28 @@ class Command(BaseCommand):
         collections = MediaCollection.objects.filter(code=self.code)
         if collections:
             collection = collections[0]
+            created = False
         else:
             collection = MediaCollection(title=self.code, code=self.code, public_access='full')
+            created = True
             collection.save()
 
-        selection, c = Selection.objects.get_or_create(title='Tests')
+        #TS# selection, created = Selection.objects.get_or_create(title='Tests')
+        
 
-        if c:
-            presets = []
-            blacklist =['decoder', 'live', 'gain', 'vamp']
-            processors = timeside.core.processor.processors(timeside.core.api.IProcessor)
-            for proc in processors:
-                trig = True
-                for black in blacklist:
-                    if black in proc.id():
-                        trig = False
-                if trig:
-                    processor, c = Processor.objects.get_or_create(pid=proc.id())
-                    preset, c = Preset.objects.get_or_create(processor=processor, parameters='{}')
-                    presets.append(preset)
+        if created:
+            #TS#presets = []
+            #TS#blacklist =['decoder', 'live', 'gain', 'vamp']
+            #TS#processors = timeside.core.processor.processors(timeside.core.api.IProcessor)
+            #TS#for proc in processors:
+            #TS#    trig = True
+            #TS#    for black in blacklist:
+            #TS#        if black in proc.id():
+            #TS#            trig = False
+            #TS#    if trig:
+            #TS#        processor, c = Processor.objects.get_or_create(pid=proc.id())
+            #TS#        preset, c = Preset.objects.get_or_create(processor=processor, parameters='{}')
+            #TS#        presets.append(preset)
 
             media_dir = 'items' + os.sep + 'tests'
             samples_dir = settings.MEDIA_ROOT + media_dir
@@ -56,20 +59,20 @@ class Command(BaseCommand):
                 filename, path = sample
                 title = os.path.splitext(filename)[0]
                 path = media_dir + os.sep + filename
-                item, c = Item.objects.get_or_create(title=title, file=path)
-                if not item in selection.items.all():
-                    selection.items.add(item)
-                if self.cleanup:
-                    for result in item.results.all():
-                        result.delete()
+                #TS#item, c = Item.objects.get_or_create(title=title, file=path)
+                #TS#if not item in selection.items.all():
+                #TS#    selection.items.add(item)
+                #TS#if self.cleanup:
+                #TS#    for result in item.results.all():
+                #TS#        result.delete()
                 mediaitem, c = MediaItem.objects.get_or_create(title=title,
                                     code=self.code + '-' + slugify(filename),
                                     file=path, collection=collection, public_access = 'full')
-
-            experience, c = Experience.objects.get_or_create(title='All')
-            for preset in presets:
-                if not preset in experience.presets.all():
-                    experience.presets.add(preset)
-
-            task = Task(experience=experience, selection=selection)
-            task.save()
+            #TS# 
+            #TS# experience, c = Experience.objects.get_or_create(title='All')
+            #TS# for preset in presets:
+            #TS#     if not preset in experience.presets.all():
+            #TS#         experience.presets.add(preset)
+            #TS# 
+            #TS# task = Task(experience=experience, selection=selection)
+            #TS#  task.save()

diff --git a/telemeta/urls.py b/telemeta/urls.py
index 3e5bfa4da345225962b2ab95ab19085dc422cc00..39c9405488ecd23379d6a89f9659894f4f85cf3d 100644 (file)
--- a/telemeta/urls.py
+++ b/telemeta/urls.py
@@ -236,7 +236,8 @@ urlpatterns = patterns('',
 
     url(r'^', include('jqchat.urls')),
 
-    url(r'^timeside/', include('timeside.server.urls')),
+    # Timeside
+    #url(r'^timeside/', include('timeside.server.urls')),
 
 )