matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactored the converter backend system

Browse Source
This commit is contained in:
Roberto Rosario
2011-07-13 22:53:33 -04:00
parent 082c3e699c
commit 415f0c8daa
16 changed files with 317 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/sources/models.py
View File

@@ -4,14 +4,12 @@ from django.contrib.contenttypes.models import ContentType
from django.contrib.contenttypes import generic
from documents.models import DocumentType
from documents.conf.settings import AVAILABLE_TRANSFORMATIONS
from documents.managers import RecentDocumentManager
from metadata.models import MetadataType
from converter.api import backend
from sources.managers import SourceTransformationManager
available_transformations = ([(name, data['label']) for name, data in AVAILABLE_TRANSFORMATIONS.items()])
SOURCE_UNCOMPRESS_CHOICE_Y = 'y'
SOURCE_UNCOMPRESS_CHOICE_N = 'n'
SOURCE_UNCOMPRESS_CHOICE_ASK = 'a'
@@ -164,7 +162,7 @@ class SourceTransformation(models.Model):
object_id = models.PositiveIntegerField()
content_object = generic.GenericForeignKey('content_type', 'object_id')
order = models.PositiveIntegerField(default=0, blank=True, null=True, verbose_name=_(u'order'), db_index=True)
transformation = models.CharField(choices=available_transformations, max_length=128, verbose_name=_(u'transformation'))
transformation = models.CharField(choices=backend.get_available_transformations_labels(), max_length=128, verbose_name=_(u'transformation'))
arguments = models.TextField(blank=True, null=True, verbose_name=_(u'arguments'), help_text=_(u'Use dictionaries to indentify arguments, example: {\'degrees\':90}'))
objects = SourceTransformationManager()

17
apps/sources/staging.py
View File

@@ -8,7 +8,6 @@ from django.utils.translation import ugettext
from django.contrib import messages
from django.utils.translation import ugettext_lazy as _
from converter import TRANFORMATION_CHOICES
from converter.api import convert, cache_cleanup
DEFAULT_STAGING_DIRECTORY = u'/tmp'
@@ -136,13 +135,13 @@ class StagingFile(object):
def get_transformation_string(transformations):
transformation_list = []
errors = []
for transformation in transformations:
try:
if transformation['name'] in TRANFORMATION_CHOICES:
output = TRANFORMATION_CHOICES[transformation['name']] % eval(transformation['arguments'])
transformation_list.append(output)
except Exception, e:
errors.append(e)
#for transformation in transformations:
# try:
# if transformation['name'] in TRANFORMATION_CHOICES:
# output = TRANFORMATION_CHOICES[transformation['name']] % eval(transformation['arguments'])
# transformation_list.append(output)
# except Exception, e:
# errors.append(e)
tranformation_string = ' '.join(transformation_list)
#tranformation_string = ' '.join(transformation_list)
return tranformation_string, errors