PEP8 cleanups.
This commit is contained in:
@@ -27,16 +27,31 @@ def task_check_delete_periods():
|
||||
logger.info('Executing')
|
||||
|
||||
for document_type in DocumentType.objects.all():
|
||||
logger.info('Checking deletion period of document type: %s', document_type)
|
||||
logger.info(
|
||||
'Checking deletion period of document type: %s', document_type
|
||||
)
|
||||
if document_type.delete_time_period and document_type.delete_time_unit:
|
||||
delta = timedelta(**{document_type.delete_time_unit: document_type.delete_time_period})
|
||||
logger.info('Document type: %s, has a deletion period delta of: %s', document_type, delta)
|
||||
delta = timedelta(
|
||||
**{
|
||||
document_type.delete_time_unit: document_type.delete_time_period
|
||||
}
|
||||
)
|
||||
logger.info(
|
||||
'Document type: %s, has a deletion period delta of: %s',
|
||||
document_type, delta
|
||||
)
|
||||
for document in DeletedDocument.objects.filter(document_type=document_type):
|
||||
if now() > document.deleted_date_time + delta:
|
||||
logger.info('Document "%s" with id: %d, trashed on: %s, exceded delete period', document, document.pk, document.deleted_date_time)
|
||||
logger.info(
|
||||
'Document "%s" with id: %d, trashed on: %s, exceded '
|
||||
'delete period', document, document.pk,
|
||||
document.deleted_date_time
|
||||
)
|
||||
document.delete()
|
||||
else:
|
||||
logger.info('Document type: %s, has a no retention delta', document_type)
|
||||
logger.info(
|
||||
'Document type: %s, has a no retention delta', document_type
|
||||
)
|
||||
|
||||
logger.info('Finshed')
|
||||
|
||||
@@ -46,16 +61,31 @@ def task_check_trash_periods():
|
||||
logger.info('Executing')
|
||||
|
||||
for document_type in DocumentType.objects.all():
|
||||
logger.info('Checking trash period of document type: %s', document_type)
|
||||
logger.info(
|
||||
'Checking trash period of document type: %s', document_type
|
||||
)
|
||||
if document_type.trash_time_period and document_type.trash_time_unit:
|
||||
delta = timedelta(**{document_type.trash_time_unit: document_type.trash_time_period})
|
||||
logger.info('Document type: %s, has a trash period delta of: %s', document_type, delta)
|
||||
delta = timedelta(
|
||||
**{
|
||||
document_type.trash_time_unit: document_type.trash_time_period
|
||||
}
|
||||
)
|
||||
logger.info(
|
||||
'Document type: %s, has a trash period delta of: %s',
|
||||
document_type, delta
|
||||
)
|
||||
for document in Document.objects.filter(document_type=document_type):
|
||||
if now() > document.date_added + delta:
|
||||
logger.info('Document "%s" with id: %d, added on: %s, exceded trash period', document, document.pk, document.date_added)
|
||||
logger.info(
|
||||
'Document "%s" with id: %d, added on: %s, exceded '
|
||||
'trash period', document, document.pk,
|
||||
document.date_added
|
||||
)
|
||||
document.delete()
|
||||
else:
|
||||
logger.info('Document type: %s, has a no retention delta', document_type)
|
||||
logger.info(
|
||||
'Document type: %s, has a no retention delta', document_type
|
||||
)
|
||||
|
||||
logger.info('Finshed')
|
||||
|
||||
@@ -80,7 +110,11 @@ def task_update_page_count(self, version_id):
|
||||
try:
|
||||
document_version.update_page_count()
|
||||
except OperationalError as exception:
|
||||
logger.warning('Operational error during attempt to update page count for document version: %s; %s. Retrying.', document_version, exception)
|
||||
logger.warning(
|
||||
'Operational error during attempt to update page count for '
|
||||
'document version: %s; %s. Retrying.', document_version,
|
||||
exception
|
||||
)
|
||||
raise self.retry(exc=exception)
|
||||
|
||||
|
||||
@@ -88,63 +122,100 @@ def task_update_page_count(self, version_id):
|
||||
def task_upload_new_document(self, document_type_id, shared_uploaded_file_id, description=None, label=None, language=None, user_id=None):
|
||||
try:
|
||||
document_type = DocumentType.objects.get(pk=document_type_id)
|
||||
shared_file = SharedUploadedFile.objects.get(pk=shared_uploaded_file_id)
|
||||
shared_file = SharedUploadedFile.objects.get(
|
||||
pk=shared_uploaded_file_id
|
||||
)
|
||||
if user_id:
|
||||
user = User.objects.get(pk=user_id)
|
||||
else:
|
||||
user = None
|
||||
|
||||
except OperationalError as exception:
|
||||
logger.warning('Operational error during attempt to gather data for new document: %s; Retrying.', exception)
|
||||
logger.warning(
|
||||
'Operational error during attempt to gather data for new '
|
||||
'document: %s; Retrying.', exception
|
||||
)
|
||||
raise self.retry(exc=exception)
|
||||
|
||||
try:
|
||||
with shared_file.open as file_object:
|
||||
document_version = document_type.new_document(self, file_object=file_object, label=label, description=description, language=language, _user=user)
|
||||
document_version = document_type.new_document(
|
||||
self, file_object=file_object, label=label,
|
||||
description=description, language=language, _user=user
|
||||
)
|
||||
except OperationalError as exception:
|
||||
logger.warning('Operational error during attempt to gather data for new document: %s; Retrying.', exception)
|
||||
logger.warning(
|
||||
'Operational error during attempt to gather data for new '
|
||||
'document: %s; Retrying.', exception
|
||||
)
|
||||
raise self.retry(exc=exception)
|
||||
|
||||
try:
|
||||
shared_file.delete()
|
||||
except OperationalError as exception:
|
||||
logger.warning('Operational error while trying to delete shared file used to upload new document: %s; %s. Retrying.', document_version.document, exception)
|
||||
logger.warning(
|
||||
'Operational error while trying to delete shared file used to '
|
||||
'upload new document: %s; %s. Retrying.',
|
||||
document_version.document, exception
|
||||
)
|
||||
|
||||
|
||||
@app.task(bind=True, default_retry_delay=UPLOAD_NEW_VERSION_RETRY_DELAY, ignore_result=True)
|
||||
def task_upload_new_version(self, document_id, shared_uploaded_file_id, user_id, comment=None):
|
||||
try:
|
||||
document = Document.objects.get(pk=document_id)
|
||||
shared_file = SharedUploadedFile.objects.get(pk=shared_uploaded_file_id)
|
||||
shared_file = SharedUploadedFile.objects.get(
|
||||
pk=shared_uploaded_file_id
|
||||
)
|
||||
if user_id:
|
||||
user = User.objects.get(pk=user_id)
|
||||
else:
|
||||
user = None
|
||||
|
||||
except OperationalError as exception:
|
||||
logger.warning('Operational error during attempt to retrieve shared data for new document version for:%s; %s. Retrying.', document, exception)
|
||||
logger.warning(
|
||||
'Operational error during attempt to retrieve shared data for '
|
||||
'new document version for:%s; %s. Retrying.', document, exception
|
||||
)
|
||||
raise self.retry(exc=exception)
|
||||
|
||||
with shared_file.open() as file_object:
|
||||
document_version = DocumentVersion(document=document, comment=comment, file=file_object)
|
||||
document_version = DocumentVersion(
|
||||
document=document, comment=comment, file=file_object
|
||||
)
|
||||
try:
|
||||
document_version.save(_user=user)
|
||||
except Warning as warning:
|
||||
# New document version are blocked
|
||||
logger.info('Warning during attempt to create new document version for document: %s; %s', document, warning)
|
||||
logger.info(
|
||||
'Warning during attempt to create new document version for '
|
||||
'document: %s; %s', document, warning
|
||||
)
|
||||
shared_file.delete()
|
||||
except OperationalError as exception:
|
||||
logger.warning('Operational error during attempt to create new document version for document: %s; %s. Retrying.', document, exception)
|
||||
logger.warning(
|
||||
'Operational error during attempt to create new document '
|
||||
'version for document: %s; %s. Retrying.', document, exception
|
||||
)
|
||||
raise self.retry(exc=exception)
|
||||
except Exception as exception:
|
||||
# This except and else block emulate a finally:
|
||||
logger.error('Unexpected error during attempt to create new document version for document: %s; %s', document, exception)
|
||||
logger.error(
|
||||
'Unexpected error during attempt to create new document '
|
||||
'version for document: %s; %s', document, exception
|
||||
)
|
||||
try:
|
||||
shared_file.delete()
|
||||
except OperationalError as exception:
|
||||
logger.warning('Operational error during attempt to delete shared file: %s; %s.', shared_file, exception)
|
||||
logger.warning(
|
||||
'Operational error during attempt to delete shared '
|
||||
'file: %s; %s.', shared_file, exception
|
||||
)
|
||||
else:
|
||||
try:
|
||||
shared_file.delete()
|
||||
except OperationalError as exception:
|
||||
logger.warning('Operational error during attempt to delete shared file: %s; %s.', shared_file, exception)
|
||||
logger.warning(
|
||||
'Operational error during attempt to delete shared '
|
||||
'file: %s; %s.', shared_file, exception
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user