Added Total size column, display max files in table as well

Author: Forceu

internal/models/FileRequest.go

@@ -1,24 +1,30 @@
 package models
 
-import "time"
+import (
+	"time"
+
+	"github.com/forceu/gokapi/internal/helper"
+)
 
 type FileRequest struct {
 	Id            int    `json:"id" redis:"id"`                     // The internal ID of the file request
-	UserId int `json:"userid" redis:"userid"` // The user ID of the owner
+	UserId        int    `json:"userid" redis:"userid"`             // The user ID of the owner
 	MaxFiles      int    `json:"maxfiles" redis:"maxfiles"`         // The maximum number of files allowed
 	MaxSize       int    `json:"maxsize" redis:"maxsize"`           // The maximum file size allowed in MB
 	Expiry        int64  `json:"expiry" redis:"expiry"`             // The expiry time of the file request
 	CreationDate  int64  `json:"creationdate" redis:"creationdate"` // The timestamp of the file request creation
 	Name          string `json:"name" redis:"name"`                 // The given name for the file request
 	UploadedFiles int    `json:"uploadedfiles" redis:"-"`           // Contains the number of uploaded files for this request. Needs to be calculated with Populate()
 	LastUpload    int64  `json:"lastupload" redis:"-"`              // Contains the timestamp of the last upload for this request. Needs to be calculated with Populate()
+	TotalFileSize int64  `json:"totalfilesize" redis:"-"`           // Contains the file size of all uploaded files. Needs to be calculated with Populate()
 }
 
 // Populate inserts the number of uploaded files and the last upload date
 func (f *FileRequest) Populate(files map[string]File) {
 	for _, file := range files {
 		if file.UploadRequestId == f.Id {
 			f.UploadedFiles++
+			f.TotalFileSize = f.TotalFileSize + file.SizeBytes
 			if file.UploadDate > f.LastUpload {
 				f.LastUpload = file.UploadDate
 			}
@@ -33,3 +39,7 @@ func (f *FileRequest) GetReadableDateLastUpdate() string {
 	}
 	return time.Unix(f.LastUpload, 0).Format("2006-01-02 15:04:05")
 }
+
+func (f *FileRequest) GetReadableTotalSize() string {
+	return helper.ByteCountSI(f.TotalFileSize)
+}

internal/webserver/web/templates/html_uploadrequest.tmpl

@@ -25,6 +25,7 @@
                             <tr>
                                 <th scope="col">Name</th>
                                 <th scope="col">Uploaded Files</th>
+                                <th scope="col">Total Size</th>
                                 <th scope="col">Last Upload</th>
                                 <th scope="col">Expiry</th>
 {{ if .ActiveUser.HasPermissionListOtherUploads }}
@@ -38,7 +39,12 @@
 {{ range .FileRequests }}
                             <tr id="row-{{ .Id }}">
 		                    <td>{{ .Name }}</td>
+{{ if eq .MaxFiles 0 }}		                   
 		                    <td>{{ .UploadedFiles }}</td>
+{{ else }}
+		                    <td>{{ .UploadedFiles }} / {{ .MaxFiles }}</td>
+{{ end }}
+		                    <td>{{ .GetReadableTotalSize }}</td>
             			    <td><span id="cell-lastupdate-{{ .Id }}"></span></td>
 				       <script>insertDateWithNegative({{ .LastUpload }}, "cell-lastupdate-{{ .Id }}", "None");</script>
             			    <td><span id="cell-expiry-{{ .Id }}"></span></td>