From: Guillaume Pellerin Date: Tue, 29 Apr 2014 09:24:42 +0000 (+0200) Subject: - server: reinitialization of the model (needed for submodule renaming, sorry) X-Git-Tag: 0.5.5~1^2~36 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=66e637828d6f73ced13a124a0300af16da2d764a;p=timeside.git - server: reinitialization of the model (needed for submodule renaming, sorry) - server: add few celery tests --- diff --git a/timeside/server/celery.py b/timeside/server/celery.py new file mode 100644 index 0000000..cf5df39 --- /dev/null +++ b/timeside/server/celery.py @@ -0,0 +1,17 @@ + +from __future__ import absolute_import + +from celery import Celery + +app = Celery('timeside', + broker='amqp://', + backend='amqp://', + include=['timeside.tasks']) + +# Optional configuration, see the application user guide. +app.conf.update( + CELERY_TASK_RESULT_EXPIRES=3600, +) + +if __name__ == '__main__': + app.start() diff --git a/timeside/server/migrations/0001_initial.py b/timeside/server/migrations/0001_initial.py index bba562c..145f1bb 100644 --- a/timeside/server/migrations/0001_initial.py +++ b/timeside/server/migrations/0001_initial.py @@ -18,14 +18,14 @@ class Migration(SchemaMigration): ('description', self.gf('django.db.models.fields.TextField')(blank=True)), ('author', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='selections', null=True, on_delete=models.SET_NULL, to=orm['auth.User'])), )) - db.send_create_signal('timeside', ['Selection']) + db.send_create_signal('server', ['Selection']) # Adding M2M table for field items on 'Selection' m2m_table_name = db.shorten_name('timeside_selections_items') db.create_table(m2m_table_name, ( ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), - ('selection', models.ForeignKey(orm['timeside.selection'], null=False)), - ('item', models.ForeignKey(orm['timeside.item'], null=False)) + ('selection', models.ForeignKey(orm['server.selection'], null=False)), + ('item', models.ForeignKey(orm['server.item'], null=False)) )) db.create_unique(m2m_table_name, ['selection_id', 'item_id']) @@ -33,8 +33,8 @@ class Migration(SchemaMigration): m2m_table_name = db.shorten_name('timeside_selections_selections') db.create_table(m2m_table_name, ( ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), - ('from_selection', models.ForeignKey(orm['timeside.selection'], null=False)), - ('to_selection', models.ForeignKey(orm['timeside.selection'], null=False)) + ('from_selection', models.ForeignKey(orm['server.selection'], null=False)), + ('to_selection', models.ForeignKey(orm['server.selection'], null=False)) )) db.create_unique(m2m_table_name, ['from_selection_id', 'to_selection_id']) @@ -51,10 +51,10 @@ class Migration(SchemaMigration): ('sha1', self.gf('django.db.models.fields.CharField')(max_length=512, blank=True)), ('mime_type', self.gf('django.db.models.fields.CharField')(max_length=256, blank=True)), ('hdf5', self.gf('django.db.models.fields.files.FileField')(max_length=1024, blank=True)), - ('lock', self.gf('django.db.models.fields.BooleanField')(default=False)), ('author', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='items', null=True, on_delete=models.SET_NULL, to=orm['auth.User'])), + ('lock', self.gf('django.db.models.fields.BooleanField')(default=False)), )) - db.send_create_signal('timeside', ['Item']) + db.send_create_signal('server', ['Item']) # Adding model 'Experience' db.create_table('timeside_experiences', ( @@ -65,25 +65,25 @@ class Migration(SchemaMigration): ('title', self.gf('django.db.models.fields.CharField')(max_length=512, blank=True)), ('description', self.gf('django.db.models.fields.TextField')(blank=True)), ('author', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='experiences', null=True, on_delete=models.SET_NULL, to=orm['auth.User'])), - ('is_preset', self.gf('django.db.models.fields.BooleanField')(default=False)), + ('is_public', self.gf('django.db.models.fields.BooleanField')(default=False)), )) - db.send_create_signal('timeside', ['Experience']) + db.send_create_signal('server', ['Experience']) - # Adding M2M table for field processors on 'Experience' - m2m_table_name = db.shorten_name('timeside_experiences_processors') + # Adding M2M table for field presets on 'Experience' + m2m_table_name = db.shorten_name('timeside_experiences_presets') db.create_table(m2m_table_name, ( ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), - ('experience', models.ForeignKey(orm['timeside.experience'], null=False)), - ('processor', models.ForeignKey(orm['timeside.processor'], null=False)) + ('experience', models.ForeignKey(orm['server.experience'], null=False)), + ('preset', models.ForeignKey(orm['server.preset'], null=False)) )) - db.create_unique(m2m_table_name, ['experience_id', 'processor_id']) + db.create_unique(m2m_table_name, ['experience_id', 'preset_id']) # Adding M2M table for field experiences on 'Experience' m2m_table_name = db.shorten_name('timeside_experiences_experiences') db.create_table(m2m_table_name, ( ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), - ('from_experience', models.ForeignKey(orm['timeside.experience'], null=False)), - ('to_experience', models.ForeignKey(orm['timeside.experience'], null=False)) + ('from_experience', models.ForeignKey(orm['server.experience'], null=False)), + ('to_experience', models.ForeignKey(orm['server.experience'], null=False)) )) db.create_unique(m2m_table_name, ['from_experience_id', 'to_experience_id']) @@ -91,10 +91,22 @@ class Migration(SchemaMigration): db.create_table('timeside_processors', ( ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), ('pid', self.gf('django.db.models.fields.CharField')(max_length=256)), - ('type', self.gf('django.db.models.fields.CharField')(default='none', max_length=64)), ('version', self.gf('django.db.models.fields.CharField')(max_length=64, blank=True)), )) - db.send_create_signal('timeside', ['Processor']) + db.send_create_signal('server', ['Processor']) + + # Adding model 'Preset' + db.create_table('timeside_presets', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('date_added', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)), + ('date_modified', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, null=True, blank=True)), + ('uuid', self.gf('django.db.models.fields.CharField')(unique=True, max_length=512, blank=True)), + ('processor', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='presets', null=True, to=orm['server.Processor'])), + ('parameters', self.gf('django.db.models.fields.TextField')(blank=True)), + ('author', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='presets', null=True, on_delete=models.SET_NULL, to=orm['auth.User'])), + ('is_public', self.gf('django.db.models.fields.BooleanField')(default=False)), + )) + db.send_create_signal('server', ['Preset']) # Adding model 'Result' db.create_table('timeside_results', ( @@ -102,33 +114,28 @@ class Migration(SchemaMigration): ('date_added', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)), ('date_modified', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, null=True, blank=True)), ('uuid', self.gf('django.db.models.fields.CharField')(unique=True, max_length=512, blank=True)), - ('item', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='results', null=True, on_delete=models.SET_NULL, to=orm['timeside.Item'])), - ('processor', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='results', null=True, on_delete=models.SET_NULL, to=orm['timeside.Processor'])), + ('item', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='results', null=True, on_delete=models.SET_NULL, to=orm['server.Item'])), + ('preset', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='results', null=True, on_delete=models.SET_NULL, to=orm['server.Preset'])), ('hdf5', self.gf('django.db.models.fields.files.FileField')(max_length=1024, blank=True)), - ('output', self.gf('django.db.models.fields.files.FileField')(max_length=1024, blank=True)), - ('output_mime_type', self.gf('django.db.models.fields.CharField')(max_length=256, blank=True)), + ('file', self.gf('django.db.models.fields.files.FileField')(max_length=1024, blank=True)), + ('mime_type', self.gf('django.db.models.fields.CharField')(max_length=256, blank=True)), ('status', self.gf('django.db.models.fields.IntegerField')(default=1)), + ('author', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='results', null=True, on_delete=models.SET_NULL, to=orm['auth.User'])), )) - db.send_create_signal('timeside', ['Result']) - - # Adding model 'Parameters' - db.create_table('timeside_parameters', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('processor', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='parameters', null=True, to=orm['timeside.Experience'])), - ('parameters', self.gf('django.db.models.fields.TextField')(blank=True)), - ('is_preset', self.gf('django.db.models.fields.BooleanField')(default=False)), - )) - db.send_create_signal('timeside', ['Parameters']) + db.send_create_signal('server', ['Result']) # Adding model 'Task' db.create_table('timeside_tasks', ( ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('experience', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='task', null=True, to=orm['timeside.Experience'])), - ('selection', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='task', null=True, to=orm['timeside.Selection'])), + ('date_added', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)), + ('date_modified', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, null=True, blank=True)), + ('uuid', self.gf('django.db.models.fields.CharField')(unique=True, max_length=512, blank=True)), + ('experience', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='task', null=True, to=orm['server.Experience'])), + ('selection', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='task', null=True, to=orm['server.Selection'])), ('status', self.gf('django.db.models.fields.IntegerField')(default=1)), ('author', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='tasks', null=True, on_delete=models.SET_NULL, to=orm['auth.User'])), )) - db.send_create_signal('timeside', ['Task']) + db.send_create_signal('server', ['Task']) def backwards(self, orm): @@ -147,8 +154,8 @@ class Migration(SchemaMigration): # Deleting model 'Experience' db.delete_table('timeside_experiences') - # Removing M2M table for field processors on 'Experience' - db.delete_table(db.shorten_name('timeside_experiences_processors')) + # Removing M2M table for field presets on 'Experience' + db.delete_table(db.shorten_name('timeside_experiences_presets')) # Removing M2M table for field experiences on 'Experience' db.delete_table(db.shorten_name('timeside_experiences_experiences')) @@ -156,12 +163,12 @@ class Migration(SchemaMigration): # Deleting model 'Processor' db.delete_table('timeside_processors') + # Deleting model 'Preset' + db.delete_table('timeside_presets') + # Deleting model 'Result' db.delete_table('timeside_results') - # Deleting model 'Parameters' - db.delete_table('timeside_parameters') - # Deleting model 'Task' db.delete_table('timeside_tasks') @@ -203,20 +210,20 @@ class Migration(SchemaMigration): 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) }, - 'timeside.experience': { + 'server.experience': { 'Meta': {'object_name': 'Experience', 'db_table': "'timeside_experiences'"}, 'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'experiences'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), 'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}), 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'experiences': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'other_experiences'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['timeside.Experience']"}), + 'experiences': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'other_experiences'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['server.Experience']"}), 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_preset': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'processors': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'experiences'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['timeside.Processor']"}), + 'is_public': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'presets': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'experiences'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['server.Preset']"}), 'title': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), 'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512', 'blank': 'True'}) }, - 'timeside.item': { + 'server.item': { 'Meta': {'ordering': "['title']", 'object_name': 'Item', 'db_table': "'timeside_items'"}, 'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'items'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), 'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), @@ -232,53 +239,60 @@ class Migration(SchemaMigration): 'url': ('django.db.models.fields.URLField', [], {'max_length': '1024', 'blank': 'True'}), 'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512', 'blank': 'True'}) }, - 'timeside.parameters': { - 'Meta': {'object_name': 'Parameters'}, + 'server.preset': { + 'Meta': {'object_name': 'Preset', 'db_table': "'timeside_presets'"}, + 'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'presets'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}), 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_preset': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_public': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'parameters': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'processor': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'parameters'", 'null': 'True', 'to': "orm['timeside.Experience']"}) + 'processor': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'presets'", 'null': 'True', 'to': "orm['server.Processor']"}), + 'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512', 'blank': 'True'}) }, - 'timeside.processor': { + 'server.processor': { 'Meta': {'object_name': 'Processor', 'db_table': "'timeside_processors'"}, 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'pid': ('django.db.models.fields.CharField', [], {'max_length': '256'}), - 'type': ('django.db.models.fields.CharField', [], {'default': "'none'", 'max_length': '64'}), 'version': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}) }, - 'timeside.result': { + 'server.result': { 'Meta': {'object_name': 'Result', 'db_table': "'timeside_results'"}, + 'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'results'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), 'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}), + 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'blank': 'True'}), 'hdf5': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'blank': 'True'}), 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'item': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'results'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['timeside.Item']"}), - 'output': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'blank': 'True'}), - 'output_mime_type': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'}), - 'processor': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'results'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['timeside.Processor']"}), + 'item': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'results'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['server.Item']"}), + 'mime_type': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'}), + 'preset': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'results'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['server.Preset']"}), 'status': ('django.db.models.fields.IntegerField', [], {'default': '1'}), 'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512', 'blank': 'True'}) }, - 'timeside.selection': { + 'server.selection': { 'Meta': {'object_name': 'Selection', 'db_table': "'timeside_selections'"}, 'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'selections'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), 'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}), 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'items': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'selections'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['timeside.Item']"}), - 'selections': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'other_selections'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['timeside.Selection']"}), + 'items': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'selections'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['server.Item']"}), + 'selections': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'other_selections'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['server.Selection']"}), 'title': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), 'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512', 'blank': 'True'}) }, - 'timeside.task': { + 'server.task': { 'Meta': {'object_name': 'Task', 'db_table': "'timeside_tasks'"}, 'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'tasks'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), - 'experience': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'task'", 'null': 'True', 'to': "orm['timeside.Experience']"}), + 'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}), + 'experience': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'task'", 'null': 'True', 'to': "orm['server.Experience']"}), 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'selection': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'task'", 'null': 'True', 'to': "orm['timeside.Selection']"}), - 'status': ('django.db.models.fields.IntegerField', [], {'default': '1'}) + 'selection': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'task'", 'null': 'True', 'to': "orm['server.Selection']"}), + 'status': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512', 'blank': 'True'}) } } - complete_apps = ['timeside'] \ No newline at end of file + complete_apps = ['server'] \ No newline at end of file diff --git a/timeside/server/migrations/0002_auto__chg_field_parameters_processor.py b/timeside/server/migrations/0002_auto__chg_field_parameters_processor.py deleted file mode 100644 index aea7f91..0000000 --- a/timeside/server/migrations/0002_auto__chg_field_parameters_processor.py +++ /dev/null @@ -1,135 +0,0 @@ -# -*- coding: utf-8 -*- -from south.utils import datetime_utils as datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Changing field 'Parameters.processor' - db.alter_column('timeside_parameters', 'processor_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, to=orm['timeside.Processor'])) - - def backwards(self, orm): - - # Changing field 'Parameters.processor' - db.alter_column('timeside_parameters', 'processor_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, to=orm['timeside.Experience'])) - - models = { - 'auth.group': { - 'Meta': {'object_name': 'Group'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - 'auth.permission': { - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - 'auth.user': { - 'Meta': {'object_name': 'User'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - 'contenttypes.contenttype': { - 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) - }, - 'timeside.experience': { - 'Meta': {'object_name': 'Experience', 'db_table': "'timeside_experiences'"}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'experiences'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), - 'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}), - 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'experiences': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'other_experiences'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['timeside.Experience']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_preset': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'processors': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'experiences'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['timeside.Processor']"}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), - 'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512', 'blank': 'True'}) - }, - 'timeside.item': { - 'Meta': {'ordering': "['title']", 'object_name': 'Item', 'db_table': "'timeside_items'"}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'items'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), - 'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}), - 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'blank': 'True'}), - 'hdf5': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lock': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'mime_type': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'}), - 'sha1': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'max_length': '1024', 'blank': 'True'}), - 'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512', 'blank': 'True'}) - }, - 'timeside.parameters': { - 'Meta': {'object_name': 'Parameters'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_preset': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'parameters': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'processor': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'parameters'", 'null': 'True', 'to': "orm['timeside.Processor']"}) - }, - 'timeside.processor': { - 'Meta': {'object_name': 'Processor', 'db_table': "'timeside_processors'"}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'pid': ('django.db.models.fields.CharField', [], {'max_length': '256'}), - 'type': ('django.db.models.fields.CharField', [], {'default': "'none'", 'max_length': '64'}), - 'version': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}) - }, - 'timeside.result': { - 'Meta': {'object_name': 'Result', 'db_table': "'timeside_results'"}, - 'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}), - 'hdf5': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'item': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'results'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['timeside.Item']"}), - 'output': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'blank': 'True'}), - 'output_mime_type': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'}), - 'processor': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'results'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['timeside.Processor']"}), - 'status': ('django.db.models.fields.IntegerField', [], {'default': '1'}), - 'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512', 'blank': 'True'}) - }, - 'timeside.selection': { - 'Meta': {'object_name': 'Selection', 'db_table': "'timeside_selections'"}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'selections'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), - 'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}), - 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'items': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'selections'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['timeside.Item']"}), - 'selections': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'other_selections'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['timeside.Selection']"}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), - 'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512', 'blank': 'True'}) - }, - 'timeside.task': { - 'Meta': {'object_name': 'Task', 'db_table': "'timeside_tasks'"}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'tasks'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), - 'experience': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'task'", 'null': 'True', 'to': "orm['timeside.Experience']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'selection': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'task'", 'null': 'True', 'to': "orm['timeside.Selection']"}), - 'status': ('django.db.models.fields.IntegerField', [], {'default': '1'}) - } - } - - complete_apps = ['timeside'] \ No newline at end of file diff --git a/timeside/server/migrations/0003_auto__del_field_processor_type.py b/timeside/server/migrations/0003_auto__del_field_processor_type.py deleted file mode 100644 index 1c5c6a2..0000000 --- a/timeside/server/migrations/0003_auto__del_field_processor_type.py +++ /dev/null @@ -1,136 +0,0 @@ -# -*- coding: utf-8 -*- -from south.utils import datetime_utils as datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Deleting field 'Processor.type' - db.delete_column('timeside_processors', 'type') - - - def backwards(self, orm): - # Adding field 'Processor.type' - db.add_column('timeside_processors', 'type', - self.gf('django.db.models.fields.CharField')(default='none', max_length=64), - keep_default=False) - - - models = { - 'auth.group': { - 'Meta': {'object_name': 'Group'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - 'auth.permission': { - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - 'auth.user': { - 'Meta': {'object_name': 'User'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - 'contenttypes.contenttype': { - 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) - }, - 'timeside.experience': { - 'Meta': {'object_name': 'Experience', 'db_table': "'timeside_experiences'"}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'experiences'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), - 'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}), - 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'experiences': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'other_experiences'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['timeside.Experience']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_preset': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'processors': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'experiences'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['timeside.Processor']"}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), - 'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512', 'blank': 'True'}) - }, - 'timeside.item': { - 'Meta': {'ordering': "['title']", 'object_name': 'Item', 'db_table': "'timeside_items'"}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'items'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), - 'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}), - 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'blank': 'True'}), - 'hdf5': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lock': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'mime_type': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'}), - 'sha1': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'max_length': '1024', 'blank': 'True'}), - 'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512', 'blank': 'True'}) - }, - 'timeside.parameters': { - 'Meta': {'object_name': 'Parameters'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_preset': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'parameters': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'processor': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'parameters'", 'null': 'True', 'to': "orm['timeside.Processor']"}) - }, - 'timeside.processor': { - 'Meta': {'object_name': 'Processor', 'db_table': "'timeside_processors'"}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'pid': ('django.db.models.fields.CharField', [], {'max_length': '256'}), - 'version': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}) - }, - 'timeside.result': { - 'Meta': {'object_name': 'Result', 'db_table': "'timeside_results'"}, - 'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}), - 'hdf5': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'item': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'results'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['timeside.Item']"}), - 'output': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'blank': 'True'}), - 'output_mime_type': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'}), - 'processor': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'results'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['timeside.Processor']"}), - 'status': ('django.db.models.fields.IntegerField', [], {'default': '1'}), - 'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512', 'blank': 'True'}) - }, - 'timeside.selection': { - 'Meta': {'object_name': 'Selection', 'db_table': "'timeside_selections'"}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'selections'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), - 'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}), - 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'items': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'selections'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['timeside.Item']"}), - 'selections': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'other_selections'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['timeside.Selection']"}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), - 'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512', 'blank': 'True'}) - }, - 'timeside.task': { - 'Meta': {'object_name': 'Task', 'db_table': "'timeside_tasks'"}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'tasks'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), - 'experience': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'task'", 'null': 'True', 'to': "orm['timeside.Experience']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'selection': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'task'", 'null': 'True', 'to': "orm['timeside.Selection']"}), - 'status': ('django.db.models.fields.IntegerField', [], {'default': '1'}) - } - } - - complete_apps = ['timeside'] \ No newline at end of file diff --git a/timeside/server/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 deleted file mode 100644 index 6b03bcf..0000000 --- a/timeside/server/migrations/0004_auto__del_field_result_processor__add_field_result_parameters.py +++ /dev/null @@ -1,144 +0,0 @@ -# -*- coding: utf-8 -*- -from south.utils import datetime_utils as datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Deleting field 'Result.processor' - db.delete_column('timeside_results', 'processor_id') - - # Adding field 'Result.parameters' - db.add_column('timeside_results', 'parameters', - self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='results', null=True, on_delete=models.SET_NULL, to=orm['timeside.Parameters']), - keep_default=False) - - - def backwards(self, orm): - # Adding field 'Result.processor' - db.add_column('timeside_results', 'processor', - self.gf('django.db.models.fields.related.ForeignKey')(related_name='results', null=True, to=orm['timeside.Processor'], on_delete=models.SET_NULL, blank=True), - keep_default=False) - - # Deleting field 'Result.parameters' - db.delete_column('timeside_results', 'parameters_id') - - - models = { - 'auth.group': { - 'Meta': {'object_name': 'Group'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - 'auth.permission': { - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - 'auth.user': { - 'Meta': {'object_name': 'User'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - 'contenttypes.contenttype': { - 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) - }, - 'timeside.experience': { - 'Meta': {'object_name': 'Experience', 'db_table': "'timeside_experiences'"}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'experiences'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), - 'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}), - 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'experiences': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'other_experiences'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['timeside.Experience']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_preset': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'processors': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'experiences'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['timeside.Processor']"}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), - 'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512', 'blank': 'True'}) - }, - 'timeside.item': { - 'Meta': {'ordering': "['title']", 'object_name': 'Item', 'db_table': "'timeside_items'"}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'items'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), - 'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}), - 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'blank': 'True'}), - 'hdf5': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lock': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'mime_type': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'}), - 'sha1': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'max_length': '1024', 'blank': 'True'}), - 'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512', 'blank': 'True'}) - }, - 'timeside.parameters': { - 'Meta': {'object_name': 'Parameters'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_preset': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'parameters': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'processor': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'parameters'", 'null': 'True', 'to': "orm['timeside.Processor']"}) - }, - 'timeside.processor': { - 'Meta': {'object_name': 'Processor', 'db_table': "'timeside_processors'"}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'pid': ('django.db.models.fields.CharField', [], {'max_length': '256'}), - 'version': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}) - }, - 'timeside.result': { - 'Meta': {'object_name': 'Result', 'db_table': "'timeside_results'"}, - 'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}), - 'hdf5': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'item': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'results'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['timeside.Item']"}), - 'output': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'blank': 'True'}), - 'output_mime_type': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'}), - 'parameters': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'results'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['timeside.Parameters']"}), - 'status': ('django.db.models.fields.IntegerField', [], {'default': '1'}), - 'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512', 'blank': 'True'}) - }, - 'timeside.selection': { - 'Meta': {'object_name': 'Selection', 'db_table': "'timeside_selections'"}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'selections'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), - 'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}), - 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'items': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'selections'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['timeside.Item']"}), - 'selections': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'other_selections'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['timeside.Selection']"}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), - 'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512', 'blank': 'True'}) - }, - 'timeside.task': { - 'Meta': {'object_name': 'Task', 'db_table': "'timeside_tasks'"}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'tasks'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), - 'experience': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'task'", 'null': 'True', 'to': "orm['timeside.Experience']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'selection': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'task'", 'null': 'True', 'to': "orm['timeside.Selection']"}), - 'status': ('django.db.models.fields.IntegerField', [], {'default': '1'}) - } - } - - complete_apps = ['timeside'] \ No newline at end of file diff --git a/timeside/server/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 deleted file mode 100644 index 64dd868..0000000 --- a/timeside/server/migrations/0005_auto__del_field_result_output_mime_type__del_field_result_output__add_.py +++ /dev/null @@ -1,166 +0,0 @@ -# -*- coding: utf-8 -*- -from south.utils import datetime_utils as datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Deleting field 'Result.output_mime_type' - db.delete_column('timeside_results', 'output_mime_type') - - # Deleting field 'Result.output' - db.delete_column('timeside_results', 'output') - - # Adding field 'Result.file' - db.add_column('timeside_results', 'file', - self.gf('django.db.models.fields.files.FileField')(max_length=1024, null=True, blank=True), - keep_default=False) - - # Adding field 'Result.mime_type' - db.add_column('timeside_results', 'mime_type', - self.gf('django.db.models.fields.CharField')(default='', max_length=256, blank=True), - keep_default=False) - - - # Changing field 'Result.hdf5' - db.alter_column('timeside_results', 'hdf5', self.gf('django.db.models.fields.files.FileField')(max_length=1024, null=True)) - - def backwards(self, orm): - # Adding field 'Result.output_mime_type' - db.add_column('timeside_results', 'output_mime_type', - self.gf('django.db.models.fields.CharField')(default='', max_length=256, blank=True), - keep_default=False) - - # Adding field 'Result.output' - db.add_column('timeside_results', 'output', - self.gf('django.db.models.fields.files.FileField')(default='foo.bar', max_length=1024, blank=True), - keep_default=False) - - # Deleting field 'Result.file' - db.delete_column('timeside_results', 'file') - - # Deleting field 'Result.mime_type' - db.delete_column('timeside_results', 'mime_type') - - - # Changing field 'Result.hdf5' - db.alter_column('timeside_results', 'hdf5', self.gf('django.db.models.fields.files.FileField')(default='foo.bar', max_length=1024)) - - models = { - 'auth.group': { - 'Meta': {'object_name': 'Group'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - 'auth.permission': { - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - 'auth.user': { - 'Meta': {'object_name': 'User'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - 'contenttypes.contenttype': { - 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) - }, - 'timeside.experience': { - 'Meta': {'object_name': 'Experience', 'db_table': "'timeside_experiences'"}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'experiences'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), - 'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}), - 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'experiences': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'other_experiences'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['timeside.Experience']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_preset': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'processors': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'experiences'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['timeside.Processor']"}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), - 'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512', 'blank': 'True'}) - }, - 'timeside.item': { - 'Meta': {'ordering': "['title']", 'object_name': 'Item', 'db_table': "'timeside_items'"}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'items'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), - 'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}), - 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'blank': 'True'}), - 'hdf5': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lock': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'mime_type': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'}), - 'sha1': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'max_length': '1024', 'blank': 'True'}), - 'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512', 'blank': 'True'}) - }, - 'timeside.parameters': { - 'Meta': {'object_name': 'Parameters'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_preset': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'parameters': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'processor': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'parameters'", 'null': 'True', 'to': "orm['timeside.Processor']"}) - }, - 'timeside.processor': { - 'Meta': {'object_name': 'Processor', 'db_table': "'timeside_processors'"}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'pid': ('django.db.models.fields.CharField', [], {'max_length': '256'}), - 'version': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}) - }, - 'timeside.result': { - 'Meta': {'object_name': 'Result', 'db_table': "'timeside_results'"}, - 'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}), - 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'hdf5': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'item': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'results'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['timeside.Item']"}), - 'mime_type': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'}), - 'parameters': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'results'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['timeside.Parameters']"}), - 'status': ('django.db.models.fields.IntegerField', [], {'default': '1'}), - 'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512', 'blank': 'True'}) - }, - 'timeside.selection': { - 'Meta': {'object_name': 'Selection', 'db_table': "'timeside_selections'"}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'selections'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), - 'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}), - 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'items': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'selections'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['timeside.Item']"}), - 'selections': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'other_selections'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['timeside.Selection']"}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), - 'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512', 'blank': 'True'}) - }, - 'timeside.task': { - 'Meta': {'object_name': 'Task', 'db_table': "'timeside_tasks'"}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'tasks'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), - 'experience': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'task'", 'null': 'True', 'to': "orm['timeside.Experience']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'selection': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'task'", 'null': 'True', 'to': "orm['timeside.Selection']"}), - 'status': ('django.db.models.fields.IntegerField', [], {'default': '1'}) - } - } - - complete_apps = ['timeside'] \ No newline at end of file diff --git a/timeside/server/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 deleted file mode 100644 index 5f9d3fe..0000000 --- a/timeside/server/migrations/0006_auto__del_parameters__add_preset__del_field_result_parameters__add_fie.py +++ /dev/null @@ -1,220 +0,0 @@ -# -*- coding: utf-8 -*- -from south.utils import datetime_utils as datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Deleting model 'Parameters' - db.delete_table('timeside_parameters') - - # Adding model 'Preset' - db.create_table('timeside_presets', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('processor', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='preset', null=True, to=orm['timeside.Processor'])), - ('parameters', self.gf('django.db.models.fields.TextField')(blank=True)), - ('is_public', self.gf('django.db.models.fields.BooleanField')(default=False)), - )) - db.send_create_signal('timeside', ['Preset']) - - # Deleting field 'Result.parameters' - db.delete_column('timeside_results', 'parameters_id') - - # Adding field 'Result.preset' - db.add_column('timeside_results', 'preset', - self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='results', null=True, on_delete=models.SET_NULL, to=orm['timeside.Preset']), - keep_default=False) - - - # Changing field 'Result.hdf5' - db.alter_column('timeside_results', 'hdf5', self.gf('django.db.models.fields.files.FileField')(default=0, max_length=1024)) - - # Changing field 'Result.file' - db.alter_column('timeside_results', 'file', self.gf('django.db.models.fields.files.FileField')(default=0, max_length=1024)) - # Deleting field 'Experience.is_preset' - db.delete_column('timeside_experiences', 'is_preset') - - # Adding field 'Experience.is_public' - db.add_column('timeside_experiences', 'is_public', - self.gf('django.db.models.fields.BooleanField')(default=False), - keep_default=False) - - # Removing M2M table for field processors on 'Experience' - db.delete_table(db.shorten_name('timeside_experiences_processors')) - - # Adding M2M table for field presets on 'Experience' - m2m_table_name = db.shorten_name('timeside_experiences_presets') - db.create_table(m2m_table_name, ( - ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), - ('experience', models.ForeignKey(orm['timeside.experience'], null=False)), - ('preset', models.ForeignKey(orm['timeside.preset'], null=False)) - )) - db.create_unique(m2m_table_name, ['experience_id', 'preset_id']) - - - def backwards(self, orm): - # Adding model 'Parameters' - db.create_table('timeside_parameters', ( - ('parameters', self.gf('django.db.models.fields.TextField')(blank=True)), - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('is_preset', self.gf('django.db.models.fields.BooleanField')(default=False)), - ('processor', self.gf('django.db.models.fields.related.ForeignKey')(related_name='parameters', null=True, to=orm['timeside.Processor'], blank=True)), - )) - db.send_create_signal('timeside', ['Parameters']) - - # Deleting model 'Preset' - db.delete_table('timeside_presets') - - # Adding field 'Result.parameters' - db.add_column('timeside_results', 'parameters', - self.gf('django.db.models.fields.related.ForeignKey')(related_name='results', null=True, to=orm['timeside.Parameters'], on_delete=models.SET_NULL, blank=True), - keep_default=False) - - # Deleting field 'Result.preset' - db.delete_column('timeside_results', 'preset_id') - - - # Changing field 'Result.hdf5' - db.alter_column('timeside_results', 'hdf5', self.gf('django.db.models.fields.files.FileField')(max_length=1024, null=True)) - - # Changing field 'Result.file' - db.alter_column('timeside_results', 'file', self.gf('django.db.models.fields.files.FileField')(max_length=1024, null=True)) - # Adding field 'Experience.is_preset' - db.add_column('timeside_experiences', 'is_preset', - self.gf('django.db.models.fields.BooleanField')(default=False), - keep_default=False) - - # Deleting field 'Experience.is_public' - db.delete_column('timeside_experiences', 'is_public') - - # Adding M2M table for field processors on 'Experience' - m2m_table_name = db.shorten_name('timeside_experiences_processors') - db.create_table(m2m_table_name, ( - ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), - ('experience', models.ForeignKey(orm['timeside.experience'], null=False)), - ('processor', models.ForeignKey(orm['timeside.processor'], null=False)) - )) - db.create_unique(m2m_table_name, ['experience_id', 'processor_id']) - - # Removing M2M table for field presets on 'Experience' - db.delete_table(db.shorten_name('timeside_experiences_presets')) - - - models = { - 'auth.group': { - 'Meta': {'object_name': 'Group'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - 'auth.permission': { - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - 'auth.user': { - 'Meta': {'object_name': 'User'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - 'contenttypes.contenttype': { - 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) - }, - 'timeside.experience': { - 'Meta': {'object_name': 'Experience', 'db_table': "'timeside_experiences'"}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'experiences'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), - 'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}), - 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'experiences': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'other_experiences'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['timeside.Experience']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_public': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'presets': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'experiences'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['timeside.Preset']"}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), - 'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512', 'blank': 'True'}) - }, - 'timeside.item': { - 'Meta': {'ordering': "['title']", 'object_name': 'Item', 'db_table': "'timeside_items'"}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'items'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), - 'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}), - 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'blank': 'True'}), - 'hdf5': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'lock': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'mime_type': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'}), - 'sha1': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'max_length': '1024', 'blank': 'True'}), - 'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512', 'blank': 'True'}) - }, - 'timeside.preset': { - 'Meta': {'object_name': 'Preset', 'db_table': "'timeside_presets'"}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_public': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'parameters': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'processor': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'preset'", 'null': 'True', 'to': "orm['timeside.Processor']"}) - }, - 'timeside.processor': { - 'Meta': {'object_name': 'Processor', 'db_table': "'timeside_processors'"}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'pid': ('django.db.models.fields.CharField', [], {'max_length': '256'}), - 'version': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}) - }, - 'timeside.result': { - 'Meta': {'object_name': 'Result', 'db_table': "'timeside_results'"}, - 'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}), - 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'blank': 'True'}), - 'hdf5': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'item': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'results'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['timeside.Item']"}), - 'mime_type': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'}), - 'preset': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'results'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['timeside.Preset']"}), - 'status': ('django.db.models.fields.IntegerField', [], {'default': '1'}), - 'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512', 'blank': 'True'}) - }, - 'timeside.selection': { - 'Meta': {'object_name': 'Selection', 'db_table': "'timeside_selections'"}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'selections'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), - 'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}), - 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'items': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'selections'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['timeside.Item']"}), - 'selections': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'other_selections'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['timeside.Selection']"}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), - 'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512', 'blank': 'True'}) - }, - 'timeside.task': { - 'Meta': {'object_name': 'Task', 'db_table': "'timeside_tasks'"}, - 'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'tasks'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), - 'experience': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'task'", 'null': 'True', 'to': "orm['timeside.Experience']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'selection': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'task'", 'null': 'True', 'to': "orm['timeside.Selection']"}), - 'status': ('django.db.models.fields.IntegerField', [], {'default': '1'}) - } - } - - complete_apps = ['timeside'] \ No newline at end of file diff --git a/timeside/server/models.py b/timeside/server/models.py index cbe5e74..57ef014 100644 --- a/timeside/server/models.py +++ b/timeside/server/models.py @@ -32,8 +32,8 @@ def get_processor(pid): class MetaCore: - app_label = app - + app_label = 'server' + class BaseResource(models.Model): @@ -65,8 +65,8 @@ class DocBaseResource(BaseResource): class Selection(DocBaseResource): items = models.ManyToManyField('Item', related_name="selections", verbose_name=_('items'), blank=True, null=True) - author = models.ForeignKey(User, related_name="selections", verbose_name=_('author'), blank=True, null=True, on_delete=models.SET_NULL) selections = models.ManyToManyField('Selection', related_name="other_selections", verbose_name=_('other selections'), blank=True, null=True) + author = models.ForeignKey(User, related_name="selections", verbose_name=_('author'), blank=True, null=True, on_delete=models.SET_NULL) class Meta(MetaCore): db_table = app + '_selections' @@ -80,8 +80,8 @@ class Item(DocBaseResource): sha1 = models.CharField(_('sha1'), blank=True, max_length=512) mime_type = models.CharField(_('mime type'), blank=True, max_length=256) hdf5 = models.FileField(_('HDF5 result file'), upload_to='results/%Y/%m/%d', blank=True, max_length=1024) - lock = models.BooleanField(default=False) author = models.ForeignKey(User, related_name="items", verbose_name=_('author'), blank=True, null=True, on_delete=models.SET_NULL) + lock = models.BooleanField(default=False) class Meta(MetaCore): db_table = app + '_items' @@ -99,8 +99,8 @@ class Item(DocBaseResource): class Experience(DocBaseResource): presets = models.ManyToManyField('Preset', related_name="experiences", verbose_name=_('presets'), blank=True, null=True) - author = models.ForeignKey(User, related_name="experiences", verbose_name=_('author'), blank=True, null=True, on_delete=models.SET_NULL) experiences = models.ManyToManyField('Experience', related_name="other_experiences", verbose_name=_('other experiences'), blank=True, null=True) + author = models.ForeignKey(User, related_name="experiences", verbose_name=_('author'), blank=True, null=True, on_delete=models.SET_NULL) is_public = models.BooleanField(default=False) class Meta(MetaCore): @@ -126,10 +126,11 @@ class Processor(models.Model): super(Processor, self).save(**kwargs) -class Preset(models.Model): +class Preset(BaseResource): processor = models.ForeignKey('Processor', related_name="presets", verbose_name=_('processor'), blank=True, null=True) parameters = models.TextField(_('Parameters'), blank=True) + author = models.ForeignKey(User, related_name="presets", verbose_name=_('author'), blank=True, null=True, on_delete=models.SET_NULL) is_public = models.BooleanField(default=False) class Meta(MetaCore): @@ -149,7 +150,8 @@ class Result(BaseResource): file = models.FileField(_('Output file'), upload_to='results/%Y/%m/%d', blank=True, max_length=1024) mime_type = models.CharField(_('Output file MIME type'), blank=True, max_length=256) status = models.IntegerField(_('status'), choices=STATUS, default=1) - + author = models.ForeignKey(User, related_name="results", verbose_name=_('author'), blank=True, null=True, on_delete=models.SET_NULL) + class Meta(MetaCore): db_table = app + '_results' verbose_name = _('Result') @@ -163,7 +165,7 @@ class Result(BaseResource): return '_'.join([self.item.title, unicode(self.parameters.processor)]) -class Task(models.Model): +class Task(BaseResource): experience = models.ForeignKey('Experience', related_name="task", verbose_name=_('experience'), blank=True, null=True) selection = models.ForeignKey('Selection', related_name="task", verbose_name=_('selection'), blank=True, null=True) @@ -183,12 +185,12 @@ class Task(models.Model): self.save() def run(self): + self.status_setter(3) + results_root = 'results' if not os.path.exists(settings.MEDIA_ROOT + results_root): os.makedirs(settings.MEDIA_ROOT + results_root) - self.status_setter(3) - for item in self.selection.items.all(): path = results_root + os.sep + item.uuid + os.sep if not os.path.exists(settings.MEDIA_ROOT + os.sep + path): @@ -198,7 +200,6 @@ class Task(models.Model): pipe = timeside.decoder.FileDecoder(item.file.path) proc_dict = {} - for preset in self.experience.presets.all(): proc = get_processor(preset.processor.pid) proc_dict[preset.processor] = proc @@ -235,18 +236,18 @@ class Task(models.Model): result.file = path + str(result.uuid) + '.png' proc.render(output=result.file.path) result.status_setter(4) - + + del proc + # except: # self.status_setter(0) # item.lock_setter(False) # break self.status_setter(4) - del proc del pipe - def set_mimetype(sender, **kwargs): instance = kwargs['instance'] if instance.file: @@ -264,6 +265,7 @@ def run(sender, **kwargs): if instance.status == 2: instance.run() + post_save.connect(set_mimetype, sender=Item) post_save.connect(set_hash, sender=Item) post_save.connect(set_mimetype, sender=Result) diff --git a/timeside/server/tasks.py b/timeside/server/tasks.py new file mode 100644 index 0000000..72b3d07 --- /dev/null +++ b/timeside/server/tasks.py @@ -0,0 +1,8 @@ + +from __future__ import absolute_import + +from timeside.webserver.celery import app + +@app.task +def process(pipe): + pipe.run()