minor

Author: Dominik Przybyl

cmd/aem/content.go

@@ -198,6 +198,7 @@ func (c *CLI) contentPushCmd() *cobra.Command {
 			if err = instance.ContentManager().Push(path, clean, vault, pkg.PackageCreateOpts{
 				FilterRoots:     filterRoots,
 				ExcludePatterns: excludePatterns,
+				ContentPath:     path,
 			}); err != nil {
 				c.Error(err)
 				return
@@ -340,7 +341,7 @@ func determineFilterRoots(cmd *cobra.Command) []string {
 
 func determineExcludePatterns(cmd *cobra.Command) []string {
 	file, _ := determineContentFile(cmd)
-	if file == "" || !strings.HasSuffix(file, content.JCRContentFile) {
+	if file == "" || !strings.HasSuffix(file, content.JCRContentFile) || content.IsPageContentFile(file) {
 		return nil
 	}
 

pkg/content/content.go

@@ -22,6 +22,7 @@ const (
 	XmlFileSuffix            = ".xml"
 	JCRMixinTypesProp        = "jcr:mixinTypes"
 	JCRRootPrefix            = "<jcr:root"
+	JCRContentNode           = "jcr:content"
 	PropPattern              = "^\\s*([^ =]+)=\"([^\"]+)\"(.*)$"
 	NamespacePattern         = "^\\w+:(\\w+)=\"[^\"]+\"$"
 	FileWithNamespacePattern = "[\\\\/]_([a-zA-Z0-9]+)_[^\\\\/]+([\\\\/]\\.content)?\\.xml$"
@@ -357,3 +358,18 @@ func determineStringSlice(values any, key string) []string {
 	}
 	return result
 }
+
+func IsPageContentFile(path string) bool {
+	if pathx.IsDir(path) || !strings.HasSuffix(path, JCRContentFile) {
+		return false
+	}
+
+	lines, err := readLines(path)
+	if err != nil {
+		return false
+	}
+
+	return lo.SomeBy(lines, func(line string) bool {
+		return strings.Contains(line, "cq:PageContent")
+	})
+}

pkg/content_manager.go

@@ -119,7 +119,7 @@ func (cm *ContentManager) Download(localFile string, clean bool, vault bool, opt
 	return nil
 }
 
-func (cm *ContentManager) PullDir(dir string, clean bool, replace bool, vault bool, opts PackageCreateOpts) error {
+func (cm *ContentManager) PullDir(dir string, clean bool, vault bool, replace bool, opts PackageCreateOpts) error {
 	workDir := pathx.RandomDir(cm.tmpDir(), "content_pull")
 	defer func() { _ = pathx.DeleteIfExists(workDir) }()
 	if err := cm.pullContent(workDir, vault, opts); err != nil {
@@ -168,11 +168,8 @@ func (cm *ContentManager) PullFile(file string, clean bool, vault bool, opts Pac
 
 func (cm *ContentManager) pushContent(destInstance *Instance, vault bool, opts PackageCreateOpts) error {
 	if vault {
-		mainDir := opts.ContentPath
-		if pathx.IsFile(mainDir) {
-			mainDir = filepath.Dir(mainDir)
-		}
-		jcrPath := DetermineFilterRoot(mainDir)
+		mainDir, _, _ := strings.Cut(opts.ContentPath, content.JCRRoot)
+		jcrPath := DetermineFilterRoot(opts.ContentPath)
 		vaultCliArgs := []string{
 			"vlt",
 			"--credentials", fmt.Sprintf("%s:%s", destInstance.user, destInstance.password),
@@ -202,10 +199,10 @@ func (cm *ContentManager) Push(path string, clean bool, vault bool, opts Package
 	}
 	workDir := pathx.RandomDir(cm.tmpDir(), "content_push")
 	defer func() { _ = pathx.DeleteIfExists(workDir) }()
+	if opts.PID == "" {
+		opts.PID = fmt.Sprintf("aemc:content-push:%s-SNAPSHOT", timex.FileTimestampForNow())
+	}
 	if clean || vault && pathx.IsFile(path) {
-		if opts.PID == "" {
-			opts.PID = fmt.Sprintf("aemc:content-push:%s-SNAPSHOT", timex.FileTimestampForNow())
-		}
 		if err := copyPackageAllFiles(workDir, opts); err != nil {
 			return err
 		}

pkg/package_manager.go

@@ -240,7 +240,9 @@ func (pm *PackageManager) Create(opts PackageCreateOpts) (string, error) {
 func DetermineFilterRoot(path string) string {
 	_, filterRoot, _ := strings.Cut(path, content.JCRRoot)
 	filterRoot = strings.ReplaceAll(filterRoot, "\\", "/")
-	if strings.HasSuffix(path, content.JCRContentFile) {
+	if content.IsPageContentFile(path) {
+		filterRoot = strings.ReplaceAll(filterRoot, content.JCRContentFile, content.JCRContentNode)
+	} else if strings.HasSuffix(path, content.JCRContentFile) {
 		filterRoot = filepath.Dir(filterRoot)
 	} else if strings.HasSuffix(path, content.XmlFileSuffix) {
 		filterRoot = strings.ReplaceAll(filterRoot, content.XmlFileSuffix, "")