fix: save generated tags

Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
Ryex · Sep 30, 2024 · 106f0ac · 106f0ac
1 parent aef1e76
commit 106f0ac
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 6 deletions.
diff --git a/internal/gui/package.go b/internal/gui/package.go
@@ -443,7 +443,7 @@ func (a *App) saveUnpackedTags() {
 	}
 	a.tagSaveTimer = time.AfterFunc(500*time.Millisecond, func() {
 		a.tagSaveTimer = nil
-		err := a.pkg.WriteUnpackedTags()
+		err := a.pkg.SaveUnpackedTags()
 		if err != nil {
 			a.showErrorDialog(err)
 		}

diff --git a/internal/gui/tag_gen.go b/internal/gui/tag_gen.go
@@ -110,7 +110,16 @@ func (a *App) createTagGenDialog() dialog.Dialog {
 		stripTagSetPrefix     = true
 		stripExtraPrefix      = ""
 	)
-	var generateOptions *ddpackage.GenerateTagsOptions = &ddpackage.GenerateTagsOptions{}
+	var generateOptions *ddpackage.GenerateTagsOptions = &ddpackage.GenerateTagsOptions{
+			BuildGlobalTagSet:      buildGlobalTagSet,
+			GlobalTagSet:           globalTagSet,
+			BuildTagSetsFromPrefix: buildTagSetFrpmPrefix,
+			PrefixSplitMode:        prefixSplitMode,
+			TagSetPrefrixDelimiter:  tagSetPrefixDelimiter,
+			StripTagSetPrefix: stripTagSetPrefix,
+			StripExtraPrefix:  stripExtraPrefix,
+	}
+	var generator *ddpackage.GenerateTags = ddpackage.NewGenerateTags(generateOptions)
 
 	boundBuildGlobalTagSet := binding.BindBool(&buildGlobalTagSet)
 	boundGlobalTagSet := binding.BindString(&globalTagSet)
@@ -141,7 +150,7 @@ func (a *App) createTagGenDialog() dialog.Dialog {
 			StripTagSetPrefix: stripTagSetPrefix,
 			StripExtraPrefix:  stripExtraPrefix,
 		}
-		generator := ddpackage.NewGenerateTags(generateOptions)
+		generator = ddpackage.NewGenerateTags(generateOptions)
 		tagsMap = generator.TagsFromPath(strings.Join(examplePathParts, "/"))
 		updateTags()
 		updateSets()
@@ -333,7 +342,6 @@ func (a *App) createTagGenDialog() dialog.Dialog {
 				a.window,
 			)
 			progressDlg.Show()
-			generator := ddpackage.NewGenerateTags(generateOptions)
 			a.pkg.GenerateTagsProgress(generator, func(p float64) {
 				progressVal.Set(p)
 			})

diff --git a/internal/utils/utils.go b/internal/utils/utils.go
@@ -86,7 +86,10 @@ func RipTexture(data []byte) (fileExt string, fileData []byte, err error) {
 }
 
 func SplitOne(s string, sep string) (string, string) {
-	x := strings.SplitN(s, sep, 1)
+	x := strings.SplitN(s, sep, 2)
+	if len(x) < 2 {
+		return x[0], ""
+	}
 	return x[0], x[1]
 }
 

diff --git a/pkg/ddpackage/auto_tags.go b/pkg/ddpackage/auto_tags.go
@@ -34,6 +34,7 @@ func (p *Package) generateTags(generator *GenerateTags, pcb func(p float64)) {
 			pcb(float64(i) / float64(len(p.fileList)))
 		}
 	}
+	p.SaveUnpackedTags()
 }
 
 type GenerateTagsOptions struct {

diff --git a/pkg/ddpackage/pack_data.go b/pkg/ddpackage/pack_data.go
@@ -239,7 +239,7 @@ func (p *Package) loadUnpackedResourceMetadata() error {
 	return nil
 }
 
-func (p *Package) WriteUnpackedTags() error {
+func (p *Package) SaveUnpackedTags() error {
 	if p.unpackedPath == "" {
 		return ErrUnsetUnpackedPath
 	}
-Original file line number
+Diff line change
@@ Expand Up @@
     			pcb(float64(i) / float64(len(p.fileList)))
     		}
     	}
+    	p.SaveUnpackedTags()
     }
     type GenerateTagsOptions struct {
@@ Expand Down @@