embulk-decoder-unzip 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 254a91d5c8164644ab6c7e16f4250391eaa811b2
-  data.tar.gz: 543ba43a846465a90233ae910d17abae7ad722c2
+  metadata.gz: a7752a0d8a9deefa4462b42140a47b76de3d7f21
+  data.tar.gz: 936158b3cdbff5031e5263dc9a97cfe0ec90495f
 SHA512:
-  metadata.gz: 54d42e1a652ef22c142f0ef5cfa93e16352e08eb3ce5613a3759b527483d0649b5a9eacb48e4d7e3d7b949b10a54d8aab3359688d64d2432582b482f3e7149a3
-  data.tar.gz: 785c2ef23a7999e3526bfc68dfb06e58d74b24c869bab8e8f0ad4d816df83a27b0e5d822e31b04d90b6ace55af1ea838dda0fbb9f566247f2eded475593b4ab6
+  metadata.gz: 6d6a2dc184c041d52b38a1027ca4a619c803af4814cece3cdc7cfea1e564bd488780bce1588d0c5244b23e60a1fea265d2ea1119c3875600752993b7cceea5c2
+  data.tar.gz: 2c0ae19262466aff5c6f359648a60e5b9ecf55d93b161117912a970fdacc115815cf09d2eea9cbef83ccc8e148a5b5ed17dc934a73176c376b4fdb700986bf66

data/.gitignore

@@ -10,3 +10,4 @@ build/
 /.metadata/
 .classpath
 .project
+/bin/

data/build.gradle

@@ -13,7 +13,7 @@ configurations {
     provided
 }
 
-version = "0.1.0"
+version = "0.1.1"
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
@@ -77,12 +77,12 @@ task gemspec {
 Gem::Specification.new do |spec|
   spec.name          = "${project.name}"
   spec.version       = "${project.version}"
-  spec.authors       = [""]
+  spec.authors       = ["fundoshi"]
   spec.summary       = %[Unzip decoder plugin for Embulk]
   spec.description   = %[Decodes Unzip-encoded files read by other file input plugins.]
-  spec.email         = [""]
+  spec.email         = ["fundoshi.chiclasico@gmail.com"]
   spec.licenses      = ["MIT"]
-  # TODO set this: spec.homepage      = "https://github.com//embulk-decoder-unzip"
+  # TODO set this: spec.homepage      = "https://github.com/chiclasico/embulk-decoder-unzip"
 
   spec.files         = `git ls-files`.split("\n") + Dir["classpath/*.jar"]
   spec.test_files    = spec.files.grep(%r"^(test|spec)/")

data/src/main/java/org/embulk/decoder/unzip/UnzipDecoderPlugin.java

@@ -3,8 +3,6 @@ package org.embulk.decoder.unzip;
 import java.io.InputStream;
 import java.io.IOException;
 
-import com.google.common.base.Optional;
-
 import org.embulk.config.Config;
 import org.embulk.config.ConfigDefault;
 import org.embulk.config.ConfigInject;
@@ -23,19 +21,9 @@ public class UnzipDecoderPlugin
     public interface PluginTask
             extends Task
     {
-        // configuration option 1 (required integer)
-        @Config("option1")
-        public int getOption1();
-
-        // configuration option 2 (optional string, null is not allowed)
-        @Config("option2")
-        @ConfigDefault("\"myvalue\"")
-        public String getOption2();
-
-        // configuration option 3 (optional string, null is allowed)
-        @Config("option3")
-        @ConfigDefault("null")
-        public Optional<String> getOption3();
+//        @Config("skip_on_error")
+//        @ConfigDefault("true")
+//        public boolean skipOnError();
 
         @ConfigInject
         public BufferAllocator getBufferAllocator();
@@ -54,33 +42,38 @@ public class UnzipDecoderPlugin
     {
         final PluginTask task = taskSource.loadTask(PluginTask.class);
 
-        // Write your code here :)
-        throw new UnsupportedOperationException("UnzipDecoderPlugin.open method is not implemented yet");
+        final FileInputInputStream files = new FileInputInputStream(fileInput);
 
-        // If expect InputStream, you can use this code:
-
-        //final FileInputInputStream files = new FileInputInputStream(fileInput);
-        //
-        //return new InputStreamFileInput(
-        //        task.getBufferAllocator(),
-        //        new InputStreamFileInput.Provider() {
-        //            public InputStream openNext() throws IOException
-        //            {
-        //                if (!files.nextFile()) {
-        //                    return null;
-        //                }
-        //                return newDecoderInputStream(task, files);
-        //            }
-        //
-        //            public void close() throws IOException
-        //            {
-        //                files.close();
-        //            }
-        //        });
+        InputStreamFileInput isfi = null;
+        try {
+	        isfi = new InputStreamFileInput(
+	                task.getBufferAllocator(),
+	                new InputStreamFileInput.Provider() {
+	                    public InputStream openNext() throws IOException
+	                    {
+	                        if (!files.nextFile()) {
+	                            return null;
+	                        }
+	                        return newDecoderInputStream(task, files);
+	                    }
+	        
+	                    public void close() throws IOException
+	                    {
+	                        files.close();
+	                    }
+	                });
+        } catch (Exception e) {
+//        	if(task.skipOnError()) {
+//        		System.out.println("skip: " + isfi.hintOfCurrentInputFileNameForLogging());
+//        		return null;
+//        	} else
+       		throw new RuntimeException(e);
+        }
+        return isfi;
     }
 
-    //private static InputStream newDecoderInputStream(PluginTask task, InputStream file) throws IOException
-    //{
-    //    return new MyInputStream(file);
-    //}
+    private static InputStream newDecoderInputStream(PluginTask task, InputStream file) throws IOException
+    {
+        return new UnzipInputStream(file);
+    }
 }

data/src/main/java/org/embulk/decoder/unzip/UnzipInputStream.java

@@ -0,0 +1,29 @@
+package org.embulk.decoder.unzip;
+
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+public class UnzipInputStream extends InputStream {
+
+	private ZipInputStream zis;
+	
+	public UnzipInputStream(InputStream is) {
+		zis = new ZipInputStream(new BufferedInputStream(is), StandardCharsets.UTF_8);
+	}
+
+	@Override
+	public int read() throws IOException {
+
+		ZipEntry zipentry = zis.getNextEntry();
+		int v = -1;
+		if(zipentry != null)
+       		v = zis.read();
+		return v;
+
+	}
+
+}

data/src/main/resources/config.yml

@@ -1,9 +1,8 @@
 in:
   type: file
-  path_prefix: /tmp/sample.csv
+  path_prefix: /tmp/test
   decoders:
     - type: unzip
-      option1: 1
   parser:
     charset: UTF-8
     newline: CRLF
@@ -12,9 +11,7 @@ in:
     quote: '"'
     escape: ''
     null_string: 'NULL'
-    header_line: true
+    header_line: false
     columns:
-    - {name: col1, type: long}
-    - {name: col2, type: long}
-    - {name: col3, type: string}
+    - {name: col1, type: string}
 out: {type: stdout}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-decoder-unzip
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
-- ''
+- fundoshi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-31 00:00:00.000000000 Z
+date: 2020-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -40,7 +40,7 @@ dependencies:
         version: '12.0'
 description: Decodes Unzip-encoded files read by other file input plugins.
 email:
-- ''
+- fundoshi.chiclasico@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -49,7 +49,7 @@ files:
 - LICENSE.txt
 - README.md
 - build.gradle
-- classpath/embulk-decoder-unzip-0.1.0.jar
+- classpath/embulk-decoder-unzip-0.1.1.jar
 - config/checkstyle/checkstyle.xml
 - config/checkstyle/default.xml
 - gradle/wrapper/gradle-wrapper.jar
@@ -59,8 +59,11 @@ files:
 - lib/embulk/decoder/unzip.rb
 - lib/embulk/guess/unzip.rb
 - src/main/java/org/embulk/decoder/unzip/UnzipDecoderPlugin.java
+- src/main/java/org/embulk/decoder/unzip/UnzipInputStream.java
 - src/main/resources/config.yml
 - src/main/resources/sample.csv
+- src/main/resources/test1.zip
+- src/main/resources/test2.zip
 - src/test/java/org/embulk/decoder/unzip/TestUnzipDecoderPlugin.java
 homepage:
 licenses: