Cleanup (duplicated code; typos; formatting)

GitOrigin-RevId: ca253ae9bfc54ab147a50b2895187b03ca695428

platform/built-in-server/src/org/jetbrains/ide/UploadLogsService.kt

@@ -1,11 +1,11 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package org.jetbrains.ide
 
 import com.fasterxml.jackson.core.JsonFactory
 import com.intellij.ide.IdeBundle
 import com.intellij.ide.actions.CollectZippedLogsAction
 import com.intellij.ide.actions.ReportFeedbackService
-import com.intellij.ide.logsUploader.LogsPacker
+import com.intellij.ide.logsUploader.LogPacker
 import com.intellij.notification.Notification
 import com.intellij.notification.NotificationType
 import com.intellij.openapi.components.service
@@ -59,7 +59,7 @@ class UploadLogsService : RestService() {
           withBackgroundProgress(project, IdeBundle.message("collect.upload.logs.progress.title"), true) {
             try {
               val byteOut = BufferExposingByteArrayOutputStream()
-              val uploadedID = LogsPacker.uploadLogs(project)
+              val uploadedID = LogPacker.uploadLogs(project)
               JsonFactory().createGenerator(byteOut).useDefaultPrettyPrinter().use { writer ->
                 writer.obj {
                   writer.writeStringField("Upload_id", uploadedID)
@@ -85,4 +85,4 @@ class UploadLogsService : RestService() {
   override fun isHostTrusted(request: FullHttpRequest, urlDecoder: QueryStringDecoder): Boolean {
     return isHostInPredefinedHosts(request, trustedPredefinedHosts, propertyKeyForTrustedHosts)
   }
-}
+}

platform/platform-impl/src/com/intellij/ide/actions/CollectZippedLogsAction.kt

@@ -3,7 +3,7 @@ package com.intellij.ide.actions
 
 import com.intellij.CommonBundle
 import com.intellij.ide.IdeBundle
-import com.intellij.ide.logsUploader.LogsPacker.packLogs
+import com.intellij.ide.logsUploader.LogPacker.packLogs
 import com.intellij.ide.util.PropertiesComponent
 import com.intellij.idea.ActionsBundle
 import com.intellij.notification.Notification

platform/platform-impl/src/com/intellij/ide/actions/DefaultReportFeedbackService.kt

@@ -1,8 +1,8 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.ide.actions
 
 import com.intellij.ide.IdeBundle
-import com.intellij.ide.logsUploader.LogsPacker
+import com.intellij.ide.logsUploader.LogPacker
 import com.intellij.openapi.project.Project
 import com.intellij.platform.ide.progress.withBackgroundProgress
 import kotlinx.coroutines.CoroutineScope
@@ -12,7 +12,7 @@ class DefaultReportFeedbackService(override val coroutineScope: CoroutineScope):
   override suspend fun collectLogs(project: Project?): String? {
     if (project == null) return null
     return withBackgroundProgress(project, IdeBundle.message("reportProblemAction.progress.title.submitting"), true) {
-      LogsPacker.getBrowseUrl(LogsPacker.uploadLogs(project))
+      LogPacker.getBrowseUrl(LogPacker.uploadLogs(project))
     }
   }
-}
+}

platform/platform-impl/src/com/intellij/ide/logsUploader/DefaultLogsProcessor.kt

@@ -1,11 +1,10 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.ide.logsUploader
 
 import com.intellij.openapi.application.PathManager
 import com.intellij.openapi.project.Project
 
 class DefaultLogsProcessor: LogProvider {
-  override fun getAdditionalLogFiles(project: Project?): List<LogProvider.LogsEntry> {
-    return listOf(LogProvider.LogsEntry("", listOf(PathManager.getLogDir())))
-  }
-}
+  override fun getAdditionalLogFiles(project: Project?): List<LogProvider.LogsEntry> =
+    listOf(LogProvider.LogsEntry("", listOf(PathManager.getLogDir())))
+}

platform/platform-impl/src/com/intellij/ide/logsUploader/LogPacker.kt

@@ -1,4 +1,4 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.ide.logsUploader
 
 import com.fasterxml.jackson.core.JsonFactory
@@ -8,7 +8,6 @@ import com.google.gson.reflect.TypeToken
 import com.intellij.diagnostic.PerformanceWatcher.Companion.getInstance
 import com.intellij.ide.IdeBundle
 import com.intellij.ide.actions.CollectZippedLogsAction
-import com.intellij.ide.logsUploader.LogProvider.*
 import com.intellij.ide.troubleshooting.CompositeGeneralTroubleInfoCollector
 import com.intellij.ide.troubleshooting.collectDimensionServiceDiagnosticsData
 import com.intellij.idea.LoggerFactory
@@ -25,16 +24,14 @@ import com.intellij.platform.util.progress.withRawProgressReporter
 import com.intellij.troubleshooting.TroubleInfoCollector
 import com.intellij.util.SystemProperties
 import com.intellij.util.concurrency.annotations.RequiresBackgroundThread
+import com.intellij.util.io.Compressor
 import com.intellij.util.io.HttpRequests
-import com.intellij.util.io.addFile
-import com.intellij.util.io.addFolder
 import com.intellij.util.io.jackson.obj
 import com.intellij.util.net.NetUtils
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ensureActive
 import kotlinx.coroutines.withContext
 import org.jetbrains.annotations.ApiStatus
-import java.io.FileOutputStream
 import java.io.IOException
 import java.net.HttpURLConnection
 import java.nio.charset.StandardCharsets
@@ -42,14 +39,14 @@ import java.nio.file.Files
 import java.nio.file.Path
 import java.text.SimpleDateFormat
 import java.util.*
-import java.util.zip.ZipOutputStream
 import kotlin.io.path.exists
 import kotlin.io.path.fileSize
+import kotlin.io.path.forEachDirectoryEntry
 import kotlin.io.path.inputStream
 import kotlin.io.path.name
 
 @ApiStatus.Internal
-object LogsPacker {
+object LogPacker {
   private const val UPLOADS_SERVICE_URL = "https://uploads.jetbrains.com"
 
   private val gson: Gson by lazy {
@@ -62,63 +59,68 @@ object LogsPacker {
   @JvmStatic
   @RequiresBackgroundThread
   @Throws(IOException::class)
-  suspend fun packLogs(project: Project?): Path {
-    return withContext(Dispatchers.IO) {
-      getInstance().dumpThreads("", false, false)
+  suspend fun packLogs(project: Project?): Path = withContext(Dispatchers.IO) {
+    getInstance().dumpThreads("", false, false)
 
-      val productName = ApplicationNamesInfo.getInstance().productName.lowercase()
-      val date = SimpleDateFormat("yyyyMMdd-HHmmss").format(Date())
-      val archive = Files.createTempFile("$productName-logs-$date", ".zip")
-      try {
-        val additionalFiles = LogProvider.EP.extensionList.firstOrNull()?.getAdditionalLogFiles(project)
-        ZipOutputStream(FileOutputStream(archive.toFile())).use { zip ->
-          coroutineContext.ensureActive()
-          val logs = PathManager.getLogDir()
-          val caches = PathManager.getSystemDir()
-          if (Files.isSameFile(logs, caches)) {
-            throw IOException("cannot collect logs, because log directory set to be the same as the 'system' one: $logs")
-          }
-          val lf = Logger.getFactory()
-          if (lf is LoggerFactory) {
-            lf.flushHandlers()
-          }
+    val logs = PathManager.getLogDir()
+    val caches = PathManager.getSystemDir()
+    if (Files.isSameFile(logs, caches)) {
+      throw IOException("cannot collect logs, because log directory set to be the same as the 'system' one: $logs")
+    }
 
-          additionalFiles?.let { addAdditionalFilesToZip(it, zip) }
+    val productName = ApplicationNamesInfo.getInstance().productName.lowercase()
+    val date = SimpleDateFormat("yyyyMMdd-HHmmss").format(Date())
+    val archive = Files.createTempFile("${productName}-logs-${date}", ".zip")
+    try {
+      Compressor.Zip(archive).use { zip ->
+        coroutineContext.ensureActive()
+        val lf = Logger.getFactory()
+        if (lf is LoggerFactory) {
+          lf.flushHandlers()
+        }
 
-          coroutineContext.ensureActive()
-          if (project != null) {
-            val settings = StringBuilder()
-            settings.append(CompositeGeneralTroubleInfoCollector().collectInfo(project))
-            for (troubleInfoCollector in TroubleInfoCollector.EP_SETTINGS.extensions) {
-              coroutineContext.ensureActive()
-              settings.append(troubleInfoCollector.collectInfo(project)).append('\n')
-            }
-            zip.addFile("troubleshooting.txt", settings.toString().toByteArray(StandardCharsets.UTF_8))
-            zip.addFile("dimension.txt", collectDimensionServiceDiagnosticsData(project).toByteArray(StandardCharsets.UTF_8))
-          }
-          Files.newDirectoryStream(Path.of(SystemProperties.getUserHome())).use { paths ->
-            for (path in paths) {
-              coroutineContext.ensureActive()
-              val name = path.fileName.toString()
-              if ((name.startsWith("java_error_in") || name.startsWith("jbr_err_pid")) && !name.endsWith("hprof") && Files.isRegularFile(
-                  path)) {
-                zip.addFolder(name, path)
+        LogProvider.EP.extensionList.firstOrNull()?.let { logProvider ->
+          logProvider.getAdditionalLogFiles(project).forEach { entry ->
+            for (file in entry.files) {
+              if (file.exists()) {
+                val entryName = if (entry.entryName.isNotEmpty()) "${entry.entryName}/${file.name}" else ""
+                zip.addDirectory(entryName, file)
               }
             }
           }
         }
-      }
-      catch (e: IOException) {
-        try {
-          Files.delete(archive)
+
+        coroutineContext.ensureActive()
+        if (project != null) {
+          val settings = StringBuilder()
+          settings.append(CompositeGeneralTroubleInfoCollector().collectInfo(project))
+          for (troubleInfoCollector in TroubleInfoCollector.EP_SETTINGS.extensionList) {
+            coroutineContext.ensureActive()
+            settings.append(troubleInfoCollector.collectInfo(project)).append('\n')
+          }
+          zip.addFile("troubleshooting.txt", settings.toString().toByteArray(StandardCharsets.UTF_8))
+          zip.addFile("dimension.txt", collectDimensionServiceDiagnosticsData(project).toByteArray(StandardCharsets.UTF_8))
         }
-        catch (x: IOException) {
-          e.addSuppressed(x)
+
+        Path.of(SystemProperties.getUserHome()).forEachDirectoryEntry { path ->
+          coroutineContext.ensureActive()
+          val name = path.name
+          if ((name.startsWith("java_error_in") || name.startsWith("jbr_err_pid")) && !name.endsWith("hprof") && Files.isRegularFile(path)) {
+            zip.addFile(name, path)
+          }
         }
-        throw e
       }
-      archive
     }
+    catch (e: IOException) {
+      try {
+        Files.delete(archive)
+      }
+      catch (x: IOException) {
+        e.addSuppressed(x)
+      }
+      throw e
+    }
+    archive
   }
 
   @RequiresBackgroundThread
@@ -184,23 +186,4 @@ object LogsPacker {
   }
 
   fun getBrowseUrl(folderName: String): String = "$UPLOADS_SERVICE_URL/browse#$folderName"
-
-  private fun addAdditionalFilesToZip(logsEntryList: List<LogsEntry>,
-                                      zip: ZipOutputStream) {
-    for (additionalFiles in logsEntryList) {
-      for (file in additionalFiles.files) {
-        if (file.exists()) {
-          val entryName = buildEntryName(additionalFiles.entryName, file)
-          zip.addFolder(entryName, file)
-        }
-      }
-    }
-  }
-
-  /**
-   * @return entry name. Empty name is expected for platform logs
-   */
-  private fun buildEntryName(prefix: String?, file: Path): String {
-    return if (!prefix.isNullOrEmpty()) "$prefix/${file.name}" else ""
-  }
-}
+}

platform/util/src/com/intellij/util/io/ZipUtils.kt

@@ -1,41 +0,0 @@
-// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
-package com.intellij.util.io
-
-import com.intellij.openapi.diagnostic.fileLogger
-import java.nio.file.*
-import java.util.zip.ZipEntry
-import java.util.zip.ZipOutputStream
-import kotlin.io.path.*
-
-@OptIn(ExperimentalPathApi::class)
-fun ZipOutputStream.addFolder(entryName: String, folder: Path) {
-  for (path in folder.walk()) {
-    val relativized = folder.relativize(path)
-    val prefix = if (entryName.isNotEmpty()) {
-      "$entryName/"
-    } else ""
-    addEntry(prefix + relativized.joinToString(separator = "/") { it.name }) {
-      path.inputStream().use {
-        it.copyTo(this)
-      }
-    }
-  }
-}
-
-fun ZipOutputStream.addFile(entryName: String, byteArray: ByteArray) {
-  addEntry(entryName) { write(byteArray) }
-}
-
-fun ZipOutputStream.addEntry(entryName: String, operation: () -> Unit) {
-  val zipEntry = ZipEntry(entryName)
-  try {
-    putNextEntry(zipEntry)
-    operation()
-  }
-  catch (ex: Exception) {
-    fileLogger().error("Failed to add file to stream", ex)
-  }
-  finally {
-    closeEntry()
-  }
-}