From 8d9b320d8949c448e38ab6b836b2851ca412cb5e Mon Sep 17 00:00:00 2001
From: Philip Sargent <philip.sargent@gmail.com>
Date: Mon, 31 Jul 2023 16:16:43 +0300
Subject: [PATCH] filesize now shown
---
core/views/uploads.py | 8 ++++++--
templates/renameform.html | 9 ++++++---
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/core/views/uploads.py b/core/views/uploads.py
index 31250cb..04f486d 100644
--- a/core/views/uploads.py
+++ b/core/views/uploads.py
@@ -34,7 +34,9 @@ todo = """
- Enable folder creation in dwguploads or as a separate form
-- Enable file rename on expofiles, particularly in /surveyscans/ (aka wallets)
+- Enable file rename on expofiles, not just for /surveyscans/ (aka wallets)
+
+- Make file rename utility less ugly.
"""
class FilesForm(forms.Form): # not a model-form, just a form-form
@@ -69,7 +71,8 @@ def expofilerename(request, filepath):
return render(request, "errors/generic.html", {"message": message})
else:
filename = Path(filepath).name
- folder = Path(actualpath).parent
+ folder = actualpath.parent
+ filesize = f"{actualpath.stat().st_size:,}"
if not actualpath.is_relative_to(Path(settings.SCANS_ROOT)):
message = f'\n Can only do rename within wallets (expofiles/surveyscans/) currently, sorry. "{actualpath}" '
@@ -101,6 +104,7 @@ def expofilerename(request, filepath):
"form": form,
"filepath": filepath,
"filename": filename,
+ "filesize": filesize,
},
)
diff --git a/templates/renameform.html b/templates/renameform.html
index a8aaf16..cda8bbf 100644
--- a/templates/renameform.html
+++ b/templates/renameform.html
@@ -5,9 +5,12 @@
{% block content %}
<h2>Rename "{{filename}}"</h2>
+<a href="/expofiles/{{filepath|urlencode}}">
<figure class=onleft>
<img src="/expofiles/{{filepath|urlencode}}" width=150px>
- </figure>
+ <figcaption>filesize: {{filesize}} bytes
+ </figcaption>
+ </figure></a>
<div style = "max-width:95%; margin-left:8%; text-align: left; " >
<form method ='post' >
{% csrf_token %}
@@ -17,7 +20,7 @@
pattern="[A-Za-z][A-Za-z0-9_-\.]*"/>
<label
style="padding: 0.5em 25px; margin-left: 110px"
- for="renameto">the new name for this file<br></label>
+ for="renameto">type in the new name for this file<br></label>
<br><br><br>
<button class="fancybutton2" style="padding: 0.5em 25px; margin-left: 110px" type = "submit" value = "Upload" >
@@ -26,7 +29,7 @@
</form>
<br /><br /><br />
- Full urlencoded path for this file <a href="/expofiles/{{filepath|urlencode}}"><em>{{filepath|urlencode}}</em></a>
+ Full urlencoded path for this file in expofiles is <a href="/expofiles/{{filepath|urlencode}}"><em>{{filepath|urlencode}}</em></a>
</div>