[starter eel] AT-1851 Dedicated method for projects cache

GitOrigin-RevId: be128dca42964bf2fc983336157db65b527ed6c2
JetBrains · Feb 7, 2025 · 17ccb7a · 17ccb7a
1 parent 99e8a82
commit 17ccb7a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/...s.ide.starter.junit5/testSrc/com/intellij/ide/starter/junit5/GitProjectDownloadingTest.kt b/...s.ide.starter.junit5/testSrc/com/intellij/ide/starter/junit5/GitProjectDownloadingTest.kt
@@ -29,6 +29,6 @@ class GitProjectDownloadingTest {
     projectPath.shouldExist()
 
     val globalPaths by di.instance<GlobalPaths>()
-    projectPath.parent.shouldBe(globalPaths.getCacheDirectoryFor("projects").resolve("unpacked"))
+    projectPath.parent.shouldBe(globalPaths.cacheDirForProjects.resolve("unpacked"))
   }
 }
diff --git a/intellij.tools.ide.starter/src/com/intellij/ide/starter/path/GlobalPaths.kt b/intellij.tools.ide.starter/src/com/intellij/ide/starter/path/GlobalPaths.kt
@@ -41,11 +41,15 @@ abstract class GlobalPaths(val checkoutDir: Path) {
     (testHomePath / "cache").createDirectories()
   }
 
-  /** Cache directory on local or remote machine/target/environment */
+  /**
+   * Cache directory on local or remote machine/target/environment (depends on the configuration of the test)
+   */
   open val cacheDirectory = localCacheDirectory
 
   fun getCacheDirectoryFor(entity: String): Path = (cacheDirectory / entity).createDirectories()
 
+  val cacheDirForProjects: Path get() = getCacheDirectoryFor("projects")
+
   companion object {
     val instance: GlobalPaths
       get() = di.direct.instance<GlobalPaths>()

diff --git a/intellij.tools.ide.starter/src/com/intellij/ide/starter/project/GitProjectInfo.kt b/intellij.tools.ide.starter/src/com/intellij/ide/starter/project/GitProjectInfo.kt
@@ -64,7 +64,7 @@ data class GitProjectInfo(
   private val remoteRepositoryRootDir: Path
     get() {
       val globalPaths by di.instance<GlobalPaths>()
-      val projectsUnpacked = globalPaths.getCacheDirectoryFor("projects").resolve("unpacked").createDirectories()
+      val projectsUnpacked = globalPaths.cacheDirForProjects.resolve("unpacked").createDirectories()
       return projectsUnpacked.resolve(repositoryUrl.split("/").last().split(".git").first())
     }
 

diff --git a/intellij.tools.ide.starter/src/com/intellij/ide/starter/project/RemoteArchiveProjectInfo.kt b/intellij.tools.ide.starter/src/com/intellij/ide/starter/project/RemoteArchiveProjectInfo.kt
@@ -41,9 +41,9 @@ data class RemoteArchiveProjectInfo(
   override fun downloadAndUnpackProject(): Path {
     val globalPaths by di.instance<GlobalPaths>()
 
-    val projectsUnpacked = globalPaths.getCacheDirectoryFor("projects").resolve("unpacked").createDirectories()
+    val projectsUnpacked = globalPaths.cacheDirForProjects.resolve("unpacked").createDirectories()
 
-    val zipFile = globalPaths.getCacheDirectoryFor("projects").resolve("zip").resolve(projectURL.transformUrlToZipName())
+    val zipFile = globalPaths.cacheDirForProjects.resolve("zip").resolve(projectURL.transformUrlToZipName())
 
     HttpClient.downloadIfMissing(url = projectURL, targetFile = zipFile, timeout = downloadTimeout)
     val imagePath: Path = zipFile

diff --git a/intellij.tools.ide.starter/src/com/intellij/ide/starter/project/ReusableLocalProjectInfo.kt b/intellij.tools.ide.starter/src/com/intellij/ide/starter/project/ReusableLocalProjectInfo.kt
@@ -38,7 +38,7 @@ class ReusableLocalProjectInfo(
       return null
     }
 
-    val projectsUnpacked = globalPaths.getCacheDirectoryFor("projects").resolve("unpacked").createDirectories()
+    val projectsUnpacked = globalPaths.cacheDirForProjects.resolve("unpacked").createDirectories()
     val projectHome = projectsUnpacked / projectDir.last().name
 
     val isDeleted = projectHome.toFile().deleteRecursively()