refactor

Author: dominik-przybyl-wttech

pkg/package_manager.go

@@ -230,6 +230,22 @@ func (pm *PackageManager) Create(opts PackageCreateOpts) (string, error) {
 	return status.Path, nil
 }
 
+func DetermineFilterRoot(contentPath string) string {
+	_, filterRoot, _ := strings.Cut(contentPath, content.JCRRoot)
+	filterRoot = strings.ReplaceAll(filterRoot, "\\", "/")
+	if strings.HasSuffix(filterRoot, content.JCRContentFile) && content.IsContentFile(contentPath) {
+		filterRoot = strings.ReplaceAll(filterRoot, content.JCRContentFile, content.JCRContentNode)
+	} else if strings.HasSuffix(filterRoot, content.JCRContentFile) {
+		filterRoot = filepath.Dir(filterRoot)
+	} else if strings.HasSuffix(filterRoot, content.XmlFileSuffix) {
+		filterRoot = strings.ReplaceAll(filterRoot, content.XmlFileSuffix, "")
+	}
+	filterRoot = namespacePatternRegex.ReplaceAllString(filterRoot, "/$2:")
+	filterRoot = strings.ReplaceAll(filterRoot, "/__", "/_")
+	filterRoot = strings.ReplaceAll(filterRoot, "%3a", ":")
+	return filterRoot
+}
+
 func copyContentFiles(contentPath string, tmpDir string) error {
 	_, jcrPath, _ := strings.Cut(contentPath, content.JCRRoot)
 	if pathx.IsDir(contentPath) {
@@ -253,22 +269,6 @@ func copyContentFiles(contentPath string, tmpDir string) error {
 	return nil
 }
 
-func DetermineFilterRoot(contentPath string) string {
-	_, filterRoot, _ := strings.Cut(contentPath, content.JCRRoot)
-	filterRoot = strings.ReplaceAll(filterRoot, "\\", "/")
-	if strings.HasSuffix(filterRoot, content.JCRContentFile) && content.IsContentFile(contentPath) {
-		filterRoot = strings.ReplaceAll(filterRoot, content.JCRContentFile, content.JCRContentNode)
-	} else if strings.HasSuffix(filterRoot, content.JCRContentFile) {
-		filterRoot = filepath.Dir(filterRoot)
-	} else if strings.HasSuffix(filterRoot, content.XmlFileSuffix) {
-		filterRoot = strings.ReplaceAll(filterRoot, content.XmlFileSuffix, "")
-	}
-	filterRoot = namespacePatternRegex.ReplaceAllString(filterRoot, "/$2:")
-	filterRoot = strings.ReplaceAll(filterRoot, "/__", "/_")
-	filterRoot = strings.ReplaceAll(filterRoot, "%3a", ":")
-	return filterRoot
-}
-
 func (pm *PackageManager) Copy(remotePath string, destInstance *Instance) error {
 	var localPath = pathx.RandomFileName(pm.tmpDir(), "pkg_copy", ".zip")
 	defer func() {

pkg/pkg/vault/META-INF/vault/filter.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<workspaceFilter version="1.0">[[ if .ExcludePatterns ]]
-    <filter root="[[ index .FilterRoots 0 ]]">[[ range .ExcludePatterns ]]
-        <exclude pattern="[[ . ]]"/>[[ end ]]
-    </filter>[[ else ]][[ range .FilterRoots ]]
-    <filter root="[[ . ]]"/>[[ end ]][[ end ]]
+<workspaceFilter version="1.0">[[if .ExcludePatterns]]
+    <filter root="[[index .FilterRoots 0]]">[[range .ExcludePatterns]]
+        <exclude pattern="[[.]]"/>[[end]]
+    </filter>[[else]][[range .FilterRoots]]
+    <filter root="[[.]]"/>[[end]][[end]]
 </workspaceFilter>