jkf 0.4.2 → 0.5.0

data/lib/jkf/converter/csa.rb

@@ -27,7 +27,7 @@ module Jkf::Converter
 
     def convert_initial(initial)
       result = ""
-      data = initial["data"]
+      data = initial["data"] || {}
       result += if initial["preset"] == "OTHER"
                   convert_board(data["board"])
                 else
@@ -56,9 +56,10 @@ module Jkf::Converter
 
     def convert_moves(moves)
       result = ""
+      before_pos = nil
       moves.each do |move|
         next if move == {}
-        result += convert_move(move["move"]) if move["move"]
+        result += convert_move(move["move"], before_pos) if move["move"]
         result += convert_special(move["special"], move["color"]) if move["special"]
         if move["time"]
           result += "," + convert_time(move["time"])
@@ -66,14 +67,20 @@ module Jkf::Converter
           result += "\n"
         end
         result += convert_comments(move["comments"]) if move["comments"]
+        before_pos = move["move"]["to"] if move["move"] && move["move"]["to"]
       end
       result
     end
 
-    def convert_move(move)
+    def convert_move(move, before_pos)
       result = csa_color(move["color"])
       result += move["from"] ? pos2str(move["from"]) : "00"
-      result + pos2str(move["to"]) + move["piece"]
+      result += if move["to"]
+                  pos2str(move["to"]) + move["piece"]
+                else
+                  pos2str(before_pos) + move["piece"]
+                end
+      result
     end
 
     def convert_special(special, color = nil)
@@ -83,7 +90,7 @@ module Jkf::Converter
     end
 
     def convert_time(time)
-      sec = time["now"]["m"] * 60 + time["now"]["s"]
+      sec = (time["now"]["m"] * 60) + time["now"]["s"]
       "T#{sec}\n"
     end
 
@@ -111,7 +118,8 @@ module Jkf::Converter
     def convert_preset(preset)
       "PI" +
         case preset
-        when "HIRATE"
+        when "HIRATE" # 平手
+          ""
         when "KY" # 香落ち
           "11KY"
         when "KY_R" # 右香落ち

data/lib/jkf/converter/kif.rb

@@ -10,7 +10,7 @@ module Jkf::Converter
       setup_players!(jkf)
 
       result = ""
-      result += convert_header(jkf["header"]) if jkf["header"]
+      result += convert_header(jkf["header"], jkf) if jkf["header"]
       result += convert_initial(jkf["initial"]) if jkf["initial"]
       result += @header2.join
       result += "手数----指手---------消費時間--\n"
@@ -23,7 +23,7 @@ module Jkf::Converter
       result
     end
 
-    def convert_header(header)
+    def convert_header(header, jkf)
       header.map do |(key, value)|
         result = "#{key}：#{value}\n"
         if key =~ /\A[先後上下]手\Z/
@@ -33,6 +33,8 @@ module Jkf::Converter
             @header2 << result
           end
           nil
+        elsif key == "手合割" && jkf["initial"] && jkf["initial"]["preset"] && value == preset2str(jkf["initial"]["preset"])
+          nil
         else
           result
         end
@@ -108,7 +110,7 @@ module Jkf::Converter
     def ljust(str, n)
       len = 0
       str.each_codepoint { |codepoint| len += codepoint > 255 ? 2 : 1 }
-      str + " " * (n - len)
+      str + (" " * (n - len))
     end
 
     def pos2str(pos)

data/lib/jkf/converter/kifuable.rb

@@ -22,7 +22,7 @@ module Jkf::Converter
     end
 
     def convert_handicap(preset)
-      preset != "OTHER" ? "手合割：#{preset2str(preset)}\n" : ""
+      preset == "OTHER" ? "" : "手合割：#{preset2str(preset)}\n"
     end
 
     def convert_teban(data, color)
@@ -108,8 +108,6 @@ module Jkf::Converter
                  n2zen(move["to"]["x"]) + n2kan(move["to"]["y"])
                elsif move["same"]
                  "同　"
-               else
-                 raise "error??"
                end
       result += csa2kind(move["piece"])
       result += "成" if move["promote"]