Fixes

Author: colin969

.gitignore

@@ -3,4 +3,5 @@ ultupdater.exe
 venv
 test
 .idea
-./*.exe
+./*.exe
+bundle.go

FyneApp.toml

@@ -5,4 +5,4 @@ Website = "https://flashpointarchive.org"
   Name = "Flashpoint Ultimate Updater"
   ID = "com.flashpointarchive.ultimate-updater"
   Version = "1.0.0"
-  Build = 3
+  Build = 5

downloader.go

@@ -3,7 +3,6 @@ package main
 import (
 	"context"
 	"database/sql"
-	"encoding/binary"
 	"encoding/hex"
 	"fmt"
 	"fyne.io/fyne/v2/dialog"
@@ -14,7 +13,6 @@ import (
 	"path/filepath"
 	"sync"
 	"time"
-	"unsafe"
 )
 
 type Update struct {
@@ -202,6 +200,7 @@ func (d *Downloader) Resume() error {
 				dest := filepath.Join(d.installPath, dir)
 				err = os.MkdirAll(dest, os.ModePerm)
 				if err != nil {
+					// Illegal folder on windows?
 					dialog.NewError(&FatalDownloadFailure{err}, d.state.window).Show()
 					return
 				}
@@ -417,9 +416,18 @@ func (d *Downloader) Resume() error {
 							} else {
 								req, err := d.NewRequest(f)
 								if err != nil {
-									dialog.NewError(err, d.state.window).Show()
+									// Send failure (bad parsing)
+									d.updatech <- &Update{
+										IndexFile: f,
+										Progress:  0,
+										Bytes:     0,
+										Done:      true,
+										Retry:     false,
+										Failure:   &FatalDownloadFailure{err},
+									}
+								} else {
+									d.reqch <- req
 								}
-								d.reqch <- req
 							}
 						}
 					}
@@ -472,11 +480,19 @@ func (d *Downloader) Resume() error {
 	for _, f := range files {
 		req, err := d.NewRequest(f)
 		if err != nil {
-			return err
+			// Send failure (bad parsing)
+			d.updatech <- &Update{
+				IndexFile: f,
+				Progress:  0,
+				Bytes:     0,
+				Done:      true,
+				Retry:     false,
+				Failure:   &FatalDownloadFailure{err},
+			}
+		} else {
+			// Add request to queue
+			d.reqch <- req
 		}
-
-		// Add request to queue
-		d.reqch <- req
 	}
 	d.running = true
 	_ = d.state.runningLabel.Set("Running")
@@ -535,9 +551,3 @@ func (d *Downloader) NewRequest(f *IndexedFile) (*grab.Request, error) {
 
 	return req, nil
 }
-
-func intToBytes(n int) []byte {
-	bytes := make([]byte, unsafe.Sizeof(n)) // Assuming int is 4 bytes on your platform
-	binary.BigEndian.PutUint32(bytes, uint32(n))
-	return bytes
-}

go.mod

@@ -5,13 +5,13 @@ go 1.20
 require (
 	fyne.io/fyne/v2 v2.3.5
 	github.com/cavaliergopher/grab/v3 v3.0.1
+	github.com/dustin/go-humanize v1.0.1
 	github.com/mattn/go-sqlite3 v1.14.17
 )
 
 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
@@ -35,7 +35,6 @@ require (
 	golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
 	golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
 	golang.org/x/text v0.6.0 // indirect
-	golang.org/x/time v0.3.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	honnef.co/go/js/dom v0.0.0-20210725211120-f030747120f2 // indirect
 )

go.sum

@@ -489,8 +489,6 @@ golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
-golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=