jkf 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d818940b6bb6a5173cdff2ccadedeffa608204a7
-  data.tar.gz: 68032a91c6c67e182783093b6a30e7a5f2b8cf22
+  metadata.gz: 5c91b3b16debff343f298891452919ea2ec20527
+  data.tar.gz: b7c82914f613103e23087dd55f824da707846ca8
 SHA512:
-  metadata.gz: 16d4a5fc1a4d4ce5e200451716c239d18c07e8225e5ba7ddfe719d31863d30f7d57f34f1d9ba8fc21556a20aa974fb51c0cd277357bc3fd10774d21a0f2eae72
-  data.tar.gz: b49d9d3c088278ba553d4e06b53f079368877b6ddc5a3da22b407849f77d91fae04a8632d27e586d8d1d99f3064f79f73b92c5b9c95fb77f0772b5124fac8697
+  metadata.gz: c38021483c7d0457332083545ae03081f45de7bd8c43378d6c66f656cc0436f308422a253822a3545152c597a56621ffeccdb5e45e722faa0f1c6fc0ec8208ae
+  data.tar.gz: 41dae1d0deaed3ed33d21955429ab23f7f70f0e316b77dd0637b64b4412a36058a150be2cccd547cdb31774caeabe853c8cd14ce8e7bc00a710c033dcae24ccc

data/lib/jkf/converter.rb

@@ -5,5 +5,6 @@ module Jkf
 end
 
 require 'json'
-require 'jkf/converter/ki2'
 require 'jkf/converter/kif'
+require 'jkf/converter/ki2'
+require 'jkf/converter/csa'

data/lib/jkf/converter/csa.rb

@@ -0,0 +1,160 @@
+module Jkf::Converter
+  class Csa
+    VERSION = '2.2'
+
+    def convert(jkf)
+      hash = if jkf.is_a?(Hash)
+               jkf
+             else
+               JSON.parse(jkf)
+             end
+
+      result = version
+      result += convert_information(hash['header']) if hash['header']
+      result += convert_initial(hash['initial']) if hash['initial']
+      result += convert_moves(hash['moves']) if hash['moves']
+      result
+    end
+
+    def convert_information(header)
+      result = ''
+      result += 'N+' + (header.delete('先手') || header.delete('下手') || '') + "\n" if header['先手'] || header['下手']
+      result += 'N-' + (header.delete('後手') || header.delete('上手') || '') + "\n" if header['後手'] || header['上手']
+      header.each { |(k,v)| result += "$#{csa_header_key(k)}:#{v}\n" }
+      result
+    end
+
+    def convert_initial(initial)
+      result = ''
+      data = initial['data']
+      if initial['preset'] == 'OTHER'
+        9.times { |y|
+          line = "P#{y+1}"
+          9.times { |x|
+            piece = data['board'][8-x][y]
+            line += if piece == {}
+                       " * "
+                     else
+                       csa_color(piece['color']) + piece['kind']
+                     end
+          }
+          result += line + "\n"
+        }
+      else
+        result += 'PI'
+        case initial['preset']
+        when 'HIRATE'
+        when 'KY' # 香落ち
+          result += '11KY'
+        when 'KY_R' # 右香落ち
+          result += '91KY'
+        when 'KA' # 角落ち
+          result += '22KA'
+        when 'HI' # 飛車落ち
+          result += '82HI'
+        when 'HIKY' # 飛香落ち
+          result += '22HI11KY91KY'
+        when '2' # 二枚落ち
+          result += '82HI22KA'
+        when '3' # 三枚落ち
+          result += '82HI22KA91KY'
+        when '4' # 四枚落ち
+          result += '82HI22KA11KY91KY'
+        when '5' # 五枚落ち
+          result += '82HI22KA81KE11KY91KY'
+        when '5_L' # 左五枚落ち
+          result += '82HI22KA21KE11KY91KY'
+        when '6' # 六枚落ち
+          result += '82HI22KA21KE81KE11KY91KY'
+        when '8' # 八枚落ち
+          result += '82HI22KA31GI71GI21KE81KE11KY91KY'
+        when '10' # 十枚落ち
+          result += '82HI22KA41KI61KI31GI71GI21KE81KE11KY91KY'
+        end
+      end
+      # 持駒
+      if data['hands']
+        sum = 0
+        data['hands'][0].each_value { |n| sum += n }
+        if sum > 0
+          result += 'P+'
+          data['hands'][0].to_a.reverse.each { |(k, v)| v.times { result += "00#{k}" } }
+          result += "\n"
+        end
+        sum = 0
+        data['hands'][1].each_value { |n| sum += n }
+        if sum > 0
+          result += 'P-'
+          data['hands'][1].to_a.reverse.each { |(k, v)| v.times { result += "00#{k}" } }
+          result += "\n"
+        end
+      end
+      result += csa_color(data['color']) + "\n" if data['color']
+      result
+    end
+
+    def convert_moves(moves)
+      result = ''
+      moves.each do |move|
+        next if move == {}
+        result += convert_move(move['move']) if move['move']
+        result += convert_special(move['special'], move['color']) if move['special']
+        if move['time']
+          result += "," + convert_time(move['time'])
+        elsif move['move'] || move['special']
+          result += "\n"
+        end
+        result += convert_comments(move['comments']) if move['comments']
+      end
+      result
+    end
+
+    def convert_move(move)
+      result = csa_color(move['color'])
+      result += if move['from']
+                  "#{move['from']['x']}#{move['from']['y']}"
+                else
+                  "00"
+                end
+      result += "#{move['to']['x']}#{move['to']['y']}"
+      result += move['piece']
+      result
+    end
+
+    def convert_special(special, color=nil)
+      result = "%"
+      result += csa_color(color) if color
+      result += special
+      result
+    end
+
+    def convert_time(time)
+      sec = time['now']['m'] * 60 + time['now']['s']
+      "T#{sec}\n"
+    end
+
+    def convert_comments(comments)
+      comments.map { |comment| "'#{comment}" }.join("\n") + "\n"
+    end
+
+    protected
+
+    def csa_color(color)
+      color == 0 ? '+' : '-'
+    end
+
+    def version
+      "V#{VERSION}\n"
+    end
+
+    def csa_header_key(key)
+      {
+        "棋戦"     => "EVENT",
+        "場所"     => "SITE",
+        "開始日時" => "START_TIME",
+        "終了日時" => "END_TIME",
+        "持ち時間" => "TIME_LIMIT",
+      }[key] || key
+    end
+  end
+end

data/lib/jkf/parser/csa.rb

@@ -710,11 +710,11 @@ module Jkf::Parser
               s5 = parse_nl
               if s5 != :failed
                 @reported_pos = s0
-                s0 = s1 = -> (from, to, piece) {
-                  ret = { "to" => to, "piece" => piece }
+                s0 = s1 = -> (color, from, to, piece) {
+                  ret = { "color" => color, "to" => to, "piece" => piece }
                   ret["from"] = from if from["x"] != 0
                   ret
-                }.call(s2, s3, s4)
+                }.call(s1, s2, s3, s4)
               else
                 @current_pos = s0
                 s0 = :failed

data/lib/jkf/version.rb

@@ -1,3 +1,3 @@
 module Jkf
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jkf
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - iyuuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-21 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,6 +86,7 @@ files:
 - jkf.gemspec
 - lib/jkf.rb
 - lib/jkf/converter.rb
+- lib/jkf/converter/csa.rb
 - lib/jkf/converter/ki2.rb
 - lib/jkf/converter/kif.rb
 - lib/jkf/parser.rb