close stream after content loaded

b3er · Feb 18, 2022 · 29b3364 · 29b3364
1 parent a7973a2
commit 29b3364
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/...main/kotlin/com/github/b3er/idea/plugins/arc/browser/base/sevenzip/SevenZipInputStream.kt b/...main/kotlin/com/github/b3er/idea/plugins/arc/browser/base/sevenzip/SevenZipInputStream.kt
@@ -1,6 +1,7 @@
 package com.github.b3er.idea.plugins.arc.browser.base.sevenzip
 
 import com.Ostermiller.util.CircularByteBuffer
+import com.github.b3er.idea.plugins.arc.browser.formats.sevenzip.SevenZipArchiveHolder
 import net.sf.sevenzipjbinding.ExtractOperationResult
 import net.sf.sevenzipjbinding.simple.ISimpleInArchiveItem
 import java.io.File

diff --git a/...om/github/b3er/idea/plugins/arc/browser/formats/sevenzip/SevenZipArchiveFileSystemImpl.kt b/...om/github/b3er/idea/plugins/arc/browser/formats/sevenzip/SevenZipArchiveFileSystemImpl.kt
@@ -1,7 +1,6 @@
 package com.github.b3er.idea.plugins.arc.browser.formats.sevenzip
 
 import com.github.b3er.idea.plugins.arc.browser.base.BaseArchiveFileSystem
-import com.github.b3er.idea.plugins.arc.browser.base.sevenzip.SevenZipArchiveHandler
 import com.github.b3er.idea.plugins.arc.browser.util.FSUtils
 import com.intellij.openapi.fileTypes.FileType
 import com.intellij.openapi.vfs.VirtualFileManager

diff --git a/...r/base/sevenzip/SevenZipArchiveHandler.kt → ...ormats/sevenzip/SevenZipArchiveHandler.kt b/...r/base/sevenzip/SevenZipArchiveHandler.kt → ...ormats/sevenzip/SevenZipArchiveHandler.kt
@@ -1,7 +1,8 @@
-package com.github.b3er.idea.plugins.arc.browser.base.sevenzip
+package com.github.b3er.idea.plugins.arc.browser.formats.sevenzip
 
 import com.github.b3er.idea.plugins.arc.browser.base.BaseArchiveHandler
 import com.github.b3er.idea.plugins.arc.browser.base.nest.SupportsStreamForVirtualFile
+import com.github.b3er.idea.plugins.arc.browser.base.sevenzip.SevenZipInputStream
 import com.github.b3er.idea.plugins.arc.browser.util.FSUtils
 import com.github.b3er.idea.plugins.arc.browser.util.getAndUse
 import com.intellij.openapi.util.io.FileTooBigException
@@ -26,14 +27,16 @@ class SevenZipArchiveHandler(
       if (FileUtilRt.isTooLarge(item.size ?: DEFAULT_LENGTH)) {
         throw FileTooBigException("$file!/$relativePath")
       } else {
-        ByteArrayOutputStream(
-          item.size?.toInt()?.coerceAtLeast(DEFAULT_BUFFER_SIZE) ?: SevenZipInputStream.BUFFER_SIZE
-        ).use { stream ->
-          item.extractSlow {
-            stream.write(it)
-            it.size
+        holder.useStream {
+          ByteArrayOutputStream(
+            item.size?.toInt()?.coerceAtLeast(DEFAULT_BUFFER_SIZE) ?: SevenZipInputStream.BUFFER_SIZE
+          ).use { stream ->
+            item.extractSlow { bytes ->
+              stream.write(bytes)
+              bytes.size
+            }
+            stream.toByteArray()
           }
-          stream.toByteArray()
         }
       }
     }

diff --git a/...er/base/sevenzip/SevenZipArchiveHolder.kt → ...formats/sevenzip/SevenZipArchiveHolder.kt b/...er/base/sevenzip/SevenZipArchiveHolder.kt → ...formats/sevenzip/SevenZipArchiveHolder.kt
@@ -1,5 +1,6 @@
-package com.github.b3er.idea.plugins.arc.browser.base.sevenzip
+package com.github.b3er.idea.plugins.arc.browser.formats.sevenzip
 
+import com.github.b3er.idea.plugins.arc.browser.base.sevenzip.ReusableRandomAccessFileStream
 import net.sf.sevenzipjbinding.IInArchive
 import net.sf.sevenzipjbinding.IInStream
 import net.sf.sevenzipjbinding.SevenZip