v0.9.0-beta2

CHANGELOG.md

@@ -7,6 +7,13 @@ All notable changes to this project will be documented in this file. This change
 
 - Append documents (v1.0.0)
 
+## [0.9.0-beta2] - 2023-03-23
+
+### Added
+
+- `nd-db.compress` namespace containing input- and output-stream convenience fns
+
+
 ## [0.9.0-beta1] - 2023-03-19
 
 ### Added

README.md

@@ -3,7 +3,7 @@
 # nd-db
 
 ```clojure
-[com.luposlip/nd-db "0.9.0-beta1"]
+[com.luposlip/nd-db "0.9.0-beta2"]
 ```
 
 _Newline Delimited (read-only) Databases!_

project.clj

@@ -1,4 +1,4 @@
-(defproject com.luposlip/nd-db "0.9.0-beta1"
+(defproject com.luposlip/nd-db "0.9.0-beta2"
   :description "Clojure library to use newline delimited files as fast read-only databases."
   :url "https://github.com/luposlip/nd-db"
   :license {:name "Apache License, Version 2.0"

src/nd_db/compress.clj

@@ -0,0 +1,32 @@
+(ns nd-db.compress
+  (:require [clojure.java.io :as io])
+  (:import [java.io ByteArrayInputStream BufferedInputStream BufferedOutputStream]
+           [org.apache.commons.compress.archivers.zip
+            ZipArchiveEntry ZipArchiveOutputStream]
+           [org.apache.commons.compress.compressors
+            CompressorInputStream CompressorStreamFactory]))
+
+(defn compressed-input-stream ^CompressorInputStream [filename]
+  (let [in ^BufferedInputStream (io/input-stream filename)]
+    (.createCompressorInputStream (CompressorStreamFactory.) in)))
+
+(defn zip-output-stream ^ZipArchiveOutputStream [filename]
+  (let [out ^BufferedOutputStream (io/output-stream filename)]
+    (ZipArchiveOutputStream. out)))
+
+(defn write-zip-entry! [^ZipArchiveOutputStream zip-os ^"[B" bytes ^String entry-name]
+  (let [ze (ZipArchiveEntry. entry-name)]
+    (.setSize ze (count bytes))
+    (with-open [is ^ByteArrayInputStream (ByteArrayInputStream. bytes)]
+      (.putArchiveEntry zip-os ze)
+      (io/copy is zip-os)
+      (.closeArchiveEntry zip-os))))
+
+(defn finish-and-close-zip-outputstream! [^ZipArchiveOutputStream zos]
+  (doto zos
+    (.finish)
+    (.close)))
+#_
+(with-open [zos (zip-output-stream "filename.zip")]
+  (write-zip-entry! zos (.getBytes "bytes-to-write") "zip-entry-name.txt")
+  (.finish zos))

src/nd_db/io.clj

@@ -12,8 +12,7 @@
              [io :as ndio]
              [id-fns :as ndid]
              [csv :as csv]])
-  (:import [java.io File BufferedInputStream Writer BufferedWriter]
-           [org.apache.commons.compress.compressors CompressorInputStream CompressorStreamFactory]))
+  (:import [java.io File Writer BufferedWriter]))
 
 (defn tmpdir []
   (System/getProperty "java.io.tmpdir"))
@@ -38,7 +37,9 @@
     (.write (->str data))
     (.newLine)))
 
-(defn path->folder+filename [filepath]
+(defn path->folder+filename
+  "Splits filename into path/folder and filename"
+  [filepath]
   (let [ptrn (re-pattern File/separator)
         parts (s/split filepath ptrn)]
     [(s/join File/separator (butlast parts)) (last parts)]))
@@ -193,7 +194,3 @@
 
 (defn mv-file [source target]
   (shell/sh "mv" source target))
-
-(defn compressed-input-stream ^CompressorInputStream [filename]
-  (let [in ^BufferedInputStream (io/input-stream filename)]
-    (.createCompressorInputStream (CompressorStreamFactory.) in)))