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

Import cleanups, reorganization, PEP8 cleanups

Browse Source
This commit is contained in:
Roberto Rosario
2014-10-02 02:01:08 -04:00
parent 1c50bca38a
commit 74cf4c413f
28 changed files with 119 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mayan/apps/ocr/__init__.py
View File

@@ -18,15 +18,15 @@ from statistics.classes import StatisticNamespace
from south.signals import post_migrate
from .exceptions import AlreadyQueued
from .links import (submit_document, submit_document_multiple,
re_queue_multiple_document, queue_document_multiple_delete,
document_queue_disable, document_queue_enable,
all_document_ocr_cleanup, queue_document_list,
ocr_tool_link)
from .literals import QUEUEDOCUMENT_STATE_PENDING, QUEUEDOCUMENT_STATE_PROCESSING
from .links import (all_document_ocr_cleanup, document_queue_disable,
document_queue_enable, ocr_tool_link, queue_document_list,
queue_document_multiple_delete, re_queue_multiple_document,
submit_document, submit_document_multiple)
from .literals import (QUEUEDOCUMENT_STATE_PENDING,
QUEUEDOCUMENT_STATE_PROCESSING)
from .models import DocumentQueue
from .permissions import PERMISSION_OCR_DOCUMENT
from .settings import (AUTOMATIC_OCR, QUEUE_PROCESSING_INTERVAL)
from .settings import AUTOMATIC_OCR, QUEUE_PROCESSING_INTERVAL
from .statistics import OCRStatistics
from .tasks import task_process_document_queues

4
mayan/apps/ocr/api.py
View File

@@ -14,8 +14,8 @@ from converter.api import convert
from documents.models import DocumentPage
from .exceptions import UnpaperError
from .literals import (DEFAULT_OCR_FILE_FORMAT, UNPAPER_FILE_FORMAT,
DEFAULT_OCR_FILE_EXTENSION)
from .literals import (DEFAULT_OCR_FILE_EXTENSION, DEFAULT_OCR_FILE_FORMAT,
UNPAPER_FILE_FORMAT)
from .parsers import parse_document_page
from .parsers.exceptions import ParserError, ParserUnknownFile
from .runtime import language_backend, ocr_backend

7
mayan/apps/ocr/links.py
View File

@@ -2,9 +2,10 @@ from __future__ import absolute_import
from django.utils.translation import ugettext_lazy as _
from .permissions import (PERMISSION_OCR_DOCUMENT,
PERMISSION_OCR_DOCUMENT_DELETE, PERMISSION_OCR_QUEUE_ENABLE_DISABLE,
PERMISSION_OCR_CLEAN_ALL_PAGES)
from .permissions import (PERMISSION_OCR_CLEAN_ALL_PAGES,
PERMISSION_OCR_DOCUMENT,
PERMISSION_OCR_DOCUMENT_DELETE,
PERMISSION_OCR_QUEUE_ENABLE_DISABLE)
submit_document = {'text': _('Submit to OCR queue'), 'view': 'ocr:submit_document', 'args': 'object.id', 'famfam': 'hourglass_add', 'permissions': [PERMISSION_OCR_DOCUMENT]}
submit_document_multiple = {'text': _('Submit to OCR queue'), 'view': 'ocr:submit_document_multiple', 'famfam': 'hourglass_add', 'permissions': [PERMISSION_OCR_DOCUMENT]}

6
mayan/apps/ocr/models.py
View File

@@ -9,9 +9,9 @@ from django.utils.translation import ugettext_lazy as _
from documents.models import Document
from .exceptions import ReQueueError
from .literals import (DOCUMENTQUEUE_STATE_CHOICES,
QUEUEDOCUMENT_STATE_PENDING, QUEUEDOCUMENT_STATE_CHOICES,
QUEUEDOCUMENT_STATE_PROCESSING, DOCUMENTQUEUE_STATE_ACTIVE)
from .literals import (DOCUMENTQUEUE_STATE_ACTIVE, DOCUMENTQUEUE_STATE_CHOICES,
QUEUEDOCUMENT_STATE_CHOICES, QUEUEDOCUMENT_STATE_PENDING,
QUEUEDOCUMENT_STATE_PROCESSING)
from .managers import DocumentQueueManager

8
mayan/apps/ocr/tasks.py
View File

@@ -14,10 +14,10 @@ from job_processor.api import process_job
from lock_manager import Lock, LockError
from .api import do_document_ocr
from .literals import (QUEUEDOCUMENT_STATE_PENDING,
QUEUEDOCUMENT_STATE_PROCESSING, DOCUMENTQUEUE_STATE_ACTIVE,
QUEUEDOCUMENT_STATE_ERROR)
from .models import QueueDocument, DocumentQueue
from .literals import (DOCUMENTQUEUE_STATE_ACTIVE, QUEUEDOCUMENT_STATE_ERROR,
QUEUEDOCUMENT_STATE_PENDING,
QUEUEDOCUMENT_STATE_PROCESSING)
from .models import DocumentQueue, QueueDocument
from .settings import NODE_CONCURRENT_EXECUTION, REPLICATION_DELAY
LOCK_EXPIRE = 60 * 2 # Lock expires in 2 minutes

14
mayan/apps/ocr/views.py
View File

@@ -3,7 +3,7 @@ from __future__ import absolute_import
from django.contrib import messages
from django.core.exceptions import PermissionDenied
from django.http import HttpResponseRedirect
from django.shortcuts import render_to_response, get_object_or_404
from django.shortcuts import get_object_or_404, render_to_response
from django.template import RequestContext
from django.utils.translation import ugettext_lazy as _
@@ -15,12 +15,14 @@ from permissions.models import Permission
from .api import clean_pages
from .exceptions import AlreadyQueued, ReQueueError
from .literals import (QUEUEDOCUMENT_STATE_PROCESSING,
DOCUMENTQUEUE_STATE_STOPPED, DOCUMENTQUEUE_STATE_ACTIVE)
from .literals import (DOCUMENTQUEUE_STATE_ACTIVE,
DOCUMENTQUEUE_STATE_STOPPED,
QUEUEDOCUMENT_STATE_PROCESSING)
from .models import DocumentQueue, QueueDocument
from .permissions import (PERMISSION_OCR_DOCUMENT,
PERMISSION_OCR_DOCUMENT_DELETE, PERMISSION_OCR_QUEUE_ENABLE_DISABLE,
PERMISSION_OCR_CLEAN_ALL_PAGES)
from .permissions import (PERMISSION_OCR_CLEAN_ALL_PAGES,
PERMISSION_OCR_DOCUMENT,
PERMISSION_OCR_DOCUMENT_DELETE,
PERMISSION_OCR_QUEUE_ENABLE_DISABLE)
def queue_document_list(request, queue_name='default'):