Focused only exclude files.

README.md

@@ -1,2 +1,5 @@
-# sczip
-Zip archive for Scala.
+# ScZip
+
+Simple zip archive for Scala.
+
+

build.sbt

@@ -2,4 +2,6 @@ name := "sczip"
 
 version := "0.1"
 
-scalaVersion := "2.12.6"
+scalaVersion := "2.12.6"
+
+libraryDependencies += "net.lingala.zip4j" % "zip4j" % "1.3.2"

src/main/scala/com/yuchesc/sczip/Condition.scala

@@ -12,11 +12,6 @@ class PathMatchCondition(pattern: String) extends Condition {
   override def hit(file: Path): Boolean = matcher.matches(file)
 }
 
-class Not(condition: Condition) extends Condition {
-  override def hit(file: Path): Boolean = !condition.hit(file)
-}
-
-object Condition {
-  def pathMatch(pattern: String) = new PathMatchCondition(pattern)
-  def notPathMatch(pattern: String) = new Not(pathMatch(pattern))
+object Exclude {
+  def apply(pattern: String): Condition = new PathMatchCondition(pattern)
 }

src/main/scala/com/yuchesc/sczip/ScZip.scala

@@ -4,29 +4,37 @@ import java.io._
 import java.nio.file._
 import java.util.zip.ZipOutputStream
 
-object ScZip {
+class ScZip(targetPath: Path, exclude: Option[Condition]) {
 
-  def zipTreeToOutputStream(out: OutputStream, root: Path, condition: Condition): Unit = {
+  def zipToOutputStream(out: OutputStream): Unit = {
     val zip = new ZipOutputStream(out)
-    Files.walkFileTree(root, new ZipFileVisitor(zip, condition))
+    Files.walkFileTree(targetPath, new ZipFileVisitor(zip, exclude))
     zip.close()
   }
 
-  def zipTreeToFile(root: Path, outPath: Path, condition: Condition): Unit = {
-    zipTreeToOutputStream(new FileOutputStream(outPath.toFile), root, condition)
+  def zipToFile(outPath: Path): Unit = {
+    zipToOutputStream(new FileOutputStream(outPath.toFile))
   }
 
-  def zipTreeToFileToBytes(root: Path, condition: Condition): Array[Byte] = {
+  def zipToFileToBytes(): Array[Byte] = {
     val out = new ByteArrayOutputStream()
-    zipTreeToOutputStream(out, root, condition)
+    zipToOutputStream(out)
     out.toByteArray
   }
+}
+
+object ScZip {
+
+  def apply(targetPath: Path): ScZip = new ScZip(targetPath, None)
+
+  def apply(targetPath: Path, exclude: Condition): ScZip = new ScZip(targetPath, Option(exclude))
 
   def main(args: Array[String]): Unit = {
-    val cond = Condition.pathMatch("**/*.{class,properties}")
-    zipTreeToFile(Paths.get("./project"), Paths.get("./hoge/out.zip"), cond)
+    val zip = ScZip(Paths.get("./project"), Exclude("**/*.{class,cache}"))
 
-    val bytes = zipTreeToFileToBytes(Paths.get("./src"), cond)
+    val bytes = zip.zipToFileToBytes()
     println(bytes.length)
+
+    zip.zipToFile(Paths.get("./out.zip"))
   }
 }

src/main/scala/com/yuchesc/sczip/ZipFileVisitor.scala

@@ -5,9 +5,9 @@ import java.nio.file._
 import java.nio.file.attribute.BasicFileAttributes
 import java.util.zip.{ZipEntry, ZipOutputStream}
 
-protected class ZipFileVisitor(zip: ZipOutputStream, condition: Condition) extends SimpleFileVisitor[Path] {
+protected class ZipFileVisitor(zip: ZipOutputStream, exclude: Option[Condition]) extends SimpleFileVisitor[Path] {
   override def visitFile(file: Path, attrs: BasicFileAttributes): FileVisitResult = {
-    if (condition.hit(file)) {
+    if (exclude.isEmpty || !exclude.get.hit(file)) {
       val entry = new ZipEntry(file.toString)
       zip.putNextEntry(entry)
       val buffer = Array.ofDim[Byte](255)