Merge pull request #5 from askolesov/sidecars-fix

Fix sidecar processing and default config

pkg/command/add.go

@@ -53,7 +53,7 @@ func addFiles(cmd *cobra.Command, addPath string, dryRun, errorOnAction bool) er
 	}
 
 	// Load config
-	cfg, err := util.ReadConfigFromFile(DefaultConfigFile)
+	cfg, err := vault.ReadConfigFromFile(DefaultConfigFile)
 	if err != nil {
 		return err
 	}
@@ -78,7 +78,7 @@ func addFiles(cmd *cobra.Command, addPath string, dryRun, errorOnAction bool) er
 
 	pw.AppendTracker(tracker)
 
-	inFilesRel, err := util.ListFilesRel(pw.Log, addPath, tracker.Increment, cfg.SkipPermissionDenied)
+	inFilesRel, err := vault.ListFilesRel(pw.Log, addPath, tracker.Increment, cfg.SkipPermissionDenied)
 	if err != nil {
 		return err
 	}
@@ -94,15 +94,15 @@ func addFiles(cmd *cobra.Command, addPath string, dryRun, errorOnAction bool) er
 
 	pw.AppendTracker(tracker)
 
-	inFilesRel = util.FilterIgnore(inFilesRel, cfg.Ignore, tracker.Increment)
+	inFilesRel = vault.FilterIgnore(inFilesRel, cfg.Ignore, tracker.Increment)
 
 	tracker.MarkAsDone()
 
 	// 3. Link sidecar files
 
 	pw.Log("Linking sidecar files")
 
-	inFilesRelLinked := util.LinkSidecars(cfg.SidecarExtensions, inFilesRel)
+	inFilesRelLinked := vault.LinkSidecars(cfg.SidecarExtensions, inFilesRel)
 
 	// 4. Shuffle files
 
@@ -130,17 +130,17 @@ func addFiles(cmd *cobra.Command, addPath string, dryRun, errorOnAction bool) er
 
 	for _, f := range inFilesRelLinked {
 		// Copy main file
-		info, err := util.ExtractMetadata(et, addPath, f.Path)
+		info, err := vault.ExtractMetadata(et, addPath, f.Path)
 		if err != nil {
 			return fmt.Errorf("failed to extract metadata for %s: %w", f.Path, err)
 		}
 
-		targetPath, err := util.RenderTemplate(cfg.Template, info)
+		targetPath, err := vault.RenderTemplate(cfg.Template, info)
 		if err != nil {
 			return fmt.Errorf("failed to render template for %s: %w", f.Path, err)
 		}
 
-		err = util.SmartCopyFile(
+		err = vault.SmartCopyFile(
 			pw.Log,
 			path.Join(addPath, f.Path),
 			path.Join(libPath, targetPath),
@@ -155,9 +155,9 @@ func addFiles(cmd *cobra.Command, addPath string, dryRun, errorOnAction bool) er
 		for _, sidecar := range f.Sidecars {
 			// Use the same name as the main file, but with the sidecar extension
 			sidecarPath := replaceExtension(targetPath, filepath.Ext(sidecar))
-			err = util.SmartCopyFile(
+			err = vault.SmartCopyFile(
 				pw.Log,
-				path.Join(addPath, sidecarPath),
+				path.Join(addPath, sidecar),
 				path.Join(libPath, sidecarPath),
 				dryRun,
 				errorOnAction,

pkg/command/info.go

@@ -33,7 +33,7 @@ func showFileInfo(cmd *cobra.Command, target string) error {
 		return err
 	}
 
-	infos, err := util.ExtractMetadata(et, dir, target)
+	infos, err := vault.ExtractMetadata(et, dir, target)
 	if err != nil {
 		return err
 	}

pkg/command/init.go

@@ -26,7 +26,7 @@ func GetInitCmd() *cobra.Command {
 }
 
 func ensureLibraryInitialized(cmd *cobra.Command) error {
-	cfgExists, err := util.IsConfigExists(DefaultConfigFile)
+	cfgExists, err := vault.IsConfigExists(DefaultConfigFile)
 	if err != nil {
 		return err
 	}
@@ -75,7 +75,7 @@ func initLibrary(cmd *cobra.Command) error {
 	}
 
 	// Write default config to file
-	err = util.WriteDefaultConfigToFile(DefaultConfigFile)
+	err = vault.WriteDefaultConfigToFile(DefaultConfigFile)
 	if err != nil {
 		return err
 	}

pkg/vault/compare.go

@@ -1,4 +1,4 @@
-package util
+package vault
 
 import (
 	"bytes"

pkg/vault/compare_test.go

@@ -1,4 +1,4 @@
-package util
+package vault
 
 import (
 	"os"

pkg/vault/config.go

@@ -1,4 +1,4 @@
-package util
+package vault
 
 import (
 	"encoding/json"
@@ -43,9 +43,9 @@ ignore:
 
 # sidecarExtensions: List of file extensions for sidecar files.
 sidecarExtensions:
-  - "*.xmp"
-  - "*.yaml"
-  - "*.json"
+  - ".xmp"
+  - ".yaml"
+  - ".json"
 `
 )
 

pkg/vault/config_test.go

@@ -1,4 +1,4 @@
-package util
+package vault
 
 import (
 	"testing"

pkg/vault/copy.go

@@ -1,4 +1,4 @@
-package util
+package vault
 
 import (
 	"errors"

pkg/vault/copy_test.go

@@ -1,4 +1,4 @@
-package util
+package vault
 
 import (
 	"os"

pkg/vault/filter.go

@@ -1,4 +1,4 @@
-package util
+package vault
 
 import (
 	ignore "github.com/sabhiram/go-gitignore"

pkg/vault/filter_test.go

@@ -1,4 +1,4 @@
-package util
+package vault
 
 import (
 	"testing"

pkg/vault/list.go

@@ -1,4 +1,4 @@
-package util
+package vault
 
 import (
 	"os"

pkg/vault/list_test.go

@@ -1,4 +1,4 @@
-package util
+package vault
 
 import (
 	"testing"

pkg/vault/metadata.go

@@ -1,4 +1,4 @@
-package util
+package vault
 
 import (
 	"crypto/md5"

pkg/vault/metadata_test.go

@@ -1,4 +1,4 @@
-package util
+package vault
 
 import (
 	"testing"

pkg/vault/sidecar.go

@@ -1,4 +1,4 @@
-package util
+package vault
 
 import (
 	"path/filepath"
@@ -18,7 +18,7 @@ func LinkSidecars(
 ) []FileWithSidecars {
 	// helper functions
 
-	sidecarExts := lo.Associate(sidecarExtensions, func(item string) (string, any) {
+	sidecarExts := lo.Associate(sidecarExtensions, func(item string) (string, bool) {
 		return strings.ToLower(item), true
 	})
 

pkg/vault/sidecar_test.go

@@ -1,4 +1,4 @@
-package util
+package vault
 
 import (
 	"testing"

pkg/vault/template.go

@@ -1,4 +1,4 @@
-package util
+package vault
 
 import (
 	"bytes"

pkg/vault/template_test.go

@@ -1,4 +1,4 @@
-package util
+package vault
 
 import (
 	"testing"