From 7670a0c5b77b12f962690a36899879491293f6d0 Mon Sep 17 00:00:00 2001
From: Justin Hawkins <justin@hawkins.id.au>
Date: Mon, 11 Oct 2021 20:55:35 +1030
Subject: [PATCH] Mark completely failed uploads as failed so we don't keep
 retrying them

---
 upload/upload.go | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/upload/upload.go b/upload/upload.go
index bf7d924..1b2a79d 100644
--- a/upload/upload.go
+++ b/upload/upload.go
@@ -5,6 +5,7 @@ package upload
 import (
 	"bytes"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"image"
 	"io"
@@ -15,7 +16,6 @@ import (
 	"os"
 	"path/filepath"
 	"time"
-	"errors"
 
 	"github.com/fogleman/gg"
 	"github.com/tardisx/discord-auto-upload/config"
@@ -35,6 +35,8 @@ type Upload struct {
 	Uploaded   bool      `json:"uploaded"` // has this file been uploaded to discord
 	UploadedAt time.Time `json:"uploaded_at"`
 
+	Failed bool `json:"failed"`
+
 	originalFilename string // path on the local disk
 	filenameToUpload string // post-watermark, or just original if unwatermarked
 
@@ -74,20 +76,22 @@ func (u *Uploader) AddFile(file string, conf config.Watcher) {
 func (u *Uploader) Upload() {
 
 	for _, upload := range u.Uploads {
-		if !upload.Uploaded {
+		if !upload.Uploaded && !upload.Failed {
 			upload.processUpload()
 		}
 	}
 }
 
 func (u *Upload) processUpload() error {
+	daulog.SendLog(fmt.Sprintf("Uploading: %s", u.originalFilename), daulog.LogTypeInfo)
+
 	if u.webhookURL == "" {
 		daulog.SendLog("WebHookURL is not configured - cannot upload!", daulog.LogTypeError)
 		return errors.New("webhook url not configured")
 	}
 
 	if u.watermark {
-		daulog.SendLog("Watermarking", daulog.LogTypeInfo)
+		daulog.SendLog("Watermarking image", daulog.LogTypeInfo)
 		u.applyWatermark()
 	} else {
 		u.filenameToUpload = u.originalFilename
@@ -125,9 +129,9 @@ func (u *Upload) processUpload() error {
 		start := time.Now()
 
 		if u.Client == nil {
-	          // if no client was specified (a unit test) then create
-		  // a default one
-		  u.Client = &http.Client{Timeout: time.Second * 30}
+			// if no client was specified (a unit test) then create
+			// a default one
+			u.Client = &http.Client{Timeout: time.Second * 30}
 		}
 
 		resp, err := u.Client.Do(request)
@@ -203,6 +207,8 @@ func (u *Upload) processUpload() error {
 
 	if retriesRemaining == 0 {
 		daulog.SendLog("Failed to upload, even after all retries", daulog.LogTypeError)
+		u.Failed = true
+		return errors.New("could not upload after all retries")
 	}
 	return nil
 }