Skip to content

Commit

Permalink
Pylint checks at file stats
Browse files Browse the repository at this point in the history
  • Loading branch information
@AlexanderWatzinger
AlexanderWatzinger committed Dec 30, 2024
1 parent 59e45c7 commit 51f4df0
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 37 deletions.
42 changes: 21 additions & 21 deletions openatlas/templates/file.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,29 +8,29 @@ <h1>
<div
class="progress-bar bg-primary"
role="progressbar"
style="width: {{ disk_space_info.percent_used - disk_space_info.percent_project }}%"
aria-valuenow="{{ disk_space_info.percent_used - disk_space_info.percent_project }}"
style="width: {{ disk_space_info.percent.free - disk_space_info.percent.project }}%"
aria-valuenow="{{ disk_space_info.percent.free - disk_space_info.percent.project }}"
aria-valuemin="0"
aria-valuemax="100">
<b>{{ disk_space_info.percent_used - disk_space_info.percent_project }}%</b>
<b>{{ disk_space_info.percent.free - disk_space_info.percent.project }}%</b>
</div>
<div
class="progress-bar bg-warning"
role="progressbar"
style="width: {{ disk_space_info.percent_project }}%"
aria-valuenow="{{ disk_space_info.percent_project }}"
style="width: {{ disk_space_info.percent.project }}%"
aria-valuenow="{{ disk_space_info.percent.project }}"
aria-valuemin="0"
aria-valuemax="100">
<b>{{ disk_space_info.percent_project }}%</b>
<b>{{ disk_space_info.percent.project }}%</b>
</div>
<div
class="progress-bar bg-gray"
role="progressbar"
style="width: {{ 100 - disk_space_info.percent_used }}%"
aria-valuenow="{{ 100 - disk_space_info.percent_used }}"
style="width: {{ 100 - disk_space_info.percent.free }}%"
aria-valuenow="{{ 100 - disk_space_info.percent.free }}"
aria-valuemin="0"
aria-valuemax="100">
<b class="text-dark">{{ 100 - disk_space_info.percent_used }}%</b>
<b class="text-dark">{{ 100 - disk_space_info.percent.free }}%</b>
</div>
</div>
<div>
Expand Down Expand Up @@ -62,38 +62,38 @@ <h1>
<div
class="progress-bar bg-danger"
role="progressbar"
style="width: {{ disk_space_info.percent_upload }}%"
aria-valuenow="{{ disk_space_info.percent_upload }}"
style="width: {{ disk_space_info.percent.upload }}%"
aria-valuenow="{{ disk_space_info.percent.upload }}"
aria-valuemin="0"
aria-valuemax="100">
<b>{{ disk_space_info.percent_upload }}%</b>
<b>{{ disk_space_info.percent.upload }}%</b>
</div>
<div
class="progress-bar bg-success"
role="progressbar"
style="width: {{ disk_space_info.percent_export }}%"
aria-valuenow="{{ disk_space_info.percent_export }}"
style="width: {{ disk_space_info.percent.export }}%"
aria-valuenow="{{ disk_space_info.percent.export }}"
aria-valuemin="0"
aria-valuemax="100">
<b>{{ disk_space_info.percent_export }}%</b>
<b>{{ disk_space_info.percent.export }}%</b>
</div>
<div
class="progress-bar bg-info"
role="progressbar"
style="width: {{ disk_space_info.percent_processed }}%"
aria-valuenow="{{ disk_space_info.percent_processed }}"
style="width: {{ disk_space_info.percent.processed }}%"
aria-valuenow="{{ disk_space_info.percent.processed }}"
aria-valuemin="0"
aria-valuemax="100">
<b class="text-dark">{{ disk_space_info.percent_processed }}%</b>
<b class="text-dark">{{ disk_space_info.percent.processed }}%</b>
</div>
<div
class="progress-bar bg-dark"
role="progressbar"
style="width: {{ disk_space_info.percent_iiif }}%"
aria-valuenow="{{ disk_space_info.percent_iiif }}"
style="width: {{ disk_space_info.percent.iiif }}%"
aria-valuenow="{{ disk_space_info.percent.iiif }}"
aria-valuemin="0"
aria-valuemax="100">
<b>{{ disk_space_info.percent_iiif }}%</b>
<b>{{ disk_space_info.percent.iiif }}%</b>
</div>
</div>
<div>
Expand Down
27 changes: 11 additions & 16 deletions openatlas/views/admin.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -772,6 +772,7 @@ def upload_ident_with_iiif() -> bool:
iiif_path = Path(g.settings['iiif_path'])
if not upload_ident_with_iiif():
paths['iiif'] = {'path': iiif_path, 'size': 0, 'mounted': False}
files_size = 40999999999
if os.name == 'posix':
keys = []
for key, path in paths.items():
Expand All @@ -793,19 +794,19 @@ def upload_ident_with_iiif() -> bool:
path['mounted'] = True
keys.append(key)
files_size = sum(paths[key]['size'] for key in keys)
else:
files_size = 40999999999 # pragma: no cover
stats = shutil.disk_usage(app.config['UPLOAD_PATH'])
percent_free = 100 - math.ceil(stats.free / (stats.total / 100))
percent_files = math.ceil(files_size / (stats.total / 100))
percent_export = math.ceil(paths['export']['size'] / (files_size / 100))
percent_upload = math.ceil(paths['upload']['size'] / (files_size / 100))
percent_iiif = 0
percent = {
'free': 100 - math.ceil(stats.free / (stats.total / 100)),
'project': math.ceil(files_size / (stats.total / 100)),
'export': math.ceil(paths['export']['size'] / (files_size / 100)),
'upload': math.ceil(paths['upload']['size'] / (files_size / 100)),
'iiif': 0}
if not upload_ident_with_iiif():
percent_iiif = math.ceil(paths['iiif']['size'] / (files_size / 100))
percent_processed = math.ceil(
percent['iiif'] = math.ceil(paths['iiif']['size'] / (files_size / 100))
percent['processed'] = math.ceil(
paths['processed']['size'] / (files_size / 100))
other_files = stats.total - stats.free - files_size
percent['other'] = 100 - (percent['project'] + percent['free'])
return {
'total': convert_size(stats.total),
'project': convert_size(files_size),
Expand All @@ -816,13 +817,7 @@ def upload_ident_with_iiif() -> bool:
paths['iiif']['size'] if not upload_ident_with_iiif() else 0),
'other_files': convert_size(other_files),
'free': convert_size(stats.free),
'percent_used': percent_free,
'percent_project': percent_files,
'percent_export': percent_export,
'percent_upload': percent_upload,
'percent_processed': percent_processed,
'percent_iiif': percent_iiif,
'percent_other': 100 - (percent_files + percent_free),
'percent': percent,
'mounted': [k for k, v in paths.items() if v['mounted']]}


Expand Down

0 comments on commit 51f4df0

Please sign in to comment.