diff --git a/pandora/document/managers.py b/pandora/document/managers.py index f97f7c6ac..e953a0605 100644 --- a/pandora/document/managers.py +++ b/pandora/document/managers.py @@ -2,6 +2,7 @@ # vi:si:et:sw=4:sts=4:ts=4 from django.db.models import Q, Manager +from ox.django.query import QuerySet def parseCondition(condition, user): ''' @@ -91,7 +92,7 @@ def parseConditions(conditions, operator, user): class DocumentManager(Manager): def get_query_set(self): - return super(DocumentManager, self).get_query_set() + return QuerySet(self.model) def find(self, data, user): ''' diff --git a/pandora/document/migrations/0006_add_type_dimension.py b/pandora/document/migrations/0006_add_type_dimension.py new file mode 100644 index 000000000..5e35424d8 --- /dev/null +++ b/pandora/document/migrations/0006_add_type_dimension.py @@ -0,0 +1,127 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding field 'Document.type' + db.add_column('document_document', 'type', + self.gf('django.db.models.fields.CharField')(null=True, max_length=1024), + keep_default=False) + + # Adding field 'Document.dimensions_sort' + db.add_column('document_document', 'dimensions_sort', + self.gf('django.db.models.fields.CharField')(default='', max_length=512), + keep_default=False) + + + def backwards(self, orm): + # Deleting field 'Document.type' + db.delete_column('document_document', 'type') + + # Deleting field 'Document.dimensions_sort' + db.delete_column('document_document', 'dimensions_sort') + + + 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': '255'}), + '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': '255', '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': '255'}), + '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': '255'}) + }, + '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'}) + }, + 'document.document': { + 'Meta': {'unique_together': "(('user', 'name', 'extension'),)", 'object_name': 'Document'}, + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'default': "''"}), + 'description_sort': ('django.db.models.fields.CharField', [], {'max_length': '512'}), + 'dimensions_sort': ('django.db.models.fields.CharField', [], {'max_length': '512'}), + 'extension': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'file': ('django.db.models.fields.files.FileField', [], {'default': 'None', 'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'height': ('django.db.models.fields.IntegerField', [], {'default': '-1'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'items': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'documents'", 'symmetrical': 'False', 'through': "orm['document.ItemProperties']", 'to': "orm['item.Item']"}), + 'matches': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'name_sort': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'oshash': ('django.db.models.fields.CharField', [], {'max_length': '16', 'unique': 'True', 'null': 'True'}), + 'pages': ('django.db.models.fields.IntegerField', [], {'default': '-1'}), + 'ratio': ('django.db.models.fields.FloatField', [], {'default': '1'}), + 'size': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'type': ('django.db.models.fields.CharField', [], {'null': 'True', 'max_length': '1024'}), + 'uploading': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'files'", 'to': "orm['auth.User']"}), + 'width': ('django.db.models.fields.IntegerField', [], {'default': '-1'}) + }, + 'document.itemproperties': { + 'Meta': {'unique_together': "(('item', 'document'),)", 'object_name': 'ItemProperties'}, + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'default': "''"}), + 'document': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'descriptions'", 'to': "orm['document.Document']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'index': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'item': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['item.Item']"}), + 'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}) + }, + 'item.item': { + 'Meta': {'object_name': 'Item'}, + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'data': ('ox.django.fields.DictField', [], {'default': '{}'}), + 'external_data': ('ox.django.fields.DictField', [], {'default': '{}'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'items'", 'blank': 'True', 'to': "orm['auth.Group']"}), + 'icon': ('django.db.models.fields.files.ImageField', [], {'default': 'None', 'max_length': '100', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'itemId': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128', 'blank': 'True'}), + 'json': ('ox.django.fields.DictField', [], {'default': '{}'}), + 'level': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), + 'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'oxdbId': ('django.db.models.fields.CharField', [], {'max_length': '42', 'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'poster': ('django.db.models.fields.files.ImageField', [], {'default': 'None', 'max_length': '100', 'blank': 'True'}), + 'poster_frame': ('django.db.models.fields.FloatField', [], {'default': '-1'}), + 'poster_height': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'poster_source': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'poster_width': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'rendered': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}), + 'stream_aspect': ('django.db.models.fields.FloatField', [], {'default': '1.3333333333333333'}), + 'stream_info': ('ox.django.fields.DictField', [], {'default': '{}'}), + 'torrent': ('django.db.models.fields.files.FileField', [], {'default': 'None', 'max_length': '1000', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'items'", 'null': 'True', 'to': "orm['auth.User']"}) + } + } + + complete_apps = ['document'] diff --git a/pandora/document/models.py b/pandora/document/models.py index 24c69cead..6df98acaf 100644 --- a/pandora/document/models.py +++ b/pandora/document/models.py @@ -41,6 +41,9 @@ class Document(models.Model): description = models.TextField(default="") oshash = models.CharField(max_length=16, unique=True, null=True) + #type of document, i.e. booklet etc + type = models.CharField(max_length=1024, null=True) + file = models.FileField(default=None, blank=True,null=True, upload_to=lambda f, x: f.path(x)) objects = managers.DocumentManager() @@ -48,6 +51,7 @@ class Document(models.Model): name_sort = models.CharField(max_length=255) description_sort = models.CharField(max_length=512) + dimensions_sort = models.CharField(max_length=512) items = models.ManyToManyField(Item, through='ItemProperties', related_name='documents') @@ -61,6 +65,11 @@ class Document(models.Model): self.name_sort = ox.sort_string(self.name or u'')[:255].lower() self.description_sort = ox.sort_string(self.description or u'')[:512].lower() + if self.extension == 'pdf': + self.dimension_sort = ox.sort_string('0') + ox.sort_string('%d' % self.pages) + else: + resolution_sort = self.width * self.height + self.dimension_sort = ox.sort_string('1') + ox.sort_string('%d' % resolution_sort) super(Document, self).save(*args, **kwargs) self.update_matches() @@ -111,12 +120,24 @@ class Document(models.Model): self.name = name elif key == 'description' and not item: self.description = ox.sanitize_html(data['description']) + elif key == 'type': + if not data['type']: + self.type = None + else: + self.type = ox.sanitize_html(data['type']) if item: p, created = ItemProperties.objects.get_or_create(item=item, document=self) if 'description' in data: p.description = ox.sanitize_html(data['description']) p.save() + @property + def dimensions(self): + if self.extension == 'pdf': + return self.pages + else: + return self.resolution + @property def resolution(self): return [self.width, self.height] @@ -125,19 +146,17 @@ class Document(models.Model): if not keys: keys=[ 'description', + 'dimensions', 'editable', 'id', 'name', 'extension', 'oshash', 'size', + 'type', 'ratio', - 'user' + 'user', ] - if self.extension == 'pdf': - keys.append('pages') - else: - keys.append('resolution') response = {} _map = { } @@ -149,7 +168,7 @@ class Document(models.Model): elif key == 'user': response[key] = self.user.username elif hasattr(self, _map.get(key, key)): - response[key] = getattr(self, _map.get(key,key)) + response[key] = getattr(self, _map.get(key,key)) or '' if item: d = self.descriptions.filter(item=item) if d.exists(): diff --git a/pandora/document/views.py b/pandora/document/views.py index 1a511d1bc..553978f3e 100644 --- a/pandora/document/views.py +++ b/pandora/document/views.py @@ -8,6 +8,7 @@ from ox.django.decorators import login_required_json from ox.django.http import HttpFileResponse from ox.django.shortcuts import render_to_json_response, get_object_or_404_json, json_response from django import forms +from django.db.models import Sum from item import utils from item.models import Item @@ -85,6 +86,8 @@ def _order_query(qs, sort): key = { 'name': 'name_sort', 'description': 'description_sort', + 'dimensions': 'dimensions_sort', + 'index': 'items__itemproperties__index', }.get(e['key'], e['key']) if key == 'resolution': order_by.append('%swidth'%operator) @@ -93,7 +96,7 @@ def _order_query(qs, sort): order = '%s%s' % (operator, key) order_by.append(order) if order_by: - qs = qs.order_by(*order_by) + qs = qs.order_by(*order_by, nulls_last=True) qs = qs.distinct() return qs @@ -154,7 +157,11 @@ def findDocuments(request): ids = [i.get_id() for i in qs] response['data']['positions'] = utils.get_positions(ids, query['positions']) else: + r = qs.aggregate( + Sum('size') + ) response['data']['items'] = qs.count() + response['data']['size'] = r['size__sum'] return render_to_json_response(response) actions.register(findDocuments)