justin/discord-auto-upload
1
0
Fork 0
Code Issues 15 Pull Requests 1 Actions Packages Projects Releases 20 Wiki Activity

Use states on Uploads

Browse Source
This commit is contained in:
Justin Hawkins 2021-11-02 22:10:19 +10:30
parent 6fa6c34ccb
commit 726ae9a5aa
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
upload/upload.go
View File

@ -23,14 +23,14 @@ import (
"golang.org/x/image/font/inconsolata" "golang.org/x/image/font/inconsolata"
) )
type State int type State string
const ( const (
Pending = iota StatePending State = "Pending"
Queued StateQueued State = "Queued"
Uploading StateUploading State = "Uploading"
Complete StateComplete State = "Complete"
Failed StateFailed State = "Failed"
) )
type HTTPClient interface { type HTTPClient interface {
@ -42,11 +42,8 @@ type Uploader struct {
} }
type Upload struct { type Upload struct {
Uploaded bool `json:"uploaded"` // has this file been uploaded to discord
UploadedAt time.Time `json:"uploaded_at"` UploadedAt time.Time `json:"uploaded_at"`
Failed bool `json:"failed"`
originalFilename string // path on the local disk originalFilename string // path on the local disk
filenameToUpload string // post-watermark, or just original if unwatermarked filenameToUpload string // post-watermark, or just original if unwatermarked
@ -61,6 +58,8 @@ type Upload struct {
Width int `json:"width"` Width int `json:"width"`
Height int `json:"height"` Height int `json:"height"`
State State `json:state"`
Client HTTPClient `json:"-"` Client HTTPClient `json:"-"`
} }
@ -73,11 +72,11 @@ func NewUploader() *Uploader {
func (u *Uploader) AddFile(file string, conf config.Watcher) { func (u *Uploader) AddFile(file string, conf config.Watcher) {
thisUpload := Upload{ thisUpload := Upload{
Uploaded: false,
originalFilename: file, originalFilename: file,
watermark: !conf.NoWatermark, watermark: !conf.NoWatermark,
webhookURL: conf.WebHookURL, webhookURL: conf.WebHookURL,
usernameOverride: conf.Username, usernameOverride: conf.Username,
State: StatePending,
} }
u.Uploads = append(u.Uploads, &thisUpload) u.Uploads = append(u.Uploads, &thisUpload)
} }
@ -86,7 +85,7 @@ func (u *Uploader) AddFile(file string, conf config.Watcher) {
func (u *Uploader) Upload() { func (u *Uploader) Upload() {
for _, upload := range u.Uploads { for _, upload := range u.Uploads {
if !upload.Uploaded && !upload.Failed { if upload.State == StateQueued {
upload.processUpload() upload.processUpload()
} }
} }
@ -154,7 +153,7 @@ func (u *Upload) processUpload() error {
if resp.StatusCode == 413 { if resp.StatusCode == 413 {
// just fail immediately, we know this means the file was too big // just fail immediately, we know this means the file was too big
daulog.SendLog("413 received - file too large", daulog.LogTypeError) daulog.SendLog("413 received - file too large", daulog.LogTypeError)
u.Failed = true u.State = StateFailed
return errors.New("received 413 - file too large") return errors.New("received 413 - file too large")
} }
@ -207,7 +206,7 @@ func (u *Upload) processUpload() error {
daulog.SendLog(fmt.Sprintf("id: %d, %d bytes transferred in %.2f seconds (%.2f KiB/s)", res.ID, a.Size, elapsed.Seconds(), rate), daulog.LogTypeInfo) daulog.SendLog(fmt.Sprintf("id: %d, %d bytes transferred in %.2f seconds (%.2f KiB/s)", res.ID, a.Size, elapsed.Seconds(), rate), daulog.LogTypeInfo)
u.Url = a.URL u.Url = a.URL
u.Uploaded = true u.State = StateComplete
u.Width = a.Width u.Width = a.Width
u.Height = a.Height u.Height = a.Height
u.UploadedAt = time.Now() u.UploadedAt = time.Now()
@ -223,7 +222,7 @@ func (u *Upload) processUpload() error {
if retriesRemaining == 0 { if retriesRemaining == 0 {
daulog.SendLog("Failed to upload, even after all retries", daulog.LogTypeError) daulog.SendLog("Failed to upload, even after all retries", daulog.LogTypeError)
u.Failed = true u.State = StateFailed
return errors.New("could not upload after all retries") return errors.New("could not upload after all retries")
} }
return nil return nil

2
upload/upload_test.go
View File

@ -70,7 +70,7 @@ func TestTooBigUpload(t *testing.T) {
} else if err.Error() != "received 413 - file too large" { } else if err.Error() != "received 413 - file too large" {
t.Errorf("wrong error occurred: %s", err.Error()) t.Errorf("wrong error occurred: %s", err.Error())
} }
if u.Failed != true { if u.State != StateFailed {
t.Error("upload should have been marked failed") t.Error("upload should have been marked failed")
} }
} }