lhj-tools 0.2.81 → 0.2.83

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a419cd28646ee40f8a8705d14b93ef95795e54cd8aad658ed1f091a5bb32541c
-  data.tar.gz: 2819685f8bc414cfa696094c1ffa1b5509761b3ae70caacbd218feb7818eded5
+  metadata.gz: e5d002932699d20e17f85d6c37b38bb6450b3ddbc1cbf7611d8e01fb28035465
+  data.tar.gz: 04c53c4bdd4d245538c1e0f347153aa15a20d5a0497248c89acfc9040d550c56
 SHA512:
-  metadata.gz: 6bc1dc881c997fab47da6556bc6b2bb54816ecfc22f6178cdb5b181abb836637c1e5fae66a296ba2564aff7066147a9d1afbbce7bc462e90fe348dab5d33593c
-  data.tar.gz: e5f169d598fef4c355b7759608fd2be7e4cc04b0a54525390a21273aa95727f16c56916d2b065365dad9005b83d3f3eebda1cd9bf2693011adbb51816a2bebac
+  metadata.gz: e31cccdb1e468653c14cd2e4fc370a6c445fbb22ed6f1c79c610821f8d04c5c2b7368ea0c2ebcefa0f049fff9c9480515ff303799637881a223076b64fb08443
+  data.tar.gz: b72cae20a8095402304f1b3b62edfd042a6b330a7903986c52634671dc17285dedd9c221feaa5e96f66bffde9de7e25ac06023b7373ae77ef926a5561d4f9905

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

@@ -45,8 +45,11 @@ module Lhj
         en_col = @cli.ask('中英对应照csv<<英文>>所在的列, 默认为2: '.yellow, Integer) do |q|
           q.default = 2
         end
+        quote_char = @cli.ask('引号字符, 默认为": '.yellow, String) do |q|
+          q.default = '"'
+        end
         begin
-          read_csv_file(csv_file, key_col, cn_col, en_col)
+          read_csv_file(csv_file, quote_char, key_col, cn_col, en_col)
         rescue ArgumentError => e
           puts e.message.red
         end
@@ -91,15 +94,17 @@ module Lhj
         File.exist?(dest_file) ? bak_file(dest_file) : dest_file
       end
 
-      def read_csv_file(file, key_c, cn_c, en_c)
+      def read_csv_file(file, quote_char, key_c, cn_c, en_c)
         begin
           current_row = nil
-          CSV.foreach(file, quote_char: ',') do |row|
+          CSV.foreach(file, quote_char: quote_char) do |row|
             current_row = row
             if row.length > 2
               key = row[key_c]
               cn_str = row[cn_c]
               hk_str = row[cn_c]
+              cn_str ||= ''
+              hk_str ||= ''
               # 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 hk_str&.length&.positive?
               @key_map[key] = { key: key, cn: cn_str, hk: hk_str, en: row[en_c] } unless key =~ /[\u4e00-\u9fa5]/

data/lib/lhj/helper/ios_api_available_check_helper.rb

@@ -40,6 +40,7 @@ module Lhj
       block_lines = []
       File.open(file, 'r') do |f|
         multi_comment = false
+        strong_key = false
         available_idx = 0
         block_idx = 0
         f.readlines.each_with_index do |line, idx|
@@ -60,10 +61,13 @@ module Lhj
           # 此行包含^符号，且不是方法声明，且不是主线程方法
           if (line =~ BLOCK_KEY_BEGIN_REGEX && line !~ /^\s*[+-]/ && line !~ /dispatch_get_main_queue/) || block_idx.positive?
             line_position = block_idx.zero? ? :start : :process
+            strong_key = false if block_idx.zero?
+            strong_key = true if line =~ /@strongify/
             block_idx += 1 if line =~ /\{/
             block_idx -= 1 if line =~ /\}/
             line_position = :end if block_idx.zero?
-            block_lines << { idx: idx, line: line, position: line_position }
+            strong_key = false if block_idx.zero?
+            block_lines << { idx: idx, line: line, position: line_position, strong: strong_key }
           end
         end
       end
@@ -73,6 +77,7 @@ module Lhj
     def self.handle_block_notify(file_name, wrapper_lines)
       arr = wrapper_lines.filter { |l| l[:position] != :start }
       arr.filter! { |l| l[:position] != :end }
+      arr.filter! { |l| !l[:strong] }
       arr.filter! { |l| l[:line] =~ /\W+self\W+/ || l[:line] =~ /\W+_/ }
       arr.filter! { |l| l[:line] !~ /\^/ }
       arr.filter! { |l| l[:line] !~ /__weak/ }

data/lib/lhj/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.2.81
+  version: 0.2.83
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-16 00:00:00.000000000 Z
+date: 2024-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj