lhj-tools 0.2.68 → 0.2.70

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c23165c469fd6d71c90bdd7084b586791467fa476c5b7900bf6a6390c75c5a77
-  data.tar.gz: 0d2c4a52513393230ed54e001639e6bc86cc0eabcbd015ef753429785cfc5af8
+  metadata.gz: 69043d324a75d0736920413e53feea9866fcbcf70632b93bce05586533496a78
+  data.tar.gz: afbb9a634140e0995858df548b5ee8a35e57098397764893828f2fbc11fc7781
 SHA512:
-  metadata.gz: c7cb08beec96cd9b1ab1c92c55c99aa364531ccae929a87a0dacff18d35e10b08af4616de77034641728ab208452e2253d71fe301f50fc8eda76c1d56035c9a4
-  data.tar.gz: 6bbbe3a17f63e7b8431a15d9e6e2e2345ab3993e41080aa8c03c7c024708133ae733336cce2a69ef51c9f4d8c64121aac091e2400b13504602b55518ab5ccfe4
+  metadata.gz: 58c6ef833505fdc7163305bf423b72a37c15a943df6e95530fd4f5e495e46e599f99ba83ba2f9d031ec52b872817717b85842d73601060bcdd11460efb6aa404
+  data.tar.gz: a8e6a8dc5b49fe21309a9a6f1fbdb985b6bae46b6e9938cc2ba185886e411e0f96f71224921b642cfca0623d6afd5910ca354cb3e57490fddfff95a6dd8a6666

data/lib/lhj/command/local/fetch.rb

@@ -18,7 +18,7 @@ module Lhj
       def handle
         @file_name = @cli.ask(HighLine.color('生成csv文件名:', :green), String) do |q|
           time = Time.now.strftime('%Y%m%d_%H%M')
-          q.default = "gen_cn_key_#{time}.csv"
+          q.default = "gen_ch_en_#{time}.csv"
         end
         @file_type = @cli.ask(HighLine.color('从哪些源码中查找中文字符串, 默认为m,h:', :green), String) do |q|
           q.default = 'm,h'
@@ -93,6 +93,7 @@ module Lhj
 
             next if multi_comment
             next if line =~ %r{/\*.*\*/}
+            next if line =~ %r{^\s*//}
             next unless zh_ch_reg =~ line
             next if line =~ /#pragma/
             next if line =~ /log|Log|LOG|NSCAssert/

data/lib/lhj/command/local/local.rb

@@ -20,23 +20,44 @@ module Lhj
       end
 
       def handle
+        setting_handle
+        if @key_map.keys.length.positive?
+          write_en_strings
+          write_zh_hk_strings
+          write_zh_cn_strings
+          handle_modify_source if @modify_source_flag
+        else
+          puts "获取中英文映射文件失败, 检查参数--read-csv-file=xx是否正常\n"
+        end
+      end
+
+      def setting_csv_handle
         @cli.say(HighLine.color('选择中英对应照csv文件:', :green))
         path = File.join(@current_path, '**', '*.csv')
-        @csv_file = @cli.choose(*Dir.glob(path))
-        puts "选择对照文档>>>>>>>>> #{@csv_file}"
-
-        @gen_file_name = @cli.ask('生成.strings文件的名称: '.green, String) do |q|
-          q.default = 'Localizable.strings'
-        end
-        @key_col = @cli.ask('中英对应照csv中key所在的列, 默认为0: '.yellow, Integer) do |q|
+        csv_file = @cli.choose(*Dir.glob(path))
+        puts "选择对照文档>>>>>>>>> #{csv_file}"
+        key_col = @cli.ask('中英对应照csv中<<key>>所在的列, 默认为0: '.yellow, Integer) do |q|
           q.default = 0
         end
-        @cn_col = @cli.ask('中英对应照csv<<中文>>所在的列, 默认为1: '.yellow, Integer) do |q|
+        cn_col = @cli.ask('中英对应照csv<<中文>>所在的列, 默认为1: '.yellow, Integer) do |q|
           q.default = 1
         end
-        @en_col = @cli.ask('中英对应照csv<<英文>>所在的列, 默认为2: '.yellow, Integer) do |q|
+        en_col = @cli.ask('中英对应照csv<<英文>>所在的列, 默认为2: '.yellow, Integer) do |q|
           q.default = 2
         end
+        read_csv_file(csv_file, key_col, cn_col, en_col)
+        need_add_other = @cli.ask('是否继续添加csv文件yes？: '.yellow, ->(yn) { yn.downcase[0] == 'y' }) do |q|
+          q.default = false
+        end
+        setting_csv_handle if need_add_other
+      end
+
+      def setting_handle
+        setting_csv_handle
+        @gen_file_name = @cli.ask('生成.strings文件的名称: '.green, String) do |q|
+          time = Time.now.strftime('%Y%m%d_%H%M')
+          q.default = "Localizable_#{time}.strings"
+        end
         @en_dir_name = @cli.ask('生成英文.strings文件对应路径: '.yellow, String) do |q|
           q.default = 'MacauLife/en.lproj'
         end
@@ -55,16 +76,6 @@ module Lhj
             q.default = 'MLLocalizedString(%s)'
           end
         end
-
-        read_csv
-        if @key_map.keys.length.positive?
-          write_en_strings
-          write_zh_hk_strings
-          write_zh_cn_strings
-          handle_modify_source if @modify_source_flag
-        else
-          puts "获取中英文映射文件失败, 检查参数--read-csv-file=xx是否正常\n"
-        end
       end
 
       def generate_file_name
@@ -76,14 +87,7 @@ module Lhj
         File.exist?(dest_file) ? bak_file(dest_file) : dest_file
       end
 
-      def read_csv
-        read_csv_file @csv_file
-      end
-
-      def read_csv_file(file)
-        key_c = @key_col
-        cn_c = @cn_col
-        en_c = @en_col
+      def read_csv_file(file, key_c, cn_c, en_c)
         # trans_hk = false
         # trans_cn = true
         CSV.foreach(file) do |row|
@@ -92,7 +96,7 @@ module Lhj
             cn_str = row[cn_c]
             hk_str = row[cn_c]
             # cn_str = Lhj::Trans::Helper.instance.trans_zh_cn_str(cn_str) if trans_cn
-            # hk_str = Lhj::Trans::Helper.instance.trans_zh_hk_str(hk_str) if trans_hk
+            hk_str = Lhj::Trans::Helper.instance.trans_zh_hk_str(hk_str)
             @key_map[key] = { key: key, cn: cn_str, hk: hk_str, en: row[en_c] } unless key =~ /[\u4e00-\u9fa5]/
           end
         end
@@ -140,6 +144,10 @@ module Lhj
               str += line
               next
             end
+            if line =~ %r{^\s*//}
+              str += line
+              next
+            end
             unless zh_ch_reg =~ line
               str += line
               next
@@ -157,7 +165,9 @@ module Lhj
               next
             end
 
-            str += handle_modify_line(f, line)
+            modify_line = handle_modify_line(f, line)
+            str += "//#{line}" unless line.eql?(modify_line)
+            str += modify_line
           end
         end
         str

data/lib/lhj/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lhj
-  VERSION = '0.2.68'
+  VERSION = '0.2.70'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.2.68
+  version: 0.2.70
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-28 00:00:00.000000000 Z
+date: 2024-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj