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

PEP8, pylint and django-lint cleanups

Browse Source
This commit is contained in:
Roberto Rosario
2011-04-08 02:09:39 -04:00
parent 1b6806f7d1
commit 71a3c218f4
21 changed files with 253 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/ocr/views.py
+73 -72
View File
@@ -1,7 +1,7 @@
import datetime
from django.http import HttpResponseRedirect
from django.shortcuts import render_to_response, get_object_or_404, redirect
from django.shortcuts import render_to_response, get_object_or_404
from django.template import RequestContext
from django.contrib import messages
from django.views.generic.list_detail import object_list
@@ -16,11 +16,12 @@ from ocr import PERMISSION_OCR_DOCUMENT, PERMISSION_OCR_DOCUMENT_DELETE, \
from models import DocumentQueue, QueueDocument
from literals import QUEUEDOCUMENT_STATE_PENDING, \
QUEUEDOCUMENT_STATE_PROCESSING, QUEUEDOCUMENT_STATE_ERROR, \
DOCUMENTQUEUE_STATE_STOPPED, DOCUMENTQUEUE_STATE_ACTIVE
QUEUEDOCUMENT_STATE_PROCESSING, DOCUMENTQUEUE_STATE_STOPPED, \
DOCUMENTQUEUE_STATE_ACTIVE
from exceptions import AlreadyQueued
from api import clean_pages
def _display_thumbnail(ocr_document):
try:
preview_url = reverse('document_preview', args=[ocr_document.document.pk])
@@ -32,7 +33,7 @@ def _display_thumbnail(ocr_document):
def queue_document_list(request, queue_name='default'):
check_permissions(request.user, 'ocr', [PERMISSION_OCR_DOCUMENT])
document_queue = get_object_or_404(DocumentQueue, name=queue_name)
return object_list(
@@ -40,30 +41,30 @@ def queue_document_list(request, queue_name='default'):
queryset=document_queue.queuedocument_set.all(),
template_name='generic_list.html',
extra_context={
'title':_(u'documents in queue: %s') % document_queue,
'hide_object':True,
'object':document_queue,
'object_name':_(u'document queue'),
'extra_columns':[
{'name':'document', 'attribute': lambda x: '<a href="%s">%s</a>' % (x.document.get_absolute_url(), x.document) if hasattr(x, 'document') else _(u'Missing document.')},
{'name':_(u'thumbnail'), 'attribute': lambda x: _display_thumbnail(x) },
{'name':'submitted', 'attribute': lambda x: unicode(x.datetime_submitted).split('.')[0], 'keep_together':True},
{'name':'delay', 'attribute':'delay'},
{'name':'state', 'attribute': lambda x: x.get_state_display()},
{'name':'node', 'attribute':'node_name'},
{'name':'result', 'attribute':'result'},
'title': _(u'documents in queue: %s') % document_queue,
'hide_object': True,
'object': document_queue,
'object_name': _(u'document queue'),
'extra_columns': [
{'name': 'document', 'attribute': lambda x: '<a href="%s">%s</a>' % (x.document.get_absolute_url(), x.document) if hasattr(x, 'document') else _(u'Missing document.')},
{'name': _(u'thumbnail'), 'attribute': lambda x: _display_thumbnail(x)},
{'name': 'submitted', 'attribute': lambda x: unicode(x.datetime_submitted).split('.')[0], 'keep_together':True},
{'name': 'delay', 'attribute': 'delay'},
{'name': 'state', 'attribute': lambda x: x.get_state_display()},
{'name': 'node', 'attribute': 'node_name'},
{'name': 'result', 'attribute': 'result'},
],
'multi_select_as_buttons':True,
'sidebar_subtemplates_list':[
'multi_select_as_buttons': True,
'sidebar_subtemplates_list': [
{
'title':_(u'document queue properties'),
'name':'generic_subtemplate.html',
'content':_(u'Current state: %s') % document_queue.get_state_display(),
'title': _(u'document queue properties'),
'name': 'generic_subtemplate.html',
'content': _(u'Current state: %s') % document_queue.get_state_display(),
}],
},
)
)
def queue_document_delete(request, queue_document_id=None, queue_document_id_list=[]):
check_permissions(request.user, 'ocr', [PERMISSION_OCR_DOCUMENT_DELETE])
@@ -76,7 +77,7 @@ def queue_document_delete(request, queue_document_id=None, queue_document_id_lis
else:
messages.error(request, _(u'Must provide at least one queue document.'))
return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/'))
next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', None)))
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', None)))
@@ -85,57 +86,57 @@ def queue_document_delete(request, queue_document_id=None, queue_document_id_lis
try:
queue_document.delete()
messages.success(request, _(u'Document: %(document)s deleted successfully.') % {
'document':queue_document.document})
'document': queue_document.document})
except Exception, e:
messages.error(request, _(u'Error deleting document: %(document)s; %(error)s') % {
'document':queue_document, 'error':e})
'document': queue_document, 'error': e})
return HttpResponseRedirect(next)
context = {
'next':next,
'previous':previous,
'delete_view':True
'next': next,
'previous': previous,
'delete_view': True
}
if len(queue_documents) == 1:
context['object'] = queue_documents[0]
context['object'] = queue_documents[0]
context['title'] = _(u'Are you sure you with to delete from queue document: %s?') % ', '.join([unicode(d) for d in queue_documents])
elif len(queue_documents) > 1:
context['title'] = _(u'Are you sure you with to delete from queue documents: %s?') % ', '.join([unicode(d) for d in queue_documents])
return render_to_response('generic_confirm.html', context,
context_instance=RequestContext(request))
def queue_document_multiple_delete(request):
return queue_document_delete(request, queue_document_id_list=request.GET.get('id_list', []))
def submit_document(request, document_id):
check_permissions(request.user, 'ocr', [PERMISSION_OCR_DOCUMENT])
document = get_object_or_404(Document, pk=document_id)
return submit_document_to_queue(request, document=document,
return submit_document_to_queue(request, document=document,
post_submit_redirect=request.META['HTTP_REFERER'])
def submit_document_to_queue(request, document, post_submit_redirect=None):
"""This view is meant to be reusable"""
try:
document_queue = DocumentQueue.objects.queue_document(document)
messages.success(request, _(u'Document: %(document)s was added to the OCR queue: %(queue)s.') % {
'document':document, 'queue':document_queue.label})
'document': document, 'queue': document_queue.label})
except AlreadyQueued:
messages.warning(request, _(u'Document: %(document)s is already queued.') % {
'document':document})
'document': document})
except Exception, e:
messages.error(request, e)
if post_submit_redirect:
return HttpResponseRedirect(post_submit_redirect)
def re_queue_document(request, queue_document_id=None, queue_document_id_list=[]):
check_permissions(request.user, 'ocr', [PERMISSION_OCR_DOCUMENT])
@@ -149,7 +150,7 @@ def re_queue_document(request, queue_document_id=None, queue_document_id_list=[]
else:
messages.error(request, _(u'Must provide at least one queue document.'))
return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/'))
next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', None)))
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', None)))
@@ -175,26 +176,26 @@ def re_queue_document(request, queue_document_id=None, queue_document_id_list=[]
queue_document.node_name = None
queue_document.save()
messages.success(request, _(u'Document: %(document)s was re-queued to the OCR queue: %(queue)s') % {
'document':queue_document.document, 'queue':queue_document.document_queue.label})
'document': queue_document.document, 'queue': queue_document.document_queue.label})
else:
messages.success(request, _(u'Document: %(document)s can\'t be re-queued.') % {
'document':queue_document.document})
'document': queue_document.document})
except Exception, e:
messages.error(request, e)
return HttpResponseRedirect(next)
context = {
'next':next,
'previous':previous,
'next': next,
'previous': previous,
}
if len(queue_documents) == 1:
context['object'] = queue_documents[0]
context['object'] = queue_documents[0]
context['title'] = _(u'Are you sure you with to re-queue document: %s?') % ', '.join([unicode(d) for d in queue_documents])
elif len(queue_documents) > 1:
context['title'] = _(u'Are you sure you with to re-queue documents: %s?') % ', '.join([unicode(d) for d in queue_documents])
return render_to_response('generic_confirm.html', context,
context_instance=RequestContext(request))
@@ -207,9 +208,9 @@ def document_queue_disable(request, document_queue_id):
check_permissions(request.user, 'ocr', [PERMISSION_OCR_QUEUE_ENABLE_DISABLE])
next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', None)))
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', None)))
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', None)))
document_queue = get_object_or_404(DocumentQueue, pk=document_queue_id)
if document_queue.state == DOCUMENTQUEUE_STATE_STOPPED:
messages.warning(request, _(u'Document queue: %s, already stopped.') % document_queue)
return HttpResponseRedirect(previous)
@@ -219,22 +220,22 @@ def document_queue_disable(request, document_queue_id):
document_queue.save()
messages.success(request, _(u'Document queue: %s, stopped successfully.') % document_queue)
return HttpResponseRedirect(next)
return render_to_response('generic_confirm.html', {
'object':document_queue,
'title':_(u'Are you sure you wish to disable document queue: %s') % document_queue,
'next':next,
'previous':previous,
}, context_instance=RequestContext(request))
'object': document_queue,
'title': _(u'Are you sure you wish to disable document queue: %s') % document_queue,
'next': next,
'previous': previous,
}, context_instance=RequestContext(request))
def document_queue_enable(request, document_queue_id):
check_permissions(request.user, 'ocr', [PERMISSION_OCR_QUEUE_ENABLE_DISABLE])
next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', None)))
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', None)))
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', None)))
document_queue = get_object_or_404(DocumentQueue, pk=document_queue_id)
if document_queue.state == DOCUMENTQUEUE_STATE_ACTIVE:
messages.warning(request, _(u'Document queue: %s, already active.') % document_queue)
return HttpResponseRedirect(previous)
@@ -244,12 +245,12 @@ def document_queue_enable(request, document_queue_id):
document_queue.save()
messages.success(request, _(u'Document queue: %s, activated successfully.') % document_queue)
return HttpResponseRedirect(next)
return render_to_response('generic_confirm.html', {
'object':document_queue,
'title':_(u'Are you sure you wish to activate document queue: %s') % document_queue,
'next':next,
'previous':previous,
'object': document_queue,
'title': _(u'Are you sure you wish to activate document queue: %s') % document_queue,
'next': next,
'previous': previous,
}, context_instance=RequestContext(request))
@@ -258,18 +259,18 @@ def all_document_ocr_cleanup(request):
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', None)))
next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', None)))
if request.method != 'POST':
return render_to_response('generic_confirm.html', {
'previous':previous,
'next':next,
'message':_(u'On large databases this operation may take some time to execute.'),
'previous': previous,
'next': next,
'message': _(u'On large databases this operation may take some time to execute.'),
}, context_instance=RequestContext(request))
else:
else:
try:
clean_pages()
messages.success(request, _(u'Document pages content clean up complete.'))
except Exception, e:
messages.error(request, _(u'Document pages content clean up error: %s') % e)
return HttpResponseRedirect(next)