feat(proxy): add suffixes to advanced config (#107)

snivilised · Jan 11, 2024 · 0c8ba8a · 0c8ba8a
1 parent f6bdfac
commit 0c8ba8a
Show file tree

Hide file tree

Showing 7 changed files with 79 additions and 15 deletions.
diff --git a/src/app/command/config-defaults.go b/src/app/command/config-defaults.go
@@ -92,10 +92,13 @@ func init() {
 		NoProgramRetries: defaultNoProgramRetries,
 		Labels: MsLabelsConfig{
 			Adhoc:   "ADHOC",
-			Journal: ".journal.txt",
+			Journal: ".journal",
 			Legacy:  ".LEGACY",
 			Trash:   "TRASH",
 		},
+		Extensions: MsExtensionsConfig{
+			Suffixes: "jpg,jpeg,png",
+		},
 	}
 
 	userHomeDir, err := os.UserHomeDir()

diff --git a/src/app/command/ms-config.go b/src/app/command/ms-config.go
@@ -77,11 +77,16 @@ type MsLabelsConfig struct {
 	Trash   string `mapstructure:"trash"`
 }
 
+type MsExtensionsConfig struct {
+	Suffixes string `mapstructure:"suffixes"`
+}
+
 type MsAdvancedConfig struct {
-	Abort            bool           `mapstructure:"abort-on-error"`
-	Timeout          string         `mapstructure:"program-timeout"`
-	NoProgramRetries uint           `mapstructure:"no-program-retries"`
-	Labels           MsLabelsConfig `mapstructure:"labels"`
+	Abort            bool               `mapstructure:"abort-on-error"`
+	Timeout          string             `mapstructure:"program-timeout"`
+	NoProgramRetries uint               `mapstructure:"no-program-retries"`
+	Labels           MsLabelsConfig     `mapstructure:"labels"`
+	Extensions       MsExtensionsConfig `mapstructure:"extensions"`
 }
 
 func (cfg *MsAdvancedConfig) AbortOnError() bool {
@@ -112,6 +117,10 @@ func (cfg *MsAdvancedConfig) TrashLabel() string {
 	return cfg.Labels.Trash
 }
 
+func (cfg *MsAdvancedConfig) Suffixes() string {
+	return cfg.Extensions.Suffixes
+}
+
 type MsLoggingConfig struct {
 	LogPath    string `mapstructure:"log-path"`
 	MaxSize    uint   `mapstructure:"max-size"`

diff --git a/src/app/mocks/mocks-config.go b/src/app/mocks/mocks-config.go
diff --git a/src/app/proxy/config.go b/src/app/proxy/config.go
@@ -48,6 +48,7 @@ type (
 		JournalLabel() string
 		LegacyLabel() string
 		TrashLabel() string
+		Suffixes() string
 	}
 
 	AdvancedConfigReader interface {

diff --git a/src/app/proxy/enter-shrink.go b/src/app/proxy/enter-shrink.go
@@ -51,18 +51,12 @@ func (e *ShrinkEntry) getFilterDefs() *nav.FilterDefinitions {
 		defs          *nav.FilterDefinitions
 		folderDefined = true
 		pattern       string
+		suffixes      = e.AdvancedCFG.Suffixes()
 	)
 
-	const (
-		defaultGbSuffix = "*.jp*g"
-		defaultRxSuffix = "(?i).(jpe?g|png)$"
-	)
-
-	extensions := "jpg,jpeg,png"
-
 	switch {
 	case e.Inputs.PolyFam.Native.Files != "":
-		pattern = fmt.Sprintf("%v|%v", e.Inputs.PolyFam.Native.Files, extensions)
+		pattern = fmt.Sprintf("%v|%v", e.Inputs.PolyFam.Native.Files, suffixes)
 
 		file = &nav.FilterDef{
 			Type:        nav.FilterTypeExtendedGlobEn,
@@ -87,7 +81,7 @@ func (e *ShrinkEntry) getFilterDefs() *nav.FilterDefinitions {
 		}
 
 	default:
-		pattern = fmt.Sprintf("*|%v", extensions)
+		pattern = fmt.Sprintf("*|%v", suffixes)
 		file = &nav.FilterDef{
 			Type:        nav.FilterTypeExtendedGlobEn,
 			Description: fmt.Sprintf("default extended glob filter: '%v'", pattern),
@@ -197,6 +191,10 @@ func (e *ShrinkEntry) createFinder() *PathFinder {
 		trash:   e.AdvancedCFG.TrashLabel(),
 	}
 
+	if !strings.HasSuffix(finder.statics.journal, ".txt") {
+		finder.statics.journal += ".txt"
+	}
+
 	return finder
 }
 

diff --git a/src/internal/helpers/mock-config-data.go b/src/internal/helpers/mock-config-data.go
@@ -111,11 +111,15 @@ type testLabelsConfig struct {
 	Trash   string
 }
 
+type testExtensionsConfig struct {
+	Suffixes string
+}
 type testAdvancedConfig struct {
 	Abort            bool
 	Timeout          string
 	NoProgramRetries uint
 	Labels           testLabelsConfig
+	Extensions       testExtensionsConfig
 }
 
 func (cfg *testAdvancedConfig) AbortOnError() bool {
@@ -146,6 +150,10 @@ func (cfg *testAdvancedConfig) TrashLabel() string {
 	return cfg.Labels.Trash
 }
 
+func (cfg *testAdvancedConfig) Suffixes() string {
+	return cfg.Extensions.Suffixes
+}
+
 type testLoggingConfig struct {
 	LogPath    string
 	MaxSize    uint
@@ -262,6 +270,9 @@ func init() {
 			Legacy:  ".LEGACY",
 			Trash:   "TRASH",
 		},
+		Extensions: testExtensionsConfig{
+			Suffixes: "jpg,jpeg,png",
+		},
 	}
 
 	LoggingConfigData = &testLoggingConfig{

diff --git a/test/data/configuration/pixa-test.yml b/test/data/configuration/pixa-test.yml
@@ -34,7 +34,7 @@ advanced:
     journal-suffix: .journal.txt
     trash: TRASH
   extensions:
-    suffixes: "jpg,png"
+    suffixes: "jpg,jpeg,png"
 logging:
   log-path: "~/snivilised/pixa/pixa.log"
   max-size: 10