From 055e50317b640224b5fb8d5a971c6ef3d3117695 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Fri, 28 Mar 2014 16:32:54 +0100 Subject: [PATCH] update timeside django models (no views now..) --- README.rst | 2 +- setup.py | 2 + tests/django/timeside.sql | Bin 69632 -> 0 bytes tests/{django => server}/__init__.py | 0 tests/{django => server}/manage.py | 0 tests/{django => server}/settings.py | 3 +- tests/{django => server}/update_schema.sh | 0 tests/{django => server}/urls.py | 0 tests/{django => server}/wsgi.py | 0 timeside/migrations/0001_initial.py | 195 +++++++----------- ...perience_decoder__add_field_experience_.py | 153 -------------- timeside/models.py | 169 ++++++++------- timeside/views.py | 42 +++- 13 files changed, 214 insertions(+), 352 deletions(-) delete mode 100644 tests/django/timeside.sql rename tests/{django => server}/__init__.py (100%) rename tests/{django => server}/manage.py (100%) rename tests/{django => server}/settings.py (98%) rename tests/{django => server}/update_schema.sh (100%) rename tests/{django => server}/urls.py (100%) rename tests/{django => server}/wsgi.py (100%) delete mode 100644 timeside/migrations/0002_auto__add_decoder__add_field_experience_decoder__add_field_experience_.py diff --git a/README.rst b/README.rst index eb7cbd3..37cfb3a 100644 --- a/README.rst +++ b/README.rst @@ -382,7 +382,7 @@ For versions >=0.5 on Debian Stable 7.0 Wheezy: $ git clone https://github.com/yomguy/TimeSide.git $ cd TimeSide $ git checkout dev - $ export PYTHONPATH=$PYTHONPATH:`pwd` + $ sudo pip install -e . $ python tests/run_all_tests Sponsors and Partners diff --git a/setup.py b/setup.py index a36cbe6..0161f01 100755 --- a/setup.py +++ b/setup.py @@ -36,6 +36,8 @@ setup( 'pyyaml', 'simplejson', 'scipy', + 'django', + 'jsonfield', ], platforms=['OS Independent'], license='Gnu Public License V2', diff --git a/tests/django/timeside.sql b/tests/django/timeside.sql deleted file mode 100644 index 0d14bf5ebec8ace1998b3f28d27f9ac8df3579c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 69632 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 J+h>Ks{|}7RAB+G1 diff --git a/tests/django/__init__.py b/tests/server/__init__.py similarity index 100% rename from tests/django/__init__.py rename to tests/server/__init__.py diff --git a/tests/django/manage.py b/tests/server/manage.py similarity index 100% rename from tests/django/manage.py rename to tests/server/manage.py diff --git a/tests/django/settings.py b/tests/server/settings.py similarity index 98% rename from tests/django/settings.py rename to tests/server/settings.py index eba1bd0..0d353ca 100644 --- a/tests/django/settings.py +++ b/tests/server/settings.py @@ -91,7 +91,7 @@ SECRET_KEY = '5%z&a3r@t0=xr2eaio+400qf-32$b5zp897pr*wh5i^s4(-+3(' TEMPLATE_LOADERS = ( 'django.template.loaders.filesystem.Loader', 'django.template.loaders.app_directories.Loader', -# 'django.template.loaders.eggs.Loader', +# 'django.template.loaders.eggs.Loader', ) MIDDLEWARE_CLASSES = ( @@ -126,6 +126,7 @@ INSTALLED_APPS = ( 'django.contrib.admin', # Uncomment the next line to enable admin documentation: # 'django.contrib.admindocs', + 'django_extensions', 'south', 'timeside', ) diff --git a/tests/django/update_schema.sh b/tests/server/update_schema.sh similarity index 100% rename from tests/django/update_schema.sh rename to tests/server/update_schema.sh diff --git a/tests/django/urls.py b/tests/server/urls.py similarity index 100% rename from tests/django/urls.py rename to tests/server/urls.py diff --git a/tests/django/wsgi.py b/tests/server/wsgi.py similarity index 100% rename from tests/django/wsgi.py rename to tests/server/wsgi.py diff --git a/timeside/migrations/0001_initial.py b/timeside/migrations/0001_initial.py index f951451..388c29b 100644 --- a/timeside/migrations/0001_initial.py +++ b/timeside/migrations/0001_initial.py @@ -8,6 +8,24 @@ from django.db import models class Migration(SchemaMigration): def forwards(self, orm): + # Adding model 'Collection' + db.create_table('timeside_collections', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('code', self.gf('django.db.models.fields.CharField')(unique=True, max_length=512)), + ('title', self.gf('django.db.models.fields.CharField')(max_length=512, blank=True)), + ('description', self.gf('django.db.models.fields.TextField')(blank=True)), + )) + db.send_create_signal('timeside', ['Collection']) + + # Adding M2M table for field items on 'Collection' + m2m_table_name = db.shorten_name('timeside_collections_items') + db.create_table(m2m_table_name, ( + ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), + ('collection', models.ForeignKey(orm['timeside.collection'], null=False)), + ('item', models.ForeignKey(orm['timeside.item'], null=False)) + )) + db.create_unique(m2m_table_name, ['collection_id', 'item_id']) + # Adding model 'Item' db.create_table('timeside_items', ( ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), @@ -21,113 +39,74 @@ class Migration(SchemaMigration): )) db.send_create_signal('timeside', ['Item']) - # Adding model 'Analyzer' - db.create_table('timeside_analyzers', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('pid', self.gf('django.db.models.fields.CharField')(max_length=256)), - ('parameters', self.gf('django.db.models.fields.TextField')(blank=True)), - ('version', self.gf('django.db.models.fields.CharField')(max_length=64, blank=True)), - ('status', self.gf('django.db.models.fields.IntegerField')(default=1)), - )) - db.send_create_signal('timeside', ['Analyzer']) - - # Adding model 'Grapher' - db.create_table('timeside_graphers', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('pid', self.gf('django.db.models.fields.CharField')(max_length=256)), - ('parameters', self.gf('django.db.models.fields.TextField')(blank=True)), - ('version', self.gf('django.db.models.fields.CharField')(max_length=64, blank=True)), - ('status', self.gf('django.db.models.fields.IntegerField')(default=1)), - ('file', self.gf('django.db.models.fields.files.FileField')(max_length=1024, db_column='file')), - ('mime_type', self.gf('django.db.models.fields.CharField')(max_length=256, null=True)), - ('height', self.gf('django.db.models.fields.IntegerField')(default=180)), - ('width', self.gf('django.db.models.fields.IntegerField')(default=320)), - )) - db.send_create_signal('timeside', ['Grapher']) - - # Adding model 'Encoder' - db.create_table('timeside_encoders', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('pid', self.gf('django.db.models.fields.CharField')(max_length=256)), - ('parameters', self.gf('django.db.models.fields.TextField')(blank=True)), - ('version', self.gf('django.db.models.fields.CharField')(max_length=64, blank=True)), - ('status', self.gf('django.db.models.fields.IntegerField')(default=1)), - ('file', self.gf('django.db.models.fields.files.FileField')(max_length=1024, db_column='file')), - ('mime_type', self.gf('django.db.models.fields.CharField')(max_length=256, null=True)), + # Adding M2M table for field experiences on 'Item' + m2m_table_name = db.shorten_name('timeside_items_experiences') + db.create_table(m2m_table_name, ( + ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), + ('item', models.ForeignKey(orm['timeside.item'], null=False)), + ('experience', models.ForeignKey(orm['timeside.experience'], null=False)) )) - db.send_create_signal('timeside', ['Encoder']) + db.create_unique(m2m_table_name, ['item_id', 'experience_id']) # Adding model 'Experience' db.create_table('timeside_experiences', ( ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('item', self.gf('django.db.models.fields.related.ForeignKey')(related_name='experience', null=True, on_delete=models.SET_NULL, to=orm['timeside.Item'])), ('title', self.gf('django.db.models.fields.CharField')(max_length=512, blank=True)), ('description', self.gf('django.db.models.fields.TextField')(blank=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)), ('status', self.gf('django.db.models.fields.IntegerField')(default=1)), - ('uuid', self.gf('django.db.models.fields.CharField')(max_length=256)), - ('author', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='experience', null=True, to=orm['auth.User'])), - ('begin_time', self.gf('django.db.models.fields.FloatField')(default=0, blank=True)), - ('end_time', self.gf('django.db.models.fields.FloatField')(blank=True)), - ('low_frequency', self.gf('django.db.models.fields.FloatField')(blank=True)), - ('high_frequency', self.gf('django.db.models.fields.FloatField')(blank=True)), - ('hdf5', self.gf('django.db.models.fields.files.FileField')(max_length=1024, db_column='hdf5')), + ('uuid', self.gf('django.db.models.fields.CharField')(max_length=512)), + ('author', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='experience', null=True, on_delete=models.SET_NULL, to=orm['auth.User'])), )) db.send_create_signal('timeside', ['Experience']) - # Adding M2M table for field analyzers on 'Experience' - m2m_table_name = db.shorten_name('timeside_experiences_analyzers') + # 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)), - ('analyzer', models.ForeignKey(orm['timeside.analyzer'], null=False)) + ('processor', models.ForeignKey(orm['timeside.processor'], null=False)) )) - db.create_unique(m2m_table_name, ['experience_id', 'analyzer_id']) + db.create_unique(m2m_table_name, ['experience_id', 'processor_id']) - # Adding M2M table for field graphers on 'Experience' - m2m_table_name = db.shorten_name('timeside_experiences_graphers') - 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)), - ('grapher', models.ForeignKey(orm['timeside.grapher'], null=False)) - )) - db.create_unique(m2m_table_name, ['experience_id', 'grapher_id']) - - # Adding M2M table for field encoders on 'Experience' - m2m_table_name = db.shorten_name('timeside_experiences_encoders') - 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)), - ('encoder', models.ForeignKey(orm['timeside.encoder'], null=False)) + # Adding model 'Processor' + 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)), + ('parameters', self.gf('jsonfield.fields.JSONField')(blank=True)), + ('version', self.gf('django.db.models.fields.CharField')(max_length=64, blank=True)), + ('uuid', self.gf('django.db.models.fields.CharField')(max_length=512)), + ('status', self.gf('django.db.models.fields.IntegerField')(default=1)), + ('file', self.gf('django.db.models.fields.files.FileField')(max_length=1024, db_column='file')), + ('mime_type', self.gf('django.db.models.fields.CharField')(max_length=256, null=True)), + ('results', self.gf('jsonfield.fields.JSONField')(blank=True)), )) - db.create_unique(m2m_table_name, ['experience_id', 'encoder_id']) + db.send_create_signal('timeside', ['Processor']) def backwards(self, orm): - # Deleting model 'Item' - db.delete_table('timeside_items') + # Deleting model 'Collection' + db.delete_table('timeside_collections') - # Deleting model 'Analyzer' - db.delete_table('timeside_analyzers') + # Removing M2M table for field items on 'Collection' + db.delete_table(db.shorten_name('timeside_collections_items')) - # Deleting model 'Grapher' - db.delete_table('timeside_graphers') + # Deleting model 'Item' + db.delete_table('timeside_items') - # Deleting model 'Encoder' - db.delete_table('timeside_encoders') + # Removing M2M table for field experiences on 'Item' + db.delete_table(db.shorten_name('timeside_items_experiences')) # Deleting model 'Experience' db.delete_table('timeside_experiences') - # Removing M2M table for field analyzers on 'Experience' - db.delete_table(db.shorten_name('timeside_experiences_analyzers')) - - # Removing M2M table for field graphers on 'Experience' - db.delete_table(db.shorten_name('timeside_experiences_graphers')) + # Removing M2M table for field processors on 'Experience' + db.delete_table(db.shorten_name('timeside_experiences_processors')) - # Removing M2M table for field encoders on 'Experience' - db.delete_table(db.shorten_name('timeside_experiences_encoders')) + # Deleting model 'Processor' + db.delete_table('timeside_processors') models = { @@ -167,66 +146,50 @@ class Migration(SchemaMigration): 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) }, - 'timeside.analyzer': { - 'Meta': {'object_name': 'Analyzer', 'db_table': "'timeside_analyzers'"}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'parameters': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'pid': ('django.db.models.fields.CharField', [], {'max_length': '256'}), - 'status': ('django.db.models.fields.IntegerField', [], {'default': '1'}), - 'version': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}) - }, - 'timeside.encoder': { - 'Meta': {'object_name': 'Encoder', 'db_table': "'timeside_encoders'"}, - 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'db_column': "'file'"}), + 'timeside.collection': { + 'Meta': {'ordering': "['code']", 'object_name': 'Collection', 'db_table': "'timeside_collections'"}, + 'code': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), + 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'mime_type': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True'}), - 'parameters': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'pid': ('django.db.models.fields.CharField', [], {'max_length': '256'}), - 'status': ('django.db.models.fields.IntegerField', [], {'default': '1'}), - 'version': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}) + 'items': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'collections'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['timeside.Item']"}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}) }, 'timeside.experience': { 'Meta': {'object_name': 'Experience', 'db_table': "'timeside_experiences'"}, - 'analyzers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'experience'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['timeside.Analyzer']"}), - 'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'experience'", 'null': 'True', 'to': "orm['auth.User']"}), - 'begin_time': ('django.db.models.fields.FloatField', [], {'default': '0', 'blank': 'True'}), + 'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'experience'", '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'}), - 'encoders': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'experience'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['timeside.Encoder']"}), - 'end_time': ('django.db.models.fields.FloatField', [], {'blank': 'True'}), - 'graphers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'experience'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['timeside.Grapher']"}), - 'hdf5': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'db_column': "'hdf5'"}), - 'high_frequency': ('django.db.models.fields.FloatField', [], {'blank': 'True'}), 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'item': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'experience'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['timeside.Item']"}), - 'low_frequency': ('django.db.models.fields.FloatField', [], {'blank': 'True'}), + 'processors': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'experience'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['timeside.Processor']"}), 'status': ('django.db.models.fields.IntegerField', [], {'default': '1'}), 'title': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), - 'uuid': ('django.db.models.fields.CharField', [], {'max_length': '256'}) - }, - 'timeside.grapher': { - 'Meta': {'object_name': 'Grapher', 'db_table': "'timeside_graphers'"}, - 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'db_column': "'file'"}), - 'height': ('django.db.models.fields.IntegerField', [], {'default': '180'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'mime_type': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True'}), - 'parameters': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'pid': ('django.db.models.fields.CharField', [], {'max_length': '256'}), - 'status': ('django.db.models.fields.IntegerField', [], {'default': '1'}), - 'version': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}), - 'width': ('django.db.models.fields.IntegerField', [], {'default': '320'}) + 'uuid': ('django.db.models.fields.CharField', [], {'max_length': '512'}) }, 'timeside.item': { 'Meta': {'ordering': "['code']", 'object_name': 'Item', 'db_table': "'timeside_items'"}, 'code': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'experiences': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'items'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['timeside.Experience']"}), 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'blank': 'True'}), 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'mime_type': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True'}), 'sha1': ('django.db.models.fields.CharField', [], {'unique': 'True', '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'}) + }, + 'timeside.processor': { + 'Meta': {'object_name': 'Processor', 'db_table': "'timeside_processors'"}, + 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'db_column': "'file'"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'mime_type': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True'}), + 'parameters': ('jsonfield.fields.JSONField', [], {'blank': 'True'}), + 'pid': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'results': ('jsonfield.fields.JSONField', [], {'blank': 'True'}), + 'status': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'type': ('django.db.models.fields.CharField', [], {'default': "'none'", 'max_length': '64'}), + 'uuid': ('django.db.models.fields.CharField', [], {'max_length': '512'}), + 'version': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}) } } diff --git a/timeside/migrations/0002_auto__add_decoder__add_field_experience_decoder__add_field_experience_.py b/timeside/migrations/0002_auto__add_decoder__add_field_experience_decoder__add_field_experience_.py deleted file mode 100644 index 64f5e52..0000000 --- a/timeside/migrations/0002_auto__add_decoder__add_field_experience_decoder__add_field_experience_.py +++ /dev/null @@ -1,153 +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): - # Adding model 'Decoder' - db.create_table('timeside_decoders', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('pid', self.gf('django.db.models.fields.CharField')(max_length=256)), - ('parameters', self.gf('django.db.models.fields.TextField')(blank=True)), - ('version', self.gf('django.db.models.fields.CharField')(max_length=64, blank=True)), - ('status', self.gf('django.db.models.fields.IntegerField')(default=1)), - )) - db.send_create_signal('timeside', ['Decoder']) - - # Adding field 'Experience.decoder' - db.add_column('timeside_experiences', 'decoder', - self.gf('django.db.models.fields.related.ForeignKey')(related_name='experience', null=True, to=orm['timeside.Decoder']), - keep_default=False) - - # Adding field 'Experience.json' - db.add_column('timeside_experiences', 'json', - self.gf('django.db.models.fields.files.FileField')(default=1, max_length=1024, db_column='json'), - keep_default=False) - - - def backwards(self, orm): - # Deleting model 'Decoder' - db.delete_table('timeside_decoders') - - # Deleting field 'Experience.decoder' - db.delete_column('timeside_experiences', 'decoder_id') - - # Deleting field 'Experience.json' - db.delete_column('timeside_experiences', 'json') - - - 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.analyzer': { - 'Meta': {'object_name': 'Analyzer', 'db_table': "'timeside_analyzers'"}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'parameters': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'pid': ('django.db.models.fields.CharField', [], {'max_length': '256'}), - 'status': ('django.db.models.fields.IntegerField', [], {'default': '1'}), - 'version': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}) - }, - 'timeside.decoder': { - 'Meta': {'object_name': 'Decoder', 'db_table': "'timeside_decoders'"}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'parameters': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'pid': ('django.db.models.fields.CharField', [], {'max_length': '256'}), - 'status': ('django.db.models.fields.IntegerField', [], {'default': '1'}), - 'version': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}) - }, - 'timeside.encoder': { - 'Meta': {'object_name': 'Encoder', 'db_table': "'timeside_encoders'"}, - 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'db_column': "'file'"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'mime_type': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True'}), - 'parameters': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'pid': ('django.db.models.fields.CharField', [], {'max_length': '256'}), - 'status': ('django.db.models.fields.IntegerField', [], {'default': '1'}), - 'version': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}) - }, - 'timeside.experience': { - 'Meta': {'object_name': 'Experience', 'db_table': "'timeside_experiences'"}, - 'analyzers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'experience'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['timeside.Analyzer']"}), - 'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'experience'", 'null': 'True', 'to': "orm['auth.User']"}), - 'begin_time': ('django.db.models.fields.FloatField', [], {'default': '0', 'blank': 'True'}), - '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'}), - 'decoder': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'experience'", 'null': 'True', 'to': "orm['timeside.Decoder']"}), - 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'encoders': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'experience'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['timeside.Encoder']"}), - 'end_time': ('django.db.models.fields.FloatField', [], {'blank': 'True'}), - 'graphers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'experience'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['timeside.Grapher']"}), - 'hdf5': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'db_column': "'hdf5'"}), - 'high_frequency': ('django.db.models.fields.FloatField', [], {'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'item': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'experience'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['timeside.Item']"}), - 'json': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'db_column': "'json'"}), - 'low_frequency': ('django.db.models.fields.FloatField', [], {'blank': 'True'}), - 'status': ('django.db.models.fields.IntegerField', [], {'default': '1'}), - 'title': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), - 'uuid': ('django.db.models.fields.CharField', [], {'max_length': '256'}) - }, - 'timeside.grapher': { - 'Meta': {'object_name': 'Grapher', 'db_table': "'timeside_graphers'"}, - 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'db_column': "'file'"}), - 'height': ('django.db.models.fields.IntegerField', [], {'default': '180'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'mime_type': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True'}), - 'parameters': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'pid': ('django.db.models.fields.CharField', [], {'max_length': '256'}), - 'status': ('django.db.models.fields.IntegerField', [], {'default': '1'}), - 'version': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}), - 'width': ('django.db.models.fields.IntegerField', [], {'default': '320'}) - }, - 'timeside.item': { - 'Meta': {'ordering': "['code']", 'object_name': 'Item', 'db_table': "'timeside_items'"}, - 'code': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512'}), - 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'mime_type': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True'}), - 'sha1': ('django.db.models.fields.CharField', [], {'unique': 'True', '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'}) - } - } - - complete_apps = ['timeside'] \ No newline at end of file diff --git a/timeside/models.py b/timeside/models.py index 8a334e9..af55dec 100644 --- a/timeside/models.py +++ b/timeside/models.py @@ -1,33 +1,66 @@ # -*- coding: utf-8 -*- from django.db.models import * +from django.db import models from django.utils.translation import ugettext_lazy as _ from django.contrib.auth.models import User +import uuid import timeside +from timeside.analyzer.core import AnalyzerResultContainer +from jsonfield import JSONField + + app = 'timeside' +processors = timeside.core.processors(timeside.api.IProcessor) + STATUS = ((0, _('broken')), (1, _('pending')), (2, _('processing')), (3, _('done')), (4, _('ready'))) +PROCESSOR_TYPES = (('none', _('none')), ('decoder', _('decoder')), ('analyzer', _('analyzer')), + ('grapher', _('grapher')), ('encoder', _('encoder'))) + + +def get_mime_type(self, path): + return mimetypes.guess_type(path)[0] + + +def get_processor(self, pid): + for proc in processors: + if proc.id == pid: + return proc() + raise ValueError('Processor %s does not exists' % pid) + + class MetaCore: app_label = app +class Collection(Model): + + code = CharField(_('code'), unique=True, max_length=512) + title = CharField(_('title'), blank=True, max_length=512) + description = TextField(_('description'), blank=True) + items = ManyToManyField('Item', related_name="collections", verbose_name=_('items'), blank=True, null=True) + + class Meta(MetaCore): + db_table = app + '_collections' + ordering = ['code'] + verbose_name = _('collections') + + class Item(Model): code = CharField(_('code'), unique=True, max_length=512) title = CharField(_('title'), blank=True, max_length=512) - description = TextField(_('description'), blank=True) + description = TextField(_('description'), blank=True) file = FileField(_('file'), upload_to='items/%Y/%m/%d', blank=True, max_length=1024) url = URLField(_('URL'), blank=True, max_length=1024) sha1 = CharField(_('sha1'), unique=True, blank=True, max_length=512) - mime_type = CharField(_('mime_type'), null=True, max_length=256) - - def set_mime_type(self): - if self.file: - self.mime_type = mimetypes.guess_type(self.file.path)[0] + mime_type = CharField(_('mime type'), null=True, max_length=256) + experiences = ManyToManyField('Experience', related_name="items", verbose_name=_('experiences'), blank=True, null=True) class Meta(MetaCore): db_table = app + '_items' @@ -37,88 +70,72 @@ class Item(Model): def __unicode__(self): return self.code - -class Processor(Model): - - pid = CharField(_('pid'), max_length=256) - parameters = TextField(_('parameters'), blank=True) - version = CharField(_('version'), max_length=64, blank=True) - status = IntegerField(_('status'), choices=STATUS, default=1) - - def save(self): - super(Processor, self).save() - if not self.version: - self.version = timeside.__version__ - - class Meta(MetaCore): - abstract=True - - -class Decoder(Processor): - - class Meta(MetaCore): - db_table = app + '_decoders' - verbose_name = _('decoder') - - -class Analyzer(Processor): - - class Meta(MetaCore): - db_table = app + '_analyzers' - verbose_name = _('analyzer') - - -class Grapher(Processor): - - file = FileField(_('file'), upload_to='cache/grapher/%Y/%m/%d', db_column="file", max_length=1024) - mime_type = CharField(_('mime_type'), null=True, max_length=256) - height = IntegerField(_('height'), default=180) - width = IntegerField(_('width'), default=320) - - class Meta(MetaCore): - db_table = app + '_graphers' - verbose_name = _('grapher') - - -class Encoder(Processor): - - file = FileField(_('file'), upload_to='cache/encoder/%Y/%m/%d', db_column="file", max_length=1024) - mime_type = CharField(_('mime_type'), null=True, max_length=256) - - class Meta(MetaCore): - db_table = app + '_encoders' - verbose_name = _('encoder') + def save(self, **kwargs): + super(Item, self).save(**kwargs) + if self.file: + self.mime_type = get_mime_type(self.file.path) class Experience(Model): - item = ForeignKey(Item, related_name='experience', verbose_name=_('item'), null=True, on_delete=SET_NULL) title = CharField(_('title'), blank=True, max_length=512) description = TextField(_('description'), blank=True) date_added = DateTimeField(_('date added'), auto_now_add=True) date_modified = DateTimeField(_('date modified'), auto_now=True, null=True) status = IntegerField(_('status'), choices=STATUS, default=1) - uuid = CharField(_('uuid'), max_length=256) - author = ForeignKey(User, related_name="experience", verbose_name=_('author'), blank=True, null=True) - - decoder = ForeignKey(Decoder, related_name="experience", verbose_name=_('decoder'), null=True) - analyzers = ManyToManyField(Analyzer, related_name="experience", verbose_name=_('analyzers'), blank=True, null=True) - graphers = ManyToManyField(Grapher, related_name="experience", verbose_name=_('graphers'), blank=True, null=True) - encoders = ManyToManyField(Encoder, related_name="experience", verbose_name=_('encoders'), blank=True, null=True) - - begin_time = FloatField(_('begin time'), default=0, blank=True) - end_time = FloatField(_('end time'), blank=True) - low_frequency = FloatField(_('low frequency'), blank=True) - high_frequency = FloatField(_('highh frequency'), blank=True) - - hdf5 = FileField(_('hdf5_file'), upload_to='cache/hdf5/%Y/%m/%d', db_column="hdf5", max_length=1024) - json = FileField(_('json_file'), upload_to='cache/json/%Y/%m/%d', db_column="json", max_length=1024) - + uuid = CharField(_('uuid'), max_length=512) + author = ForeignKey(User, related_name="experience", verbose_name=_('author'), blank=True, null=True, on_delete=models.SET_NULL) + processors = ManyToManyField('Processor', related_name="experience", verbose_name=_('processors'), blank=True, null=True) + class Meta(MetaCore): db_table = app + '_experiences' verbose_name = _('experience') - def results(self): - pass + def save(self, **kwargs): + super(Experience, self).save(**kwargs) + if not self.uuid: + self.uuid = uuid.uuid4() + + def run(self, collection): + for item in collections.item.all(): + item.experiences.add(self) + pipe = FileDecoder(item.file) + proc_dict = {} + for processor in self.processors: + proc = get_processor(processor.id) + #TODO: add parameters + proc_dict[processor] = proc + pipe = pipe | proc + pipe.run() + for processor in proc_dict.keys(): + processor.file = settings.MEDIA_ROOT + processor.uuid + '.' + processor.mime_type.split('/')[1] + proc_dict[processor].results.to_hdf5(processor.file) + processor.save() + del pipe + +class Processor(Model): + + pid = CharField(_('pid'), max_length=256) + type = CharField(_('type'), choices=PROCESSOR_TYPES, default='none', max_length=64) + parameters = JSONField(_('parameters'), blank=True) + version = CharField(_('version'), max_length=64, blank=True) + uuid = CharField(_('uuid'), max_length=512) + status = IntegerField(_('status'), choices=STATUS, default=1) + file = FileField(_('file'), upload_to='cache/%Y/%m/%d', db_column="file", max_length=1024) + mime_type = CharField(_('mime type'), null=True, max_length=256) + results = JSONField(_('results'), blank=True) + + class Meta(MetaCore): + db_table = app + '_processors' + verbose_name = _('processor') + + def save(self, **kwargs): + super(Processor, self).save(**kwargs) + if not self.version: + self.version = timeside.__version__ + if self.file: + self.mime_type = get_mime_type(self.file.path) + if not self.uuid: + self.uuid = uuid.uuid4() diff --git a/timeside/views.py b/timeside/views.py index 91e5eb0..f74ddd8 100644 --- a/timeside/views.py +++ b/timeside/views.py @@ -6,11 +6,15 @@ from django.views.generic import * from timeside.models import * -decoders = timeside.core.processors(timeside.api.IDecoder) -analyzers = timeside.core.processors(timeside.api.IAnalyzer) -graphers = timeside.core.processors(timeside.api.IGrapher) -encoders = timeside.core.processors(timeside.api.IEncoder) -value_analyzers = timeside.core.processors(timeside.api.IValueAnalyzer) +def stream_from_file(__file): + chunk_size = 0x10000 + f = open(__file, 'r') + while True: + __chunk = f.read(chunk_size) + if not len(__chunk): + f.close() + break + yield __chunk class IndexView(ListView): @@ -31,4 +35,32 @@ class IndexView(ListView): class ItemGrapherView(DetailView): model = Item + mime_type = 'image/png' + +class ItemJsonAnalyzerView(DetailView): + + model = Item + + def results(self): + item = self.get_object() + experience = Experience.objects.get(id=experience_id) + results = AnalyzerResult() + return results.from_hdf5(self.hdf5).to_json() + + def get_context_data(self, **kwargs): + context = super(ItemJsonAnalyzerView, self).get_context_data(**kwargs) + item = self.get_object() + context['experiences'] = item.experiences.all().filter(author=self.request.user) + return context + + def render_to_response(self, context): + mimetype = mimetypes.guess_type(document.file.path)[0] + extension = mimetypes.guess_extension(mimetype) + response = HttpResponse(results, mimetype=mimetype) + response['Content-Disposition'] = "attachment; filename=%s%s" % \ + (document.title.encode('utf8'), extension) + return response + + @jsonrpc_method('timeside.stop_conference'): + def stop(request, public_id): -- 2.39.5