PEP8 cleanups.
This commit is contained in:
@@ -14,7 +14,9 @@ def get_used_size(path, file_list):
|
||||
total_size = 0
|
||||
for filename in file_list:
|
||||
try:
|
||||
total_size += storage_backend.size(storage_backend.separator.join([path, filename]))
|
||||
total_size += storage_backend.size(
|
||||
storage_backend.separator.join([path, filename])
|
||||
)
|
||||
except OSError:
|
||||
pass
|
||||
|
||||
@@ -45,11 +47,19 @@ class DocumentStatistics(Statistic):
|
||||
results.extend([
|
||||
_('Document types: %d') % DocumentType.objects.count(),
|
||||
])
|
||||
document_stats = DocumentVersion.objects.annotate(page_count=Count('pages')).aggregate(Min('page_count'), Max('page_count'), Avg('page_count'))
|
||||
document_stats = DocumentVersion.objects.annotate(
|
||||
page_count=Count('pages')
|
||||
).aggregate(Min('page_count'), Max('page_count'), Avg('page_count'))
|
||||
results.extend([
|
||||
_('Minimum amount of pages per document: %d') % (document_stats['page_count__min'] or 0),
|
||||
_('Maximum amount of pages per document: %d') % (document_stats['page_count__max'] or 0),
|
||||
_('Average amount of pages per document: %f') % (document_stats['page_count__avg'] or 0),
|
||||
_(
|
||||
'Minimum amount of pages per document: %d'
|
||||
) % (document_stats['page_count__min'] or 0),
|
||||
_(
|
||||
'Maximum amount of pages per document: %d'
|
||||
) % (document_stats['page_count__max'] or 0),
|
||||
_(
|
||||
'Average amount of pages per document: %f'
|
||||
) % (document_stats['page_count__avg'] or 0),
|
||||
])
|
||||
|
||||
return results
|
||||
@@ -69,16 +79,25 @@ class DocumentUsageStatistics(Statistic):
|
||||
total_storage_documents, storage_used_space = storage_count()
|
||||
results.append(_('Documents in storage: %d') %
|
||||
total_storage_documents)
|
||||
results.append(_('Space used in storage: %(base_2)s (base 2), %(base_10)s (base 10), %(bytes)d bytes') % {
|
||||
'base_2': pretty_size(storage_used_space),
|
||||
'base_10': pretty_size_10(storage_used_space),
|
||||
'bytes': storage_used_space
|
||||
})
|
||||
results.append(
|
||||
_(
|
||||
'Space used in storage: %(base_2)s (base 2), %(base_10)s '
|
||||
'(base 10), %(bytes)d bytes'
|
||||
) % {
|
||||
'base_2': pretty_size(storage_used_space),
|
||||
'base_10': pretty_size_10(storage_used_space),
|
||||
'bytes': storage_used_space
|
||||
}
|
||||
)
|
||||
except NotImplementedError:
|
||||
pass
|
||||
|
||||
results.extend([
|
||||
_('Document pages in database: %d') % DocumentPage.objects.only('pk',).count(),
|
||||
])
|
||||
results.extend(
|
||||
[
|
||||
_(
|
||||
'Document pages in database: %d'
|
||||
) % DocumentPage.objects.only('pk',).count(),
|
||||
]
|
||||
)
|
||||
|
||||
return results
|
||||
|
||||
Reference in New Issue
Block a user