Merge branch 'fix-namespace-clean' into vault-cli

# Conflicts:
#	pkg/content/content.go

README.md

@@ -1,6 +1,7 @@
 ![AEM Compose Logo](https://github.com/wttech/aemc-ansible/raw/main/docs/logo-with-text.png)
 [![WTT Logo](https://github.com/wttech/aemc-ansible/raw/main/docs/wtt-logo.png)](https://www.wundermanthompson.com/service/technology)
 
+[![GitHub All Releases](https://img.shields.io/github/downloads/wttech/aemc/total)](https://github.com/wttech/aemc/releases)
 [![Last Release Version](https://img.shields.io/github/v/release/wttech/aemc?color=lightblue&label=Last%20Release)](https://github.com/wttech/aemc/releases)
 ![Go Version](https://img.shields.io/github/go-mod/go-version/wttech/aemc)
 [![Apache License, Version 2.0, January 2004](https://github.com/wttech/aemc-ansible/raw/main/docs/apache-license-badge.svg)](http://www.apache.org/licenses/)

pkg/content/content.go

@@ -17,23 +17,26 @@ import (
 )
 
 const (
-	JCRRoot           = "jcr_root"
-	JCRContentFile    = ".content.xml"
-	XmlFileSuffix     = ".xml"
-	JCRMixinTypesProp = "jcr:mixinTypes"
-	JCRRootPrefix     = "<jcr:root"
-	PropPattern       = "^\\s*([^ =]+)=\"([^\"]+)\"(.*)$"
-	NamespacePattern  = "^\\w+:(\\w+)=\"[^\"]+\"$"
+	JCRRoot              = "jcr_root"
+	JCRContentFile       = ".content.xml"
+	XmlFileSuffix        = ".xml"
+	JCRMixinTypesProp    = "jcr:mixinTypes"
+	JCRRootPrefix        = "<jcr:root"
+	PropPattern          = "^\\s*([^ =]+)=\"([^\"]+)\"(.*)$"
+	NamespacePattern     = "^\\w+:(\\w+)=\"[^\"]+\"$"
+	NamespaceFilePattern = "\\\\|/_([a-zA-Z0-9]+)_"
 )
 
 var (
-	propPatternRegex      *regexp.Regexp
-	namespacePatternRegex *regexp.Regexp
+	propPatternRegex          *regexp.Regexp
+	namespacePatternRegex     *regexp.Regexp
+	namespaceFilePatternRegex *regexp.Regexp
 )
 
 func init() {
 	propPatternRegex = regexp.MustCompile(PropPattern)
 	namespacePatternRegex = regexp.MustCompile(NamespacePattern)
+	namespaceFilePatternRegex = regexp.MustCompile(NamespaceFilePattern)
 }
 
 type Manager struct {
@@ -154,25 +157,31 @@ func (c Manager) filterLines(path string, lines []string) []string {
 			result = result[:len(result)-1]
 		}
 	}
-	return c.cleanNamespaces(result)
+	return c.cleanNamespaces(path, result)
 }
 
-func (c Manager) cleanNamespaces(lines []string) []string {
+func (c Manager) cleanNamespaces(path string, lines []string) []string {
 	if !c.NamespacesSkipped {
 		return lines
 	}
 
+	var fileNamespace string
+	groups := namespaceFilePatternRegex.FindStringSubmatch(path)
+	if groups != nil {
+		fileNamespace = groups[1]
+	}
+
 	var result []string
 	for _, line := range lines {
 		if strings.HasPrefix(line, JCRRootPrefix) {
 			var rootResult []string
 			for _, part := range strings.Split(line, " ") {
-				groups := namespacePatternRegex.FindStringSubmatch(part)
+				groups = namespacePatternRegex.FindStringSubmatch(part)
 				if groups == nil {
 					rootResult = append(rootResult, part)
 				} else {
 					flag := lo.SomeBy(lines, func(line string) bool {
-						return strings.Contains(line, groups[1]+":")
+						return strings.Contains(line, groups[1]+":") || groups[1] == fileNamespace
 					})
 					if flag {
 						rootResult = append(rootResult, part)

pkg/content_manager.go

@@ -15,7 +15,7 @@ import (
 )
 
 const (
-	NamespacePattern = "(\\\\|/)_([a-zA-Z0-9]+)_"
+	NamespacePattern = "\\\\|/_[a-zA-Z0-9]+_"
 )
 
 var (