Remote meta download support

Author: colin969

.gitignore

@@ -2,4 +2,5 @@ ultupdater.exe
 *.sqlite*
 venv
 test
-.idea
+.idea
+./*.exe

FyneApp.toml

@@ -0,0 +1,8 @@
+Website = "https://flashpointarchive.org"
+
+[Details]
+  Icon = "icon.png"
+  Name = "Flashpoint Ultimate Updater"
+  ID = "com.flashpointarchive.ultimate-updater"
+  Version = "1.0.0"
+  Build = 2

Makefile

@@ -0,0 +1,14 @@
+bundle:
+	fyne bundle -o bundle.go config.json
+
+build-mac:
+	fyne package -os darwin
+
+build-linux:
+	fyne package -os linux
+
+build-win:
+	fyne package -os windows
+
+build:
+	fyne package

README.md

@@ -0,0 +1,11 @@
+# Flashpoint Ultimate Updater
+
+## Building
+
+Bundle any resources
+
+`fyne bundle -o bundle.go config.json`
+
+Package for desired operation system
+
+`fyne package -os windows/linux/darwin`

config.json

@@ -0,0 +1,3 @@
+{
+  "meta_url": "https://download.unstable.life/ult-index/meta.json"
+}

downloader.go

@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"fyne.io/fyne/v2/dialog"
 	"github.com/cavaliergopher/grab/v3"
+	"github.com/dustin/go-humanize"
 	"hash/crc32"
 	"os"
 	"path/filepath"
@@ -20,6 +21,7 @@ type Update struct {
 	IndexFile       *IndexedFile
 	Retry           bool
 	RemoveTakenFlag bool
+	Failure         error
 	Progress        float64
 	Bytes           int64
 	Done            bool
@@ -74,6 +76,10 @@ func (d *Downloader) Resume() error {
 	// Reset context
 	d.ctx, d.cancel = context.WithCancel(context.Background())
 
+	// Reset failure count
+	d.state.downloadFailures = 0
+	_ = d.state.formatDownloadFailures.Set("0")
+
 	// Set up background
 	d.reqch = make(chan *grab.Request, 10)
 	d.respch = make(chan *grab.Response, 4)
@@ -121,19 +127,31 @@ func (d *Downloader) Resume() error {
 									IndexFile:       f,
 									Retry:           false,
 									RemoveTakenFlag: true,
+									Failure:         nil,
 									Progress:        1,
 									Bytes:           0,
 									Done:            true,
 								}
 								return
 							} else {
-								// Bad download, retry if below 3 retries
-								if f.RetryCount < 3 {
+								// Bad download, retry if below 5 retries
+								if f.RetryCount < 5 {
 									f.RetryCount += 1
 									d.updatech <- &Update{
 										IndexFile:       f,
 										Retry:           true,
 										RemoveTakenFlag: false,
+										Failure:         nil,
+										Progress:        1,
+										Bytes:           0,
+										Done:            true,
+									}
+								} else {
+									d.updatech <- &Update{
+										IndexFile:       f,
+										Retry:           false,
+										RemoveTakenFlag: false,
+										Failure:         err,
 										Progress:        1,
 										Bytes:           0,
 										Done:            true,
@@ -146,6 +164,7 @@ func (d *Downloader) Resume() error {
 								IndexFile:       f,
 								Retry:           false,
 								RemoveTakenFlag: false,
+								Failure:         nil,
 								Progress:        1,
 								Bytes:           resp.BytesComplete(),
 								Done:            true,
@@ -175,8 +194,10 @@ func (d *Downloader) Resume() error {
 				// Get next empty dir
 				dir, err := d.state.Repo.GetNextEmptyDir()
 				if err != nil {
-					dialog.NewError(&DatabaseError{err}, d.state.window).Show()
-					return
+					if err != sql.ErrNoRows {
+						dialog.NewError(&DatabaseError{err}, d.state.window).Show()
+						return
+					}
 				}
 				dest := filepath.Join(d.installPath, dir)
 				err = os.MkdirAll(dest, os.ModePerm)
@@ -270,6 +291,12 @@ func (d *Downloader) Resume() error {
 		_ = d.state.fileProgress4.Set(0)
 
 		for update := range d.updatech {
+			// Download failure, maximum retries reached
+			if update.Failure != nil {
+				d.state.downloadFailures += 1
+				_ = d.state.formatDownloadFailures.Set(humanize.Comma(d.state.downloadFailures))
+			}
+
 			// Failed download because of context cancel, remove taken flag instead, ignore ui update
 			if update.RemoveTakenFlag {
 				err = d.state.Repo.ClearTaken(update.IndexFile)
@@ -284,6 +311,7 @@ func (d *Downloader) Resume() error {
 				d.newRequestWg.Add(1)
 				go func() {
 					defer d.newRequestWg.Done()
+					time.Sleep(time.Second * 1) // Retry after 3 seconds
 					select {
 					case <-d.ctx.Done():
 						{
@@ -305,62 +333,68 @@ func (d *Downloader) Resume() error {
 			}
 
 			// Update UI element
-			updateIdx := -1
-			for idx, f := range uifiles {
-				if f.Filepath == update.IndexFile.Filepath {
-					// Send bytes update to speed handler
-					bytesDiff := update.Bytes - f.Bytes
-					speedch <- bytesDiff
-					// Update ui file
-					f.Progress = update.Progress
-					f.Done = update.Done
-					f.Bytes = update.Bytes
-					updateIdx = idx
-					break
-				}
-			}
-			if updateIdx == -1 {
-				// Didn't find existing entry, find an older one to replace
+			if update.Failure == nil {
+				updateIdx := -1
 				for idx, f := range uifiles {
-					if f.Done == true {
+					if f.Filepath == update.IndexFile.Filepath {
 						// Send bytes update to speed handler
-						bytesDiff := update.Bytes
+						bytesDiff := update.Bytes - f.Bytes
 						speedch <- bytesDiff
 						// Update ui file
-						f.Filepath = update.IndexFile.Filepath
 						f.Progress = update.Progress
 						f.Done = update.Done
 						f.Bytes = update.Bytes
 						updateIdx = idx
 						break
 					}
 				}
-			}
-			// If updated ui state, update element
-			if updateIdx != -1 {
-				if updateIdx == 0 {
-					_ = d.state.fileTitle1.Set(update.IndexFile.Filepath)
-					_ = d.state.fileProgress1.Set(update.Progress)
-				}
-				if updateIdx == 1 {
-					_ = d.state.fileTitle2.Set(update.IndexFile.Filepath)
-					_ = d.state.fileProgress2.Set(update.Progress)
-				}
-				if updateIdx == 2 {
-					_ = d.state.fileTitle3.Set(update.IndexFile.Filepath)
-					_ = d.state.fileProgress3.Set(update.Progress)
+				if updateIdx == -1 {
+					// Didn't find existing entry, find an older one to replace
+					for idx, f := range uifiles {
+						if f.Done == true {
+							// Send bytes update to speed handler
+							bytesDiff := update.Bytes
+							speedch <- bytesDiff
+							// Update ui file
+							f.Filepath = update.IndexFile.Filepath
+							f.Progress = update.Progress
+							f.Done = update.Done
+							f.Bytes = update.Bytes
+							updateIdx = idx
+							break
+						}
+					}
 				}
-				if updateIdx == 3 {
-					_ = d.state.fileTitle4.Set(update.IndexFile.Filepath)
-					_ = d.state.fileProgress4.Set(update.Progress)
+				// If updated ui state, update element
+				if updateIdx != -1 {
+					if updateIdx == 0 {
+						_ = d.state.fileTitle1.Set(update.IndexFile.Filepath)
+						_ = d.state.fileProgress1.Set(update.Progress)
+					}
+					if updateIdx == 1 {
+						_ = d.state.fileTitle2.Set(update.IndexFile.Filepath)
+						_ = d.state.fileProgress2.Set(update.Progress)
+					}
+					if updateIdx == 2 {
+						_ = d.state.fileTitle3.Set(update.IndexFile.Filepath)
+						_ = d.state.fileProgress3.Set(update.Progress)
+					}
+					if updateIdx == 3 {
+						_ = d.state.fileTitle4.Set(update.IndexFile.Filepath)
+						_ = d.state.fileProgress4.Set(update.Progress)
+					}
 				}
 			}
 
 			if update.Done {
-				// Mark as done
-				err := d.state.Repo.MarkFileDone(update.IndexFile)
-				if err != nil {
-					dialog.NewError(&DatabaseError{err}, d.state.window).Show()
+				if update.Failure == nil {
+					// Mark as done
+					d.state.downloadedSize += update.IndexFile.Size
+					d.state.downloadedFiles += 1
+					err := d.state.Repo.MarkFileDone(update.IndexFile)
+					if err != nil {
+						dialog.NewError(&DatabaseError{err}, d.state.window).Show()
+					}
 				}
 
 				d.newRequestWg.Add(1)
@@ -392,18 +426,40 @@ func (d *Downloader) Resume() error {
 				}()
 
 				// Update Total Progress bar state
-				d.state.downloadedSize += update.IndexFile.Size
-				d.state.downloadedFiles += 1
 				err = d.state.formatDownloadedSize.Set(FormatBytes(d.state.downloadedSize))
 				if err != nil {
 					dialog.NewError(err, d.state.window).Show()
 				}
+				err = d.state.formatDownloadedFiles.Set(humanize.Comma(d.state.downloadedFiles))
+				if err != nil {
+					dialog.NewError(err, d.state.window).Show()
+				}
 				progress := float64(d.state.downloadedSize) / float64(d.state.totalSize)
 				err = d.state.progressBarTotal.Set(progress)
 				if err != nil {
 					dialog.NewError(err, d.state.window).Show()
 				}
 
+				// Check if we're done
+				totalFiles := d.state.downloadedFiles + d.state.downloadFailures
+				if totalFiles == d.state.totalFiles {
+					// Done!
+					err := d.state.Repo.ClearTakenAll()
+					d.cancel()
+					go func() {
+						d.Stop(true)
+						if err != nil {
+							dialog.NewError(&DatabaseError{err}, d.state.window).Show()
+						} else {
+							if d.state.downloadFailures > 0 {
+								dialog.NewInformation("Finished", fmt.Sprintf("Install finished with %d failures, you will have to press start again to retry these failed files.", d.state.downloadFailures), d.state.window).Show()
+							} else {
+								dialog.NewInformation("Finished", "Install finished with no failures", d.state.window).Show()
+							}
+						}
+					}()
+				}
+
 			}
 		}
 	}()
@@ -423,18 +479,20 @@ func (d *Downloader) Resume() error {
 		d.reqch <- req
 	}
 	d.running = true
-	d.started = true
+	_ = d.state.runningLabel.Set("Running")
 
 	return nil
 }
 
-func (d *Downloader) Stop() {
+func (d *Downloader) Stop(skipCancelContext bool) {
 	if !d.running {
 		return
 	}
 
 	// Stop new and current requests
-	d.cancel()
+	if !skipCancelContext {
+		d.cancel()
+	}
 	d.newRequestWg.Wait()
 	close(d.reqch)
 
@@ -448,6 +506,7 @@ func (d *Downloader) Stop() {
 	d.updaterWg.Wait()
 
 	d.running = false
+	_ = d.state.runningLabel.Set("Stopped")
 }
 
 func (d *Downloader) NewRequest(f *IndexedFile) (*grab.Request, error) {

go.mod

@@ -11,6 +11,7 @@ require (
 require (
 	fyne.io/systray v1.10.1-0.20230602210930-b6a2d6ca2a7b // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/fredbi/uri v0.1.0 // indirect
 	github.com/fsnotify/fsnotify v1.5.4 // indirect
 	github.com/fyne-io/gl-js v0.0.0-20220119005834-d2da28d9ccfe // indirect

go.sum

@@ -68,6 +68,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
+github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=