lhj-tools 0.2.71 → 0.2.73

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9f34207902253cd7e343b132210af875a99f7b0cbc17a14f811e4044af781ce
-  data.tar.gz: c85d8572ea5c1e480753aa2a1f8f842882ae6ef374cb869f98789583adbea7fb
+  metadata.gz: 8f290f1dcacdb4ffd6a22237a2bcf16e2e859a722855c8ca63a508d36bc9004d
+  data.tar.gz: 0cfa5b7a21ca263afab94639ecb90703f01baa9c15db786d6c92c62dcac0ad05
 SHA512:
-  metadata.gz: ee0d0dce1b75b11a7d7894d24e161698e03e438c1d61f60058c3acda029cccc7f1cbf0e02352fa49cee03c7ec94b8658a407bf5a14a1b8514b00bd78718619ce
-  data.tar.gz: f7f2d0d2f5d4916b3b363aeedb588c00814f7b4ae89fb1264841b226365d5574a8743b7468b9f63aad57d9139cf0ea938684c16143b0b789e5086cc4adfd4d49
+  metadata.gz: 7a83825633df792ce139161b02f3b882c900ae140a84f517736de5480902766721b177b314154b4ef3fa8e4323f9aad6681d7585b650b605a9593e1684b2f844
+  data.tar.gz: 7d9436fcc3141dbcc19212c676783bf79e5e457d9f18e029eb791103faf9c7eb8afd6ee744d93cab52cc47c294e1836b2860d3813e0f6ac72524c70780037f8f

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

@@ -27,7 +27,7 @@ module Lhj
           write_zh_cn_strings
           handle_modify_source if @modify_source_flag
         else
-          puts "获取中英文映射文件失败, 检查参数--read-csv-file=xx是否正常\n"
+          puts "获取中英文映射文件失败\n"
         end
       end
 
@@ -45,7 +45,11 @@ module Lhj
         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)
+        begin
+          read_csv_file(csv_file, key_col, cn_col, en_col)
+        rescue ArgumentError => e
+          puts e.message.red
+        end
         need_add_other = @cli.ask('是否继续添加csv文件yes？: '.yellow, ->(yn) { yn.downcase[0] == 'y' }) do |q|
           q.default = false
         end
@@ -58,23 +62,23 @@ module Lhj
           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|
+        @en_dir_name = @cli.ask('存放英文的文件夹: '.yellow, String) do |q|
           q.default = 'MacauLife/en.lproj'
         end
-        @zh_hk_dir_name = @cli.ask('生成繁体.strings文件对应路径: '.yellow, String) do |q|
+        @zh_hk_dir_name = @cli.ask('存放繁体的文件夹: '.yellow, String) do |q|
           q.default = 'MacauLife/zh-Hant.lproj'
         end
-        @zh_cn_dir_name = @cli.ask('生成简体.strings文件对应路径: '.yellow, String) do |q|
+        @zh_cn_dir_name = @cli.ask('存放简体的文件夹: '.yellow, String) do |q|
           q.default = 'MacauLife/zh-Hans.lproj'
         end
         @modify_source_flag = @cli.agree(HighLine.color('是否要修改源码yes?:', :red))
-        if @modify_source_flag
-          @modify_file_type = @cli.ask('需要修改源码的文件类型: '.yellow, String) do |q|
-            q.default = 'm,h'
-          end
-          @modify_format_string = @cli.ask('修改为国际化后的字符格式: '.yellow, String) do |q|
-            q.default = 'MLLocalizedString(%s)'
-          end
+        return unless @modify_source_flag
+
+        @modify_file_type = @cli.ask('源码的文件类型: '.yellow, String) do |q|
+          q.default = 'm,h'
+        end
+        @modify_format_string = @cli.ask('国际化字符格式: '.yellow, String) do |q|
+          q.default = 'MLLocalizedString(%s)'
         end
       end
 
@@ -88,17 +92,22 @@ module Lhj
       end
 
       def read_csv_file(file, key_c, cn_c, en_c)
-        # trans_hk = false
-        # trans_cn = true
-        CSV.foreach(file) do |row|
-          if row.length > 2
-            key = row[key_c]
-            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 hk_str&.length&.positive?
-            @key_map[key] = { key: key, cn: cn_str, hk: hk_str, en: row[en_c] } unless key =~ /[\u4e00-\u9fa5]/
+        begin
+          current_row = nil
+          CSV.foreach(file, 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 = 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]/
+            end
           end
+        rescue CSV::MalformedCSVError => e
+          error = "读取csv异常，文件中的第#{e.line_number}行格式有误!! \n 上一行信息#{current_row}"
+          raise ArgumentError, error
         end
       end
 

data/lib/lhj/helper/ios_api_available_check_helper.rb

@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+module Lhj
+  class IosApiAvailableCheckHelper
+
+    API_AVAILABLE_KEY_BEGIN_REGEX = /@available\(/.freeze
+
+    def self.check(path, type = 'm')
+      all_files = Dir.glob("#{path}/**/*.{#{type}}")
+      result = {}
+      all_files.each do |f|
+        wrapper_lines = find_available_wrapper(f)
+        infos = handle_file(f, wrapper_lines)
+        result[File.basename(f)] = infos if infos.length.positive?
+      end
+      # result
+      # show_result(result)
+      result.keys.each_slice(10) { |a| notify(result.slice(*a)) }
+    end
+
+    def self.show_result(result)
+      result.each do |k, v|
+        puts k
+        v.each do |o|
+          puts "第#{o[:idx]}行:"
+          puts o[:line]
+        end
+      end
+    end
+
+    def self.find_available_wrapper(file)
+      lines = []
+      File.open(file, 'r') do |f|
+        multi_comment = false
+        available_idx = 0
+        f.readlines.each_with_index do |line, idx|
+          multi_comment = true if line =~ %r{/\*} && line !~ %r{\*/} && !multi_comment
+          if line !~ %r{/\*} && line =~ %r{\*/} && multi_comment
+            multi_comment = false
+            next
+          end
+
+          next if multi_comment
+          next if line =~ %r{\s*//}
+          next unless line =~ API_AVAILABLE_KEY_BEGIN_REGEX || available_idx.positive?
+
+          available_idx += 1 if line =~ /\{/
+          available_idx -= 1 if line =~ /\}/
+          lines << { idx: idx, line: line }
+        end
+      end
+      lines
+    end
+
+    def self.handle_file(file, wrapper_lines)
+      result = []
+      File.open(file, 'r') do |f|
+        multi_comment = false
+        f.readlines.each_with_index do |line, idx|
+          multi_comment = true if line =~ %r{/\*} && line !~ %r{\*/} && !multi_comment
+          if line !~ %r{/\*} && line =~ %r{\*/} && multi_comment
+            multi_comment = false
+            next
+          end
+
+          next if multi_comment
+          next if line =~ %r{\s*//}
+          # 1. 白名单查找
+          next unless match_white_list_reg(line)
+          # 2. 找到的行是否已available代码块
+          next if wrapper_lines.length.positive? && wrapper_lines.any? { |w| w[:idx] == idx }
+
+          result << { idx: idx + 1, line: line }
+        end
+      end
+      result
+    end
+
+    def self.match_white_list_reg(line)
+      regs ||= load_white_api_list
+      regs.any? { |r| line =~ /#{r}/ }
+    end
+
+    def self.load_white_api_list
+      require 'yaml'
+      yaml_file = File.join(Lhj::Config.instance.home_dir, 'ios_available_api_white_list.yml')
+      YAML.safe_load(File.open(yaml_file))
+    end
+
+    def self.robot_url
+      'https://oapi.dingtalk.com/robot/send?access_token=fe879fd3e7a3b5e59d5719b2384845b7884901919be5a78fe443cbf777869807'
+    end
+
+    def self.notify(result)
+      temp = Lhj::ErbTemplateHelper.load('ios_avaliable_api_notify')
+      temp_result = Lhj::ErbTemplateHelper.render(temp, { result: result, branch: git_branch }, '-')
+      Lhj::Dingtalk.post_message_robot(robot_url, 'check code', temp_result)
+    end
+
+    def self.git_branch
+      branch ||= Lhj::LogHelper.instance.fetch_branch
+      branch
+    end
+  end
+end

data/lib/lhj/lhj.rb

@@ -32,6 +32,7 @@ module Lhj
   require 'lhj/helper/traditional_check_helper'
   require 'lhj/helper/todo_check_helper'
   require 'lhj/helper/image_oss_check_helper'
+  require 'lhj/helper/ios_api_available_check_helper'
 
   class Error < StandardError; end
 

data/lib/lhj/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.2.71
+  version: 0.2.73
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-02 00:00:00.000000000 Z
+date: 2024-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -393,6 +393,7 @@ files:
 - lib/lhj/helper/git_branch_feature_config.rb
 - lib/lhj/helper/git_helper.rb
 - lib/lhj/helper/image_oss_check_helper.rb
+- lib/lhj/helper/ios_api_available_check_helper.rb
 - lib/lhj/helper/ios_robot_config.rb
 - lib/lhj/helper/jenkins_config.rb
 - lib/lhj/helper/local_config.rb