feat: support updating package list after build

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>

go.mod

@@ -10,6 +10,7 @@ require (
 	github.com/dustin/go-humanize v1.0.1
 	github.com/schollz/progressbar/v3 v3.16.0
 	github.com/sirupsen/logrus v1.9.3
+	github.com/snowzach/rotatefilehook v0.0.0-20220211133110-53752135082d
 	github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c
 	github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef
 	github.com/sunshineplan/imgconv v1.1.11
@@ -43,7 +44,6 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/rymdport/portal v0.2.6 // indirect
-	github.com/snowzach/rotatefilehook v0.0.0-20220211133110-53752135082d // indirect
 	github.com/stretchr/testify v1.9.0 // indirect
 	github.com/sunshineplan/pdf v1.0.7 // indirect
 	github.com/yuin/goldmark v1.7.1 // indirect

internal/cmd/cmd.go

@@ -35,7 +35,7 @@ func (ctx *Context) LoadPkg(path string) error {
 			return err
 		}
 	} else {
-		err := ctx.Pkg.LoadFromPackedPath(ctx.InputPath)
+		err := ctx.Pkg.LoadFromPackedPath(ctx.InputPath, nil)
 		if err != nil {
 			ctx.Log.WithError(err).Error("failed to load package")
 			return err

internal/cmd/generate.go

@@ -105,10 +105,12 @@ func (gtc *GenTumbCmd) Run(ctx *Context) error {
 		return err
 	}
 
-	err = pkg.BuildFileList()
-	if err != nil {
-		l.WithError(err).Error("could not build file list")
-		return err
+	errs := pkg.BuildFileList()
+	if len(errs) != 0 {
+		for _, err := range errs {
+			l.WithField("task", "build file list").Errorf("error: %s", err.Error())
+		}
+		return errors.New("Failed to build file list")
 	}
 
 	err = pkg.GenerateThumbnails()

internal/cmd/list.go

@@ -71,26 +71,25 @@ func (lsf *ListFilesCmd) printTree(l logrus.FieldLogger, pkg *ddpackage.Package)
 		}
 	}
 	fileList := pkg.FileList()
-	for i := 0; i < len(fileList); i++ {
-		info := &fileList[i]
-		if info.IsMetadata() && !lsf.All {
+	for i, fi := range fileList {
+		if fi.IsMetadata() && !lsf.All {
 			continue
 		}
-		if info.IsTexture() && (!lsf.Textures && !lsf.All) {
+		if fi.IsTexture() && (!lsf.Textures && !lsf.All) {
 			continue
 		}
-		if info.IsThumbnail() && (!lsf.Thumbnails && !lsf.All) {
+		if fi.IsThumbnail() && (!lsf.Thumbnails && !lsf.All) {
 			continue
 		}
-		if info.IsData() && (!lsf.Data && !lsf.All) {
+		if fi.IsData() && (!lsf.Data && !lsf.All) {
 			continue
 		}
-		path := pkg.NormalizeResourcePath(info.ResPath)
-		l.WithField("res", info.ResPath).
-			WithField("size", info.Size).
+		path := pkg.NormalizeResourcePath(fi.ResPath)
+		l.WithField("res", fi.ResPath).
+			WithField("size", fi.Size).
 			WithField("index", i).
 			Trace("building tree node")
-		nodeForPath(path, info)
+		nodeForPath(path, fi)
 	}
 
 	fmt.Println(tree.String())

internal/cmd/pack.go

@@ -42,10 +42,12 @@ func (pc *PackCmd) Run(ctx *Context) error {
 		return err
 	}
 
-	err = pkg.BuildFileList()
-	if err != nil {
-		l.WithError(err).Error("could not build file list")
-		return err
+	errs := pkg.BuildFileList()
+	if len(errs) != 0 {
+		for _, err := range errs {
+			l.WithField("task", "build file list").Errorf("err: %s", err.Error())
+		}
+		return errors.New("Failed to build file list")
 	}
 
 	bar := progressbar.Default(100, "Packing ...")

internal/gui/dialog.go

@@ -78,7 +78,7 @@ func NewPackJSONDialogPkg(
 	if dlg.Version == "" {
 		dlg.Version = "1"
 	}
-	dlg.buildUi()
+	dlg.buildUI()
 	return dlg
 }
 
@@ -97,11 +97,11 @@ func NewPackJSONDialog(
 		ColorOverrides: structures.DefaultCustomColorOverrides(),
 		editable:       true,
 	}
-	dlg.buildUi()
+	dlg.buildUI()
 	return dlg
 }
 
-func (dlg *PackJSONDialog) buildUi() {
+func (dlg *PackJSONDialog) buildUI() {
 	IDLbl := widget.NewLabel(lang.X("packJson.id.label", "ID"))
 	IDEntry := widget.NewEntryWithData(binding.BindString(&dlg.ID))
 

internal/gui/gui.go

@@ -238,14 +238,14 @@ func (a *App) setupPathHandler() {
 		if err != nil {
 			log.WithError(err).Errorf("can not stat path %s", path)
 			a.setErrContent(
-				err,
 				lang.X(
 					"err.badPath",
 					"Can not open \"{{.Path}}\"",
 					map[string]any{
 						"Path": path,
 					},
 				),
+				err,
 			)
 			return
 		}
@@ -258,24 +258,26 @@ func (a *App) setupPathHandler() {
 	})
 }
 
-func (a *App) setErrContent(err error, msg string) {
+func (a *App) setErrContent(msg string, errs ...error) {
 	msgText := canvas.NewText(msg, theme.Color(theme.ColorNameForeground))
 	msgText.TextSize = 16
 	msgText.Alignment = fyne.TextAlignCenter
 
-	errText := multilineCanvasText(
-		err.Error(),
-		14,
-		fyne.TextStyle{Italic: true},
-		fyne.TextAlignCenter,
-		theme.Color(theme.ColorNameError),
-	)
+	errContainer := container.NewVBox()
+	for i, err := range errs {
+		errText := multilineCanvasText(
+			fmt.Sprintf("%d) ", i)+err.Error(),
+			12,
+			fyne.TextStyle{Italic: true},
+			fyne.TextAlignLeading,
+			theme.Color(theme.ColorNameError),
+		)
+		errContainer.Add(errText)
+	}
 
-	msgContent := container.NewVBox(
-		layout.NewSpacer(),
+	msgContent := container.NewCenter(
 		msgText,
-		errText,
-		layout.NewSpacer(),
+		container.NewScroll(errContainer),
 	)
 
 	a.setMainContent(msgContent)
@@ -302,7 +304,7 @@ func multilineCanvasText(
 	return content
 }
 
-func (a *App) setWaitContent(msg string) binding.String {
+func (a *App) setWaitContent(msg string) (binding.Float, binding.String) {
 	activity := widget.NewActivity()
 	activity.Start()
 	msgText := canvas.NewText(msg, theme.Color(theme.ColorNameForeground))
@@ -316,6 +318,9 @@ func (a *App) setWaitContent(msg string) binding.String {
 		activityText.Text = str
 		activityText.Refresh()
 	})
+	progressBar := widget.NewProgressBar()
+	activityProgress := binding.NewFloat()
+	progressBar.Bind(activityProgress)
 
 	activityContent := container.NewVBox(
 		layout.NewSpacer(),
@@ -325,7 +330,7 @@ func (a *App) setWaitContent(msg string) binding.String {
 		layout.NewSpacer(),
 	)
 	a.setMainContent(activityContent)
-	return activityStr
+	return activityProgress, activityStr
 }
 
 func (a *App) showErrorDialog(err error) {

internal/gui/pack.go

@@ -34,7 +34,7 @@ func (a *App) loadUnpackedPath(path string) {
 		return
 	}
 
-	activity := a.setWaitContent(lang.X(
+	activityProgress, activityStr := a.setWaitContent(lang.X(
 		"pack.wait",
 		"Loading unpacked resources from {{.Path}} (building index) ...",
 		map[string]any{
@@ -54,42 +54,47 @@ func (a *App) loadUnpackedPath(path string) {
 		if err != nil {
 			l.WithError(err).Error("could not load directory")
 			a.setErrContent(
-				err,
 				lang.X(
 					"err.badResources",
 					"Failed to load unpacked resources from {{.Path}}",
 					map[string]any{"Path": path}),
+
+				err,
 			)
 			return
 		}
 
-		err = pkg.BuildFileList(func(path string) {
-			activity.Set(lang.X(
+		errs := pkg.BuildFileListProgress(func(p float64, path string) {
+			activityProgress.Set(p)
+			activityStr.Set(lang.X(
 				"pack.buildList.activity",
 				"Loading {{.Path}} ...",
 				map[string]any{
 					"Path": utils.TruncatePathHumanFriendly(path, 80),
 				},
 			))
 		})
-		if err != nil {
-			l.WithError(err).Error("could not build file list")
+		if len(errs) != 0 {
+			for _, err := range errs {
+				l.WithField("task", "build file list").Errorf("error: %s", err)
+			}
 			a.setErrContent(
-				err,
 				lang.X(
 					"err.fileList",
 					"Failed to build file list from {{.Path}}",
 					map[string]any{
 						"Path": path,
 					},
 				),
+				err,
 			)
 			return
 		}
 
 		err = pkg.LoadTags()
 		if err != nil {
-			a.showErrorDialog(errors.Join(err, fmt.Errorf(lang.X("package.tags.error", "Failed to read tags"))))
+			a.showErrorDialog(
+				errors.Join(err, fmt.Errorf(lang.X("package.tags.error", "Failed to read tags"))))
 			err = nil
 		}
 		err = pkg.LoadResourceMetadata()