shuang_pin_tutorial 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9488d21afdc29e4f4cbb81f876fe012e696f8b7038d48c219b8e178acbfa5e85
-  data.tar.gz: cb2b1e0bbc86e5d66351de5ff755b7115f30ed9f70d3a6e168fc283168c57cbf
+  metadata.gz: fa6cc5fb89f01c29c889dd3b703005856f1f8e664c3516e18fa763a95193e49c
+  data.tar.gz: c7c440bda2c4e47a1e562b316e340e8600294ec8eff011ddcef51d1563c9ed3a
 SHA512:
-  metadata.gz: fc3d9517f3da47e13ab26304b4709388552e447e54cd2d929d7a455ace63448604802406af5b0b94ba8155e4b12a0d522e3a6e23cb99907c93489bfab36e378c
-  data.tar.gz: 06150b71520a9a34c100aa663a72b727ccdf2e385882d517c2e3ca511a5ab0b5db98a03bf7679c8d093b48768161d950e06f5cfd07687308c8f8f5e4e932de67
+  metadata.gz: 8a299446b467c6cb1b519b42cf9e17a21c98467dc6a22ee7f49822a8700a89fca2c04722a1ffbd48a4d68ec8c0032e43b16cef49b80e354dec7d5b2c7f352845
+  data.tar.gz: ee017c5cea1efc50e60aab72ce2719633d2004bf16001bf8fe2b9a38709517d74eaa51c85b11ee2c049565f82bf2e234b11db396ddd4ff2cda1ca4243c2adc7b

data/lib/shuang_pin_tutorial.rb

@@ -14,7 +14,7 @@ end
 module ShuangPinTutorial
   MODULE = "ShuangPinTutorial"
   NAME = "shuang_pin_tutorial"
-  VERSION = "1.2.2"
+  VERSION = "1.3.0"
   OPTIONS = {w: "words", r: "remind_off", z: "zhuyin_off", c: "cword_off"}
   OPTIONS_DEFAULT = {w: 6, r: true, z: true, c: true}
 

data/lib/shuang_pin_tutorial/handler.rb

@@ -20,10 +20,10 @@ module ShuangPinTutorial
       # 初始化
       @sp_data = Data.new()
       @words_counts = [0, 0, 0]
-      @start_time = DateTime.now
-      @end_time = nil
+      @start_time, @end_time = DateTime.now, nil  # Datetime
+      @total_time, @type_speed = nil, nil   # Rational
       puts "歡迎使用 快速學習雙拼 -- 微軟雙拼（繁體中文版）！要好好練習哦！（#{VERSION} 版）"
-      puts "要輸入下面中文字對應雙拼字碼哦！使用空格隔開，要休息請輸入 'exit' 或按 Ctrl+c 吧！\n"
+      puts "要輸入下面中文字對應雙拼字碼哦！使用空格隔開，要休息請輸入 'exit' 或按 ctrl+c 吧！\n"
       # looping
       while true
         result = get_question_lines
@@ -40,6 +40,11 @@ module ShuangPinTutorial
       end
     end
 
+    def stop()
+      @end_time = DateTime.now
+      @total_time = (@end_time - @start_time) * 24 * 60 * 60
+    end
+
     def get_words_showlines(num = @int_words_displayed, display_delim: "|")   # return [words(str), [display line(s)]]
       result = []
       display = []
@@ -109,12 +114,22 @@ module ShuangPinTutorial
       result
     end
 
+    def print_results
+      total_time = get_total_time_str
+      $stdout.puts("#{total_time}") if (total_time)
+      total_words_result = get_total_words_result
+      $stdout.puts("#{total_words_result}") if (total_words_result)
+      percent_correctness = get_percent_correctness
+      $stdout.puts("#{percent_correctness}") if (percent_correctness)
+      type_speed = get_type_speed_str
+      $stdout.puts("#{type_speed}") if (type_speed)
+    end
+
     def get_total_time_str
-      @end_time = DateTime.now
-      @total_time = ((@end_time - @start_time) * 24 * 60 * 60).to_i
-      str_total_time_s = Time.at(@total_time).utc.strftime("%S").gsub(/^0/, '')
-      str_total_time_m = Time.at(@total_time).utc.strftime("%M").gsub(/^0/, '')
-      str_total_time_h = Time.at(@total_time).utc.strftime("%H").gsub(/^0+/, '')
+      return nil unless @words_counts[0] > 0
+      str_total_time_s = Time.at(@total_time.to_i).utc.strftime("%S").gsub(/^0/, '')
+      str_total_time_m = Time.at(@total_time.to_i).utc.strftime("%M").gsub(/^0/, '')
+      str_total_time_h = Time.at(@total_time.to_i).utc.strftime("%H").gsub(/^0+/, '')
       str_total_time =
       case @total_time
         when 0...60
@@ -124,15 +139,24 @@ module ShuangPinTutorial
         else
           "#{str_total_time_h} 小時 #{str_total_time_m} 分 #{str_total_time_s} 秒"
       end
-      str_total_time
+      "訓練時間： #{str_total_time}"
     end
 
     def get_total_words_result
+      return nil unless @words_counts[0] > 0
+      "共有字數： #{@words_counts[0]} 字（#{@words_counts[1]}－#{@words_counts[2]}）"
+    end
+
+    def get_percent_correctness
+      return nil unless @words_counts[0] > 0
       percent_correctness = @words_counts[0].to_f != 0 ? (@words_counts[1].to_f/@words_counts[0].to_f) * 100 : 0
-      str_output = ""
-      str_output += "共有字數： #{@words_counts[0]} 字；正確字數： #{@words_counts[1]} 字；錯誤字數： #{@words_counts[2]} 字" + "\n"
-      str_output += "總正確率： #{percent_correctness.round(2)} %"
-      str_output
+      "總正確率： #{percent_correctness.round(2)} ％"
+    end
+
+    def get_type_speed_str
+      return nil unless @words_counts[0] > 0 && @words_counts[1] > 0
+      @type_speed = @total_time / @words_counts[1]  # 只計算正確字數
+      "平均速度： #{@type_speed.to_f.floor(2)} 秒／字"
     end
   end
 end

data/lib/shuang_pin_tutorial/main.rb

@@ -20,11 +20,9 @@ module ShuangPinTutorial
       # $stderr.puts(ex.backtrace)  # debug use only
       @is_run_success = false
     ensure
+      @obj_tutorial.stop()
       exit(@is_run_success) unless @is_run_success
-      $stdout.puts('訓練時間：')
-      $stdout.puts(@obj_tutorial.get_total_time_str)
-      $stdout.puts('成果統計：')
-      $stdout.puts(@obj_tutorial.get_total_words_result)
+      @obj_tutorial.print_results
       $stdout.puts('要努力學習哦，感謝使用！')
       exit(@is_run_success)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shuang_pin_tutorial
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - David N
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-04 00:00:00.000000000 Z
+date: 2020-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary
@@ -41,7 +41,7 @@ files:
 - lib/shuang_pin_tutorial/data.rb
 - lib/shuang_pin_tutorial/handler.rb
 - lib/shuang_pin_tutorial/main.rb
-homepage: https://github.com/jsdnhk/shuang_pin_tutorial
+homepage: http://jsdn.hk/shuang_pin_tutorial/
 licenses:
 - MIT
 metadata: