From 7303efe85185dc5ed45ae5e6feaf609eeb3e553c Mon Sep 17 00:00:00 2001 From: Thomas Fillon Date: Wed, 19 Apr 2017 00:07:42 +0200 Subject: [PATCH] Temporarily remove timeside.server app --- app/scripts/app.sh | 2 +- app/settings.py | 2 +- .../commands/telemeta-create-boilerplate.py | 59 ++++++++++--------- telemeta/urls.py | 3 +- 4 files changed, 35 insertions(+), 31 deletions(-) diff --git a/app/scripts/app.sh b/app/scripts/app.sh index cce12fa7..d1eb18ab 100644 --- a/app/scripts/app.sh +++ b/app/scripts/app.sh @@ -19,7 +19,7 @@ gid='www-data' # stating apps #pip install -U django==1.9.12 -pip install -U django==1.8.17 +pip install -U django==1.8.18 pip uninstall -y south pip install -e git+https://github.com/Parisson/django-jqchat.git@dj1.8#egg=django-jqchat pip install django-debug-toolbar==1.6 diff --git a/app/settings.py b/app/settings.py index 38acea07..4d0c5c31 100644 --- a/app/settings.py +++ b/app/settings.py @@ -165,7 +165,7 @@ INSTALLED_APPS = ( 'django_extensions', 'telemeta', 'timeside.player', - 'timeside.server', + #'timeside.server', 'jsonrpc', 'sorl.thumbnail', 'timezones', diff --git a/telemeta/management/commands/telemeta-create-boilerplate.py b/telemeta/management/commands/telemeta-create-boilerplate.py index 4a9a07c9..00dd2eb1 100644 --- 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 759eebb0..b1cbb78b 100644 --- a/telemeta/urls.py +++ b/telemeta/urls.py @@ -236,7 +236,8 @@ urlpatterns = [ url(r'^', include('jqchat.urls')), - url(r'^timeside/', include('timeside.server.urls')), + # Timeside + #url(r'^timeside/', include('timeside.server.urls')), ] -- 2.39.5