minor

dominik-przybyl-wttech · dominik-przybyl-wttech · commit 424bcd235560 · 2024-05-14T18:13:31.000+02:00
diff --git a/pkg/content_manager.go b/pkg/content_manager.go
@@ -37,15 +37,15 @@ func (cm *ContentManager) pkgMgr() *PackageManager {
 }
 
 func (cm *ContentManager) tmpDir() string {
-	if !cm.instance.manager.aem.config.TemplateFileExists() {
+	if cm.instance.manager.aem.Detached() {
 		return os.TempDir()
 	}
 	return cm.instance.manager.aem.baseOpts.TmpDir
 }
 
 func (cm *ContentManager) Download(localFile string, packageOpts PackageCreateOpts) error {
 	if packageOpts.PID == "" {
-		packageOpts.PID = fmt.Sprintf("aemc:content-pull:%s-SNAPSHOT", timex.FileTimestampForNow())
+		packageOpts.PID = fmt.Sprintf("aemc:content-download:%s-SNAPSHOT", timex.FileTimestampForNow())
 	}
 	remotePath, err := cm.pkgMgr().Create(packageOpts)
 	if err != nil {
diff --git a/pkg/facade.go b/pkg/facade.go
@@ -75,3 +75,7 @@ func (a *AEM) Project() *project.Project {
 func (a *AEM) ContentManager() *content.Manager {
 	return a.contentManager
 }
+
+func (a *AEM) Detached() bool {
+	return !a.config.TemplateFileExists()
+}
diff --git a/pkg/package_manager.go b/pkg/package_manager.go
@@ -293,7 +293,7 @@ func (pm *PackageManager) Copy(remotePath string, destInstance *Instance) error
 }
 
 func (pm *PackageManager) tmpDir() string {
-	if !pm.instance.manager.aem.config.TemplateFileExists() {
+	if pm.instance.manager.aem.Detached() {
 		return os.TempDir()
 	}
 	return pm.instance.manager.aem.baseOpts.TmpDir

Original file line number	Diff line number	Diff line change
`@@ -37,15 +37,15 @@ func (cm ContentManager) pkgMgr() PackageManager {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`func (cm *ContentManager) tmpDir() string {`
`40`		`- if !cm.instance.manager.aem.config.TemplateFileExists() {`
	`40`	`+ if cm.instance.manager.aem.Detached() {`
`41`	`41`	`return os.TempDir()`
`42`	`42`	`}`
`43`	`43`	`return cm.instance.manager.aem.baseOpts.TmpDir`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`func (cm *ContentManager) Download(localFile string, packageOpts PackageCreateOpts) error {`
`47`	`47`	`if packageOpts.PID == "" {`
`48`		`- packageOpts.PID = fmt.Sprintf("aemc:content-pull:%s-SNAPSHOT", timex.FileTimestampForNow())`
	`48`	`+ packageOpts.PID = fmt.Sprintf("aemc:content-download:%s-SNAPSHOT", timex.FileTimestampForNow())`
`49`	`49`	`}`
`50`	`50`	`remotePath, err := cm.pkgMgr().Create(packageOpts)`
`51`	`51`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -75,3 +75,7 @@ func (a AEM) Project() project.Project {`
`75`	`75`	`func (a AEM) ContentManager() content.Manager {`
`76`	`76`	`return a.contentManager`
`77`	`77`	`}`
	`78`	`+`
	`79`	`+func (a *AEM) Detached() bool {`
	`80`	`+ return !a.config.TemplateFileExists()`
	`81`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,7 @@ func (pm PackageManager) Copy(remotePath string, destInstance Instance) error`
`293`	`293`	`}`
`294`	`294`
`295`	`295`	`func (pm *PackageManager) tmpDir() string {`
`296`		`- if !pm.instance.manager.aem.config.TemplateFileExists() {`
	`296`	`+ if pm.instance.manager.aem.Detached() {`
`297`	`297`	`return os.TempDir()`
`298`	`298`	`}`
`299`	`299`	`return pm.instance.manager.aem.baseOpts.TmpDir`