From 619baa44c1b7c12dc3bf31427667cb39dc992697 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Tue, 29 Apr 2014 01:00:30 +0200 Subject: [PATCH] - server: components moved to server/ - server: sandbox moved to server/sandbox/ - player: static files moved to player/static/timeside/ - bugfixes, cleanup --- tests/sandbox/test_limsi_sad.py | 8 ++++++++ timeside/__init__.py | 1 + timeside/{ => encoder}/metadata.py | 0 {tests/server => timeside/player}/__init__.py | 0 timeside/{ => player}/static/timeside/README.rst | 0 .../static/timeside/js/libs/jquery-1.6.min.js | 0 .../static/timeside/js/libs/raphael-min.js | 0 .../static/timeside/js/libs/soundmanager2-jsmin.js | 0 .../timeside/js/libs/soundmanager2-nodebug-jsmin.js | 0 .../timeside/js/libs/soundmanager2-nodebug.js | 0 .../static/timeside/js/libs/soundmanager2.js | 0 .../{ => player}/static/timeside/js/markermap.js | 0 timeside/{ => player}/static/timeside/js/player.js | 0 timeside/{ => player}/static/timeside/js/ruler.js | 0 .../{ => player}/static/timeside/js/rulermarker.js | 0 .../{ => player}/static/timeside/js/timeside.js | 0 .../static/timeside/skins/classic/img/forward.png | Bin .../static/timeside/skins/classic/img/pause.png | Bin .../static/timeside/skins/classic/img/play.png | Bin .../timeside/skins/classic/img/player_controlbg.png | Bin .../static/timeside/skins/classic/img/rewind.png | Bin .../static/timeside/skins/classic/img/setmarker.png | Bin .../static/timeside/skins/classic/img/volumeoff.png | Bin .../static/timeside/skins/classic/img/volumeon.png | Bin .../static/timeside/skins/classic/img/wait.gif | Bin .../static/timeside/skins/classic/style.css | 0 .../timeside/skins/lab/img/controlbg-inverted.png | Bin .../static/timeside/skins/lab/img/controlbg.png | Bin .../static/timeside/skins/lab/img/empty.png | Bin .../static/timeside/skins/lab/img/forward.png | Bin .../static/timeside/skins/lab/img/pause.png | Bin .../static/timeside/skins/lab/img/play.png | Bin .../static/timeside/skins/lab/img/rewind.png | Bin .../static/timeside/skins/lab/img/setmarker.png | Bin .../static/timeside/skins/lab/img/volume.png | Bin .../static/timeside/skins/lab/img/volumeoff.png | Bin .../static/timeside/skins/lab/img/volumeon.png | Bin .../static/timeside/skins/lab/img/wait.gif | Bin .../static/timeside/skins/lab/img/wait2.gif | Bin .../static/timeside/skins/lab/img/wait3.gif | Bin .../static/timeside/skins/lab/style.css | 0 .../static/timeside/swf/soundmanager2.swf | Bin .../static/timeside/swf/soundmanager2_debug.swf | Bin .../static/timeside/swf/soundmanager2_flash9.swf | Bin .../timeside/swf/soundmanager2_flash9_debug.swf | Bin .../timeside/swf/soundmanager2_flash_xdomain.zip | Bin timeside/{migrations => server}/__init__.py | 0 timeside/{ => server}/admin.py | 2 +- timeside/{ => server}/migrations/0001_initial.py | 0 .../0002_auto__chg_field_parameters_processor.py | 0 .../0003_auto__del_field_processor_type.py | 0 ...result_processor__add_field_result_parameters.py | 0 ...tput_mime_type__del_field_result_output__add_.py | 0 ..._preset__del_field_result_parameters__add_fie.py | 0 timeside/server/migrations/__init__.py | 0 timeside/{ => server}/models.py | 5 ++--- timeside/server/sandbox/__init__.py | 0 {tests/server => timeside/server/sandbox}/diag.sh | 0 .../server/sandbox}/diagram/timeside.dot | 0 .../server/sandbox}/diagram/timeside.pdf | Bin {tests/server => timeside/server/sandbox}/manage.py | 0 .../server => timeside/server/sandbox}/settings.py | 4 +++- .../server/sandbox}/update_schema.sh | 0 {tests/server => timeside/server/sandbox}/urls.py | 2 +- {tests/server => timeside/server/sandbox}/wsgi.py | 2 +- timeside/{ => server}/serializers.py | 2 +- timeside/{ => server}/templates/timeside/base.html | 0 timeside/{ => server}/templates/timeside/index.html | 0 timeside/{ => server}/urls.py | 2 +- timeside/{ => server}/views.py | 4 ++-- 70 files changed, 21 insertions(+), 11 deletions(-) create mode 100644 tests/sandbox/test_limsi_sad.py rename timeside/{ => encoder}/metadata.py (100%) rename {tests/server => timeside/player}/__init__.py (100%) rename timeside/{ => player}/static/timeside/README.rst (100%) rename timeside/{ => player}/static/timeside/js/libs/jquery-1.6.min.js (100%) rename timeside/{ => player}/static/timeside/js/libs/raphael-min.js (100%) rename timeside/{ => player}/static/timeside/js/libs/soundmanager2-jsmin.js (100%) rename timeside/{ => player}/static/timeside/js/libs/soundmanager2-nodebug-jsmin.js (100%) rename timeside/{ => player}/static/timeside/js/libs/soundmanager2-nodebug.js (100%) rename timeside/{ => player}/static/timeside/js/libs/soundmanager2.js (100%) rename timeside/{ => player}/static/timeside/js/markermap.js (100%) rename timeside/{ => player}/static/timeside/js/player.js (100%) rename timeside/{ => player}/static/timeside/js/ruler.js (100%) rename timeside/{ => player}/static/timeside/js/rulermarker.js (100%) rename timeside/{ => player}/static/timeside/js/timeside.js (100%) rename timeside/{ => player}/static/timeside/skins/classic/img/forward.png (100%) rename timeside/{ => player}/static/timeside/skins/classic/img/pause.png (100%) rename timeside/{ => player}/static/timeside/skins/classic/img/play.png (100%) rename timeside/{ => player}/static/timeside/skins/classic/img/player_controlbg.png (100%) rename timeside/{ => player}/static/timeside/skins/classic/img/rewind.png (100%) rename timeside/{ => player}/static/timeside/skins/classic/img/setmarker.png (100%) rename timeside/{ => player}/static/timeside/skins/classic/img/volumeoff.png (100%) rename timeside/{ => player}/static/timeside/skins/classic/img/volumeon.png (100%) rename timeside/{ => player}/static/timeside/skins/classic/img/wait.gif (100%) rename timeside/{ => player}/static/timeside/skins/classic/style.css (100%) rename timeside/{ => player}/static/timeside/skins/lab/img/controlbg-inverted.png (100%) rename timeside/{ => player}/static/timeside/skins/lab/img/controlbg.png (100%) rename timeside/{ => player}/static/timeside/skins/lab/img/empty.png (100%) rename timeside/{ => player}/static/timeside/skins/lab/img/forward.png (100%) rename timeside/{ => player}/static/timeside/skins/lab/img/pause.png (100%) rename timeside/{ => player}/static/timeside/skins/lab/img/play.png (100%) rename timeside/{ => player}/static/timeside/skins/lab/img/rewind.png (100%) rename timeside/{ => player}/static/timeside/skins/lab/img/setmarker.png (100%) rename timeside/{ => player}/static/timeside/skins/lab/img/volume.png (100%) rename timeside/{ => player}/static/timeside/skins/lab/img/volumeoff.png (100%) rename timeside/{ => player}/static/timeside/skins/lab/img/volumeon.png (100%) rename timeside/{ => player}/static/timeside/skins/lab/img/wait.gif (100%) rename timeside/{ => player}/static/timeside/skins/lab/img/wait2.gif (100%) rename timeside/{ => player}/static/timeside/skins/lab/img/wait3.gif (100%) rename timeside/{ => player}/static/timeside/skins/lab/style.css (100%) rename timeside/{ => player}/static/timeside/swf/soundmanager2.swf (100%) rename timeside/{ => player}/static/timeside/swf/soundmanager2_debug.swf (100%) rename timeside/{ => player}/static/timeside/swf/soundmanager2_flash9.swf (100%) rename timeside/{ => player}/static/timeside/swf/soundmanager2_flash9_debug.swf (100%) rename timeside/{ => player}/static/timeside/swf/soundmanager2_flash_xdomain.zip (100%) rename timeside/{migrations => server}/__init__.py (100%) rename timeside/{ => server}/admin.py (86%) rename timeside/{ => server}/migrations/0001_initial.py (100%) rename timeside/{ => server}/migrations/0002_auto__chg_field_parameters_processor.py (100%) rename timeside/{ => server}/migrations/0003_auto__del_field_processor_type.py (100%) rename timeside/{ => server}/migrations/0004_auto__del_field_result_processor__add_field_result_parameters.py (100%) rename timeside/{ => server}/migrations/0005_auto__del_field_result_output_mime_type__del_field_result_output__add_.py (100%) rename timeside/{ => server}/migrations/0006_auto__del_parameters__add_preset__del_field_result_parameters__add_fie.py (100%) create mode 100644 timeside/server/migrations/__init__.py rename timeside/{ => server}/models.py (99%) create mode 100644 timeside/server/sandbox/__init__.py rename {tests/server => timeside/server/sandbox}/diag.sh (100%) rename {tests/server => timeside/server/sandbox}/diagram/timeside.dot (100%) rename {tests/server => timeside/server/sandbox}/diagram/timeside.pdf (100%) rename {tests/server => timeside/server/sandbox}/manage.py (100%) rename {tests/server => timeside/server/sandbox}/settings.py (98%) rename {tests/server => timeside/server/sandbox}/update_schema.sh (100%) rename {tests/server => timeside/server/sandbox}/urls.py (92%) rename {tests/server => timeside/server/sandbox}/wsgi.py (94%) rename timeside/{ => server}/serializers.py (97%) rename timeside/{ => server}/templates/timeside/base.html (100%) rename timeside/{ => server}/templates/timeside/index.html (100%) rename timeside/{ => server}/urls.py (96%) rename timeside/{ => server}/views.py (95%) diff --git a/tests/sandbox/test_limsi_sad.py b/tests/sandbox/test_limsi_sad.py new file mode 100644 index 0000000..2c54070 --- /dev/null +++ b/tests/sandbox/test_limsi_sad.py @@ -0,0 +1,8 @@ +# -*- coding: utf-8 -*- + +import timeside + +decoder = timeside.decoder.FileDecoder('/home/momo/music_local/test/sweep.wav') +analyzer = timeside.analyzer.LimsiSad('etape') +(decoder | analyzer).run() +print analyzer.results() diff --git a/timeside/__init__.py b/timeside/__init__.py index 333a661..2bbc454 100644 --- a/timeside/__init__.py +++ b/timeside/__init__.py @@ -7,4 +7,5 @@ from . import analyzer from . import grapher from . import encoder + __version__ = '0.5.5' diff --git a/timeside/metadata.py b/timeside/encoder/metadata.py similarity index 100% rename from timeside/metadata.py rename to timeside/encoder/metadata.py diff --git a/tests/server/__init__.py b/timeside/player/__init__.py similarity index 100% rename from tests/server/__init__.py rename to timeside/player/__init__.py diff --git a/timeside/static/timeside/README.rst b/timeside/player/static/timeside/README.rst similarity index 100% rename from timeside/static/timeside/README.rst rename to timeside/player/static/timeside/README.rst diff --git a/timeside/static/timeside/js/libs/jquery-1.6.min.js b/timeside/player/static/timeside/js/libs/jquery-1.6.min.js similarity index 100% rename from timeside/static/timeside/js/libs/jquery-1.6.min.js rename to timeside/player/static/timeside/js/libs/jquery-1.6.min.js diff --git a/timeside/static/timeside/js/libs/raphael-min.js b/timeside/player/static/timeside/js/libs/raphael-min.js similarity index 100% rename from timeside/static/timeside/js/libs/raphael-min.js rename to timeside/player/static/timeside/js/libs/raphael-min.js diff --git a/timeside/static/timeside/js/libs/soundmanager2-jsmin.js b/timeside/player/static/timeside/js/libs/soundmanager2-jsmin.js similarity index 100% rename from timeside/static/timeside/js/libs/soundmanager2-jsmin.js rename to timeside/player/static/timeside/js/libs/soundmanager2-jsmin.js diff --git a/timeside/static/timeside/js/libs/soundmanager2-nodebug-jsmin.js b/timeside/player/static/timeside/js/libs/soundmanager2-nodebug-jsmin.js similarity index 100% rename from timeside/static/timeside/js/libs/soundmanager2-nodebug-jsmin.js rename to timeside/player/static/timeside/js/libs/soundmanager2-nodebug-jsmin.js diff --git a/timeside/static/timeside/js/libs/soundmanager2-nodebug.js b/timeside/player/static/timeside/js/libs/soundmanager2-nodebug.js similarity index 100% rename from timeside/static/timeside/js/libs/soundmanager2-nodebug.js rename to timeside/player/static/timeside/js/libs/soundmanager2-nodebug.js diff --git a/timeside/static/timeside/js/libs/soundmanager2.js b/timeside/player/static/timeside/js/libs/soundmanager2.js similarity index 100% rename from timeside/static/timeside/js/libs/soundmanager2.js rename to timeside/player/static/timeside/js/libs/soundmanager2.js diff --git a/timeside/static/timeside/js/markermap.js b/timeside/player/static/timeside/js/markermap.js similarity index 100% rename from timeside/static/timeside/js/markermap.js rename to timeside/player/static/timeside/js/markermap.js diff --git a/timeside/static/timeside/js/player.js b/timeside/player/static/timeside/js/player.js similarity index 100% rename from timeside/static/timeside/js/player.js rename to timeside/player/static/timeside/js/player.js diff --git a/timeside/static/timeside/js/ruler.js b/timeside/player/static/timeside/js/ruler.js similarity index 100% rename from timeside/static/timeside/js/ruler.js rename to timeside/player/static/timeside/js/ruler.js diff --git a/timeside/static/timeside/js/rulermarker.js b/timeside/player/static/timeside/js/rulermarker.js similarity index 100% rename from timeside/static/timeside/js/rulermarker.js rename to timeside/player/static/timeside/js/rulermarker.js diff --git a/timeside/static/timeside/js/timeside.js b/timeside/player/static/timeside/js/timeside.js similarity index 100% rename from timeside/static/timeside/js/timeside.js rename to timeside/player/static/timeside/js/timeside.js diff --git a/timeside/static/timeside/skins/classic/img/forward.png b/timeside/player/static/timeside/skins/classic/img/forward.png similarity index 100% rename from timeside/static/timeside/skins/classic/img/forward.png rename to timeside/player/static/timeside/skins/classic/img/forward.png diff --git a/timeside/static/timeside/skins/classic/img/pause.png b/timeside/player/static/timeside/skins/classic/img/pause.png similarity index 100% rename from timeside/static/timeside/skins/classic/img/pause.png rename to timeside/player/static/timeside/skins/classic/img/pause.png diff --git a/timeside/static/timeside/skins/classic/img/play.png b/timeside/player/static/timeside/skins/classic/img/play.png similarity index 100% rename from timeside/static/timeside/skins/classic/img/play.png rename to timeside/player/static/timeside/skins/classic/img/play.png diff --git a/timeside/static/timeside/skins/classic/img/player_controlbg.png b/timeside/player/static/timeside/skins/classic/img/player_controlbg.png similarity index 100% rename from timeside/static/timeside/skins/classic/img/player_controlbg.png rename to timeside/player/static/timeside/skins/classic/img/player_controlbg.png diff --git a/timeside/static/timeside/skins/classic/img/rewind.png b/timeside/player/static/timeside/skins/classic/img/rewind.png similarity index 100% rename from timeside/static/timeside/skins/classic/img/rewind.png rename to timeside/player/static/timeside/skins/classic/img/rewind.png diff --git a/timeside/static/timeside/skins/classic/img/setmarker.png b/timeside/player/static/timeside/skins/classic/img/setmarker.png similarity index 100% rename from timeside/static/timeside/skins/classic/img/setmarker.png rename to timeside/player/static/timeside/skins/classic/img/setmarker.png diff --git a/timeside/static/timeside/skins/classic/img/volumeoff.png b/timeside/player/static/timeside/skins/classic/img/volumeoff.png similarity index 100% rename from timeside/static/timeside/skins/classic/img/volumeoff.png rename to timeside/player/static/timeside/skins/classic/img/volumeoff.png diff --git a/timeside/static/timeside/skins/classic/img/volumeon.png b/timeside/player/static/timeside/skins/classic/img/volumeon.png similarity index 100% rename from timeside/static/timeside/skins/classic/img/volumeon.png rename to timeside/player/static/timeside/skins/classic/img/volumeon.png diff --git a/timeside/static/timeside/skins/classic/img/wait.gif b/timeside/player/static/timeside/skins/classic/img/wait.gif similarity index 100% rename from timeside/static/timeside/skins/classic/img/wait.gif rename to timeside/player/static/timeside/skins/classic/img/wait.gif diff --git a/timeside/static/timeside/skins/classic/style.css b/timeside/player/static/timeside/skins/classic/style.css similarity index 100% rename from timeside/static/timeside/skins/classic/style.css rename to timeside/player/static/timeside/skins/classic/style.css diff --git a/timeside/static/timeside/skins/lab/img/controlbg-inverted.png b/timeside/player/static/timeside/skins/lab/img/controlbg-inverted.png similarity index 100% rename from timeside/static/timeside/skins/lab/img/controlbg-inverted.png rename to timeside/player/static/timeside/skins/lab/img/controlbg-inverted.png diff --git a/timeside/static/timeside/skins/lab/img/controlbg.png b/timeside/player/static/timeside/skins/lab/img/controlbg.png similarity index 100% rename from timeside/static/timeside/skins/lab/img/controlbg.png rename to timeside/player/static/timeside/skins/lab/img/controlbg.png diff --git a/timeside/static/timeside/skins/lab/img/empty.png b/timeside/player/static/timeside/skins/lab/img/empty.png similarity index 100% rename from timeside/static/timeside/skins/lab/img/empty.png rename to timeside/player/static/timeside/skins/lab/img/empty.png diff --git a/timeside/static/timeside/skins/lab/img/forward.png b/timeside/player/static/timeside/skins/lab/img/forward.png similarity index 100% rename from timeside/static/timeside/skins/lab/img/forward.png rename to timeside/player/static/timeside/skins/lab/img/forward.png diff --git a/timeside/static/timeside/skins/lab/img/pause.png b/timeside/player/static/timeside/skins/lab/img/pause.png similarity index 100% rename from timeside/static/timeside/skins/lab/img/pause.png rename to timeside/player/static/timeside/skins/lab/img/pause.png diff --git a/timeside/static/timeside/skins/lab/img/play.png b/timeside/player/static/timeside/skins/lab/img/play.png similarity index 100% rename from timeside/static/timeside/skins/lab/img/play.png rename to timeside/player/static/timeside/skins/lab/img/play.png diff --git a/timeside/static/timeside/skins/lab/img/rewind.png b/timeside/player/static/timeside/skins/lab/img/rewind.png similarity index 100% rename from timeside/static/timeside/skins/lab/img/rewind.png rename to timeside/player/static/timeside/skins/lab/img/rewind.png diff --git a/timeside/static/timeside/skins/lab/img/setmarker.png b/timeside/player/static/timeside/skins/lab/img/setmarker.png similarity index 100% rename from timeside/static/timeside/skins/lab/img/setmarker.png rename to timeside/player/static/timeside/skins/lab/img/setmarker.png diff --git a/timeside/static/timeside/skins/lab/img/volume.png b/timeside/player/static/timeside/skins/lab/img/volume.png similarity index 100% rename from timeside/static/timeside/skins/lab/img/volume.png rename to timeside/player/static/timeside/skins/lab/img/volume.png diff --git a/timeside/static/timeside/skins/lab/img/volumeoff.png b/timeside/player/static/timeside/skins/lab/img/volumeoff.png similarity index 100% rename from timeside/static/timeside/skins/lab/img/volumeoff.png rename to timeside/player/static/timeside/skins/lab/img/volumeoff.png diff --git a/timeside/static/timeside/skins/lab/img/volumeon.png b/timeside/player/static/timeside/skins/lab/img/volumeon.png similarity index 100% rename from timeside/static/timeside/skins/lab/img/volumeon.png rename to timeside/player/static/timeside/skins/lab/img/volumeon.png diff --git a/timeside/static/timeside/skins/lab/img/wait.gif b/timeside/player/static/timeside/skins/lab/img/wait.gif similarity index 100% rename from timeside/static/timeside/skins/lab/img/wait.gif rename to timeside/player/static/timeside/skins/lab/img/wait.gif diff --git a/timeside/static/timeside/skins/lab/img/wait2.gif b/timeside/player/static/timeside/skins/lab/img/wait2.gif similarity index 100% rename from timeside/static/timeside/skins/lab/img/wait2.gif rename to timeside/player/static/timeside/skins/lab/img/wait2.gif diff --git a/timeside/static/timeside/skins/lab/img/wait3.gif b/timeside/player/static/timeside/skins/lab/img/wait3.gif similarity index 100% rename from timeside/static/timeside/skins/lab/img/wait3.gif rename to timeside/player/static/timeside/skins/lab/img/wait3.gif diff --git a/timeside/static/timeside/skins/lab/style.css b/timeside/player/static/timeside/skins/lab/style.css similarity index 100% rename from timeside/static/timeside/skins/lab/style.css rename to timeside/player/static/timeside/skins/lab/style.css diff --git a/timeside/static/timeside/swf/soundmanager2.swf b/timeside/player/static/timeside/swf/soundmanager2.swf similarity index 100% rename from timeside/static/timeside/swf/soundmanager2.swf rename to timeside/player/static/timeside/swf/soundmanager2.swf diff --git a/timeside/static/timeside/swf/soundmanager2_debug.swf b/timeside/player/static/timeside/swf/soundmanager2_debug.swf similarity index 100% rename from timeside/static/timeside/swf/soundmanager2_debug.swf rename to timeside/player/static/timeside/swf/soundmanager2_debug.swf diff --git a/timeside/static/timeside/swf/soundmanager2_flash9.swf b/timeside/player/static/timeside/swf/soundmanager2_flash9.swf similarity index 100% rename from timeside/static/timeside/swf/soundmanager2_flash9.swf rename to timeside/player/static/timeside/swf/soundmanager2_flash9.swf diff --git a/timeside/static/timeside/swf/soundmanager2_flash9_debug.swf b/timeside/player/static/timeside/swf/soundmanager2_flash9_debug.swf similarity index 100% rename from timeside/static/timeside/swf/soundmanager2_flash9_debug.swf rename to timeside/player/static/timeside/swf/soundmanager2_flash9_debug.swf diff --git a/timeside/static/timeside/swf/soundmanager2_flash_xdomain.zip b/timeside/player/static/timeside/swf/soundmanager2_flash_xdomain.zip similarity index 100% rename from timeside/static/timeside/swf/soundmanager2_flash_xdomain.zip rename to timeside/player/static/timeside/swf/soundmanager2_flash_xdomain.zip diff --git a/timeside/migrations/__init__.py b/timeside/server/__init__.py similarity index 100% rename from timeside/migrations/__init__.py rename to timeside/server/__init__.py diff --git a/timeside/admin.py b/timeside/server/admin.py similarity index 86% rename from timeside/admin.py rename to timeside/server/admin.py index 9ad18c1..2112f64 100644 --- a/timeside/admin.py +++ b/timeside/server/admin.py @@ -1,6 +1,6 @@ from django.contrib import admin -from timeside.models import * +from timeside.server.models import * admin.site.register(Selection) admin.site.register(Item) diff --git a/timeside/migrations/0001_initial.py b/timeside/server/migrations/0001_initial.py similarity index 100% rename from timeside/migrations/0001_initial.py rename to timeside/server/migrations/0001_initial.py diff --git a/timeside/migrations/0002_auto__chg_field_parameters_processor.py b/timeside/server/migrations/0002_auto__chg_field_parameters_processor.py similarity index 100% rename from timeside/migrations/0002_auto__chg_field_parameters_processor.py rename to timeside/server/migrations/0002_auto__chg_field_parameters_processor.py diff --git a/timeside/migrations/0003_auto__del_field_processor_type.py b/timeside/server/migrations/0003_auto__del_field_processor_type.py similarity index 100% rename from timeside/migrations/0003_auto__del_field_processor_type.py rename to timeside/server/migrations/0003_auto__del_field_processor_type.py diff --git a/timeside/migrations/0004_auto__del_field_result_processor__add_field_result_parameters.py b/timeside/server/migrations/0004_auto__del_field_result_processor__add_field_result_parameters.py similarity index 100% rename from timeside/migrations/0004_auto__del_field_result_processor__add_field_result_parameters.py rename to timeside/server/migrations/0004_auto__del_field_result_processor__add_field_result_parameters.py diff --git a/timeside/migrations/0005_auto__del_field_result_output_mime_type__del_field_result_output__add_.py b/timeside/server/migrations/0005_auto__del_field_result_output_mime_type__del_field_result_output__add_.py similarity index 100% rename from timeside/migrations/0005_auto__del_field_result_output_mime_type__del_field_result_output__add_.py rename to timeside/server/migrations/0005_auto__del_field_result_output_mime_type__del_field_result_output__add_.py diff --git a/timeside/migrations/0006_auto__del_parameters__add_preset__del_field_result_parameters__add_fie.py b/timeside/server/migrations/0006_auto__del_parameters__add_preset__del_field_result_parameters__add_fie.py similarity index 100% rename from timeside/migrations/0006_auto__del_parameters__add_preset__del_field_result_parameters__add_fie.py rename to timeside/server/migrations/0006_auto__del_parameters__add_preset__del_field_result_parameters__add_fie.py diff --git a/timeside/server/migrations/__init__.py b/timeside/server/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/timeside/models.py b/timeside/server/models.py similarity index 99% rename from timeside/models.py rename to timeside/server/models.py index 67052b4..65ae129 100644 --- a/timeside/models.py +++ b/timeside/server/models.py @@ -118,7 +118,6 @@ class Experience(DocBaseResource): db_table = app + '_experiences' verbose_name = _('Experience') - class Processor(models.Model): @@ -140,11 +139,11 @@ class Processor(models.Model): class Preset(models.Model): - processor = models.ForeignKey('Processor', related_name="preset", verbose_name=_('processor'), blank=True, null=True) + processor = models.ForeignKey('Processor', related_name="presets", verbose_name=_('processor'), blank=True, null=True) parameters = models.TextField(_('Parameters'), blank=True) is_public = models.BooleanField(default=False) - class Meta: + class Meta(MetaCore): db_table = app + '_presets' verbose_name = _('Preset') verbose_name_plural = _('Presets') diff --git a/timeside/server/sandbox/__init__.py b/timeside/server/sandbox/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/server/diag.sh b/timeside/server/sandbox/diag.sh similarity index 100% rename from tests/server/diag.sh rename to timeside/server/sandbox/diag.sh diff --git a/tests/server/diagram/timeside.dot b/timeside/server/sandbox/diagram/timeside.dot similarity index 100% rename from tests/server/diagram/timeside.dot rename to timeside/server/sandbox/diagram/timeside.dot diff --git a/tests/server/diagram/timeside.pdf b/timeside/server/sandbox/diagram/timeside.pdf similarity index 100% rename from tests/server/diagram/timeside.pdf rename to timeside/server/sandbox/diagram/timeside.pdf diff --git a/tests/server/manage.py b/timeside/server/sandbox/manage.py similarity index 100% rename from tests/server/manage.py rename to timeside/server/sandbox/manage.py diff --git a/tests/server/settings.py b/timeside/server/sandbox/settings.py similarity index 98% rename from tests/server/settings.py rename to timeside/server/sandbox/settings.py index 057b403..2318f5f 100644 --- a/tests/server/settings.py +++ b/timeside/server/sandbox/settings.py @@ -131,7 +131,9 @@ INSTALLED_APPS = ( # 'django.contrib.admindocs', 'django_extensions', 'south', - 'timeside', + # 'timeside', + 'timeside.server', + 'timeside.player', 'rest_framework', ) diff --git a/tests/server/update_schema.sh b/timeside/server/sandbox/update_schema.sh similarity index 100% rename from tests/server/update_schema.sh rename to timeside/server/sandbox/update_schema.sh diff --git a/tests/server/urls.py b/timeside/server/sandbox/urls.py similarity index 92% rename from tests/server/urls.py rename to timeside/server/sandbox/urls.py index 98374ec..2224d24 100644 --- a/tests/server/urls.py +++ b/timeside/server/sandbox/urls.py @@ -6,7 +6,7 @@ admin.autodiscover() urlpatterns = patterns('', - url(r'^', include('timeside.urls')), + url(r'^', include('timeside.server.urls')), # Examples: # url(r'^$', 'server.views.home', name='home'), diff --git a/tests/server/wsgi.py b/timeside/server/sandbox/wsgi.py similarity index 94% rename from tests/server/wsgi.py rename to timeside/server/sandbox/wsgi.py index c4ec771..c4d2c74 100644 --- a/tests/server/wsgi.py +++ b/timeside/server/sandbox/wsgi.py @@ -15,7 +15,7 @@ framework. """ import os -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "server.settings") +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "sandbox.settings") # This application object is used by any WSGI server configured to use this # file. This includes Django's development server, if the WSGI_APPLICATION diff --git a/timeside/serializers.py b/timeside/server/serializers.py similarity index 97% rename from timeside/serializers.py rename to timeside/server/serializers.py index a1447d1..5814f11 100644 --- a/timeside/serializers.py +++ b/timeside/server/serializers.py @@ -1,4 +1,4 @@ -from timeside.models import * +from timeside.server.models import * from rest_framework import serializers import django.db.models from django.contrib.auth.models import User diff --git a/timeside/templates/timeside/base.html b/timeside/server/templates/timeside/base.html similarity index 100% rename from timeside/templates/timeside/base.html rename to timeside/server/templates/timeside/base.html diff --git a/timeside/templates/timeside/index.html b/timeside/server/templates/timeside/index.html similarity index 100% rename from timeside/templates/timeside/index.html rename to timeside/server/templates/timeside/index.html diff --git a/timeside/urls.py b/timeside/server/urls.py similarity index 96% rename from timeside/urls.py rename to timeside/server/urls.py index 3f76c35..3c10efe 100644 --- a/timeside/urls.py +++ b/timeside/server/urls.py @@ -3,7 +3,7 @@ from django.conf.urls import patterns, include, url from django.contrib import admin from rest_framework import routers -from timeside import views +from timeside.server import views admin.autodiscover() diff --git a/timeside/views.py b/timeside/server/views.py similarity index 95% rename from timeside/views.py rename to timeside/server/views.py index cc4653d..d4cd7f7 100644 --- a/timeside/views.py +++ b/timeside/server/views.py @@ -6,8 +6,8 @@ from django.http import HttpResponse, HttpResponseRedirect from rest_framework import viewsets import timeside -from timeside.models import * -from timeside.serializers import * +from timeside.server.models import * +from timeside.server.serializers import * class SelectionViewSet(viewsets.ModelViewSet): -- 2.39.5