From 3497bfd1949b9f2e370a75acdacd205a0cce669f Mon Sep 17 00:00:00 2001
From: Justin Hawkins <justin@hawkins.id.au>
Date: Mon, 5 Dec 2022 22:01:52 +1030
Subject: [PATCH] Add state reasons

---
 upload/upload.go      | 26 ++++++++++++++++++--------
 web/data/uploads.html | 15 ++++++++++-----
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/upload/upload.go b/upload/upload.go
index 420d9b0..a633ba3 100644
--- a/upload/upload.go
+++ b/upload/upload.go
@@ -25,12 +25,13 @@ import (
 type State string
 
 const (
-	StatePending   State = "Pending"   // waiting for decision to upload (could be edited)
-	StateQueued    State = "Queued"    // ready for upload
-	StateUploading State = "Uploading" // uploading
-	StateComplete  State = "Complete"  // finished successfully
-	StateFailed    State = "Failed"    // failed
-	StateSkipped   State = "Skipped"   // user did not want to upload
+	StatePending      State = "Pending"          // waiting for decision to upload (could be edited)
+	StateQueued       State = "Queued"           // ready for upload
+	StateWatermarking State = "Adding Watermark" // thumbnail generation
+	StateUploading    State = "Uploading"        // uploading
+	StateComplete     State = "Complete"         // finished successfully
+	StateFailed       State = "Failed"           // failed
+	StateSkipped      State = "Skipped"          // user did not want to upload
 )
 
 var currentId int32
@@ -56,7 +57,11 @@ type Upload struct {
 
 	Url string `json:"url"` // url on the discord CDN
 
-	State State `json:"state"`
+	Width  int `json:"width"`
+	Height int `json:"height"`
+
+	State       State  `json:"state"`
+	StateReason string `json:"state_reason"`
 
 	Client HTTPClient `json:"-"`
 }
@@ -85,6 +90,7 @@ func (u *Uploader) AddFile(file string, conf config.Watcher) {
 	// set it to Pending instead
 	if conf.HoldUploads {
 		thisUpload.State = StatePending
+		thisUpload.StateReason = ""
 	}
 	u.Uploads = append(u.Uploads, &thisUpload)
 	u.Lock.Unlock()
@@ -180,6 +186,7 @@ func (u *Upload) processUpload() error {
 				// just fail immediately, we know this means the file was too big
 				daulog.Error("413 received - file too large")
 				u.State = StateFailed
+				u.StateReason = "discord API said file too large"
 				return errors.New("received 413 - file too large")
 			}
 
@@ -232,7 +239,9 @@ func (u *Upload) processUpload() error {
 
 			u.Url = a.URL
 			u.State = StateComplete
-
+			u.StateReason = ""
+			u.Width = a.Width
+			u.Height = a.Height
 			u.UploadedAt = time.Now()
 
 			break
@@ -245,6 +254,7 @@ func (u *Upload) processUpload() error {
 	if retriesRemaining == 0 {
 		daulog.Error("Failed to upload, even after all retries")
 		u.State = StateFailed
+		u.StateReason = "could not upload after all retries"
 		return errors.New("could not upload after all retries")
 	}
 
diff --git a/web/data/uploads.html b/web/data/uploads.html
index 3864a6c..3fbdc9b 100644
--- a/web/data/uploads.html
+++ b/web/data/uploads.html
@@ -38,7 +38,7 @@
       <thead>
         <tr>
           <th>filename</th>
-          <th>actions</th>
+          <th>state</th>
           <th>&nbsp;</th>
         </tr>
       </thead>
@@ -47,9 +47,11 @@
         <template x-for="ul in uploads">
           <tr>
             <td x-text="ul.original_file"></td>
-            <td>
-              <button @click="start_upload(ul.id)" type="button" class="btn btn-primary">upload</button>
-            </td>
+            <td> 
+              <span x-text="ul.state"></span>
+              <div x-if="ul.state_reason">(<span x-text="ul.state_reason"></span>)</div>
+             </td>
+  
             <td>
               <img :src="'/rest/image/'+ul.id+'/thumb'">
             </td>
@@ -74,7 +76,10 @@
        <template x-for="ul in finished">
          <tr>
            <td x-text="ul.original_file"></td>
-           <td x-text="ul.state"></td>
+           <td> 
+            <span x-text="ul.state"></span>
+            <div x-if="ul.state_reason">(<span x-text="ul.state_reason"></span>)</div>
+           </td>
            <td>
             <img :src="'/rest/image/'+ul.id+'/thumb'">
           </td>