add timestamp type field, use_basename

Signed-off-by: enukane <enukane@glenda9.org>

README.md

@@ -18,8 +18,9 @@ Obsoletes enukane/embulk-plugin-input-pcapng-files
 |:---|:---|:--------|:------|:----------|
 | paths | array | required | [] | paths where pcapng files exist (no recursive searching|
 | convertdot | string | optional | nil | convert "." in field name (for outputing into DB who doesn't accept "dot" in schema)|
+| use\_basename | bool | optional | false | use basename (w/o ext) as "path" value |
 | schema| array of field hash | required | nil | list of field to extract from pcapng file |
-|field hash| hash ({name, type}) | required | nil | "name" matches field name for tshakr (-e), "type" should be "long", "double", "string" |
+|field hash| hash ({name, type}) | required | nil | "name" matches field name for tshakr (-e), "type" should be "long", "double", "string", "timestamp" |
 
 ## Example
 
@@ -31,7 +32,7 @@ in:
   threads: 2
   schema:
     - { name: frame.number,                 type: long }
-    - { name: frame.time_epoch,             type: double }
+    - { name: frame.time_epoch,             type: timestamp }
     - { name: frame.len,                    type: long }
     - { name: wlan_mgt.ssid,                type: string }
 ```

embulk-input-pcapng-files.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "embulk-input-pcapng-files"
-  spec.version       = "0.1.4"
+  spec.version       = "0.1.5"
   spec.authors       = ["enukane"]
   spec.summary       = "Pcapng Files input plugin for Embulk"
   spec.description   = "Pcapng Files input plugin for Embulk"

lib/embulk/input/pcapng_files.rb

@@ -2,6 +2,7 @@
 module Embulk
   module Plugin
     require "csv"
+    require "time"
 
     class InputPcapngFiles < InputPlugin
       Plugin.register_input("pcapng_files", self)
@@ -11,6 +12,7 @@ def self.transaction(config, &control)
           'paths' => [],
           'done' => config.param('done', :array, default: []),
           'convertdot' => config.param('convertdot', :string, default: nil),
+          'use_basename' => config.param('use_basename', :bool, default: false),
         }
 
         task['paths'] = config.param('paths', :array, default: []).map {|path|
@@ -53,7 +55,9 @@ def initialize(task, schema, index, page_builder)
       def run
         path = task['paths'][@index]
         each_packet(path, schema[1..-1].map{|elm| elm.name}) do |hash|
-          entry = [ path ] + schema[1..-1].map {|c|
+          entry = []
+          entry << (task['use_basename'] ? File.basename(path, File.extname(path)) : path)
+          entry += schema[1..-1].map {|c|
             convert(hash[c.name], c.type)
           }
           @page_builder.add(entry)
@@ -77,6 +81,8 @@ def convert val, type
           end
         when :double
           v = v.to_f
+        when :timestamp
+          v = Time.at(v.to_f)
         end
         return v
       end