lhj-tools 0.2.80 → 0.2.82

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b454eb7049b9d1eb7aa422667ecb0193faf3bd3bed2ac0707bedcebd83778ec1
-  data.tar.gz: f8e8a846074a0e542acdf457c1c6047b329e373e7e4992f2f002d4f9f3b39e25
+  metadata.gz: e5cb532b2f91d92e8575f55aa8f46251351fe6cf8497732c9436344d41c3f10b
+  data.tar.gz: 9e90fce95487eb3185ffad60b9840cefa94e4defff4dab3355a809ad524acc45
 SHA512:
-  metadata.gz: 4a257a6554374ed53561b728c12aa4eeb8a937a71b4fb28a7b0d1a13258ad486ac011ca02cb2e6c4f276fca0a92c8f346c75281c9caa4b995d77900ddfd4cdeb
-  data.tar.gz: c3b923e52031eaafa39c201cdba5a64cbc5c4a08ad258c18bcd76aed839081bcfb7eb17ba0657aefd776964147cacbdfa17033845658546774a146800739351d
+  metadata.gz: 60613b6d94a186e14a6c06d62e46277658c90804b37d3d62185bc94edba554463ef426de55e687e74338c9617ebaaf09342a7ed21eecb14053ae4068f1d4539a
+  data.tar.gz: 96297521dbf1c255087ae94accee5f04de60ea533c6bb46c7ca537c0cc7ceee4ea0269c9b6f7df983821cf676006b071e49f044993ee48fb04395383b2934ff1

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/command/oss/download.rb

@@ -10,44 +10,45 @@ module Lhj
     class OSS < Command
       class Download < OSS
 
-        self.arguments = [
-          CLAide::Argument.new(['--oss_key_file'], false, false)
-        ]
-
         self.description = <<~DESC
           OSS下载，下载文件到当前shell的目录\n
           提示的下载的序号以,号分割多项下载项, 传入开始与结束的序号通过-号连接，可下载多项连接序号的文件\n
           如 1,5,7-10,12-15 那么下载项为 [1,5,7,8,9,10,12,13,14,15]\n
-          --oss_key_file oss key文件列表, 通过lhj oss list --save之后生成oss_key.yml文件, 保留需要下载的oss key，指定文件名oss_key.yml\n
-          如: --oss_key_file=oss_key.yml
         DESC
 
-        def self.options
-          [
-            %w[--oss_key_file 本地下载的oss_key文件]
-          ]
-        end
-
         def initialize(argv)
           @current_path = argv.shift_argument || Dir.pwd
           @cli = HighLine.new
-          @oss_key_file = argv.option('oss_key_file')
           super
         end
 
         def handle
-          oss_keys = local_oss_keys if @oss_key_file
-          oss_keys ||= remote_oss_keys
-          Dir.chdir(@current_path) do
-            oss_keys.each { |k| download_with_key(k) }
+          type = @cli.choose do |m|
+            m.prompt = '选择下载方式?'
+            m.choice(:remote)
+            m.choice(:local)
           end
+          handle_with_local if type == :local
+          handle_with_remote if type == :remote
+        end
+
+        def handle_with_local
+          @cli.say(HighLine.color('选择本地yaml文件:', :green))
+          path = File.join(@current_path, '**', '*.yml')
+          yml_file = @cli.choose(*Dir.glob(path))
+          oss_keys = YAML.load_file(yml_file) if File.exist?(yml_file)
+          handle_with_oss_keys(oss_keys)
+        end
+
+        def handle_with_remote
+          oss_keys = remote_oss_keys
+          handle_with_oss_keys(oss_keys)
         end
 
-        def local_oss_keys
-          key_file = File.join(@current_path, @oss_key_file)
-          oss_keys = []
-          oss_keys = YAML.load_file(key_file) if File.exist?(key_file)
-          oss_keys
+        def handle_with_oss_keys(oss_keys)
+          Dir.chdir(@current_path) do
+            oss_keys.each { |k| download_with_key(k) }
+          end
         end
 
         def remote_oss_keys

data/lib/lhj/command/oss/list.rb

@@ -42,27 +42,37 @@ module Lhj
           @output_suffix = argv.option('output_suffix')
           @marker = argv.option('marker')
           @current_path = argv.shift_argument || Dir.pwd
+          @cli = HighLine.new
           super
         end
 
         def handle
           list_opts = {}
+          if @save
+            time = Time.now.strftime('%Y%m%d_%H%M')
+            oss_key_file = @cli.ask(HighLine.color('生成OSS_KEY的名称:', :green), String) do |q|
+              q.default = "oss_key_#{time}.yml"
+            end
+            oss_url_file = @cli.ask(HighLine.color('生成OSS_URL的名称:', :green), String) do |q|
+              q.default = "oss_url_#{time}.yml"
+            end
+          end
           list_opts[:prefix] = @prefix if @prefix
           list_opts[:marker] = @marker if @marker
           list_opts[:delimiter] = '/' if @all_folder
           objects = Lhj::OSS::Helper.instance.list(list_opts)
           obj_keys = objects.map(&:key).sort { |a, b| a <=> b } unless @all_folder
           obj_keys = objects.filter { |o| o.is_a?(String) } if @all_folder
-          save(obj_keys) if @save
+          save(obj_keys, oss_key_file, oss_url_file) if @save
           print(obj_keys) unless @clear
         end
 
-        def save(obj_keys)
+        def save(obj_keys, key_file, url_file)
           obj_urls = obj_keys.sort { |a, b| a.slice(/\..*/) <=> b.slice(/\..*/) }.map { |k| "#{Lhj::OSS::Helper.instance.url_path}/#{k}" }
           obj_urls = obj_urls.map { |k| "#{k}?#{@output_suffix}" } if @output_suffix
           FileUtils.chdir(@current_path) do
-            File.write('oss_key.yml', obj_keys.to_yaml)
-            File.write('oss_url.yml', obj_urls.to_yaml) unless @all_folder
+            File.write(key_file, obj_keys.to_yaml)
+            File.write(url_file, obj_urls.to_yaml) unless @all_folder
           end
         end
 

data/lib/lhj/command/oss/upload.rb

@@ -10,8 +10,7 @@ module Lhj
       class Upload < OSS
 
         self.arguments = [
-          CLAide::Argument.new('tag', false),
-          CLAide::Argument.new('oss_key', false)
+          CLAide::Argument.new('tag', false)
         ]
 
         self.description = <<~DESC
@@ -19,20 +18,17 @@ module Lhj
           提示的上传的序号以,号分割多项下载项, 传入开始与结束的序号通过-号连接，可上传多项连接序号的文件\n
           如 1,5,7-10,12-15 那么下载项为 [1,5,7,8,9,10,12,13,14,15]\n
           --tag 指定文件的前缀，如--tag=flutter 则文件为flutter/xx
-          --oss_key 指定oss key重命名默认oss key,默认oss key为文件名, 如--oss_key=aa.txt
         DESC
 
         def self.options
           [
-            %w[--tag 标签],
-            %w[--oss_key 指定oss_key的名称]
+            %w[--tag 标签]
           ]
         end
 
         def initialize(argv)
           @current_path = argv.shift_argument || Dir.pwd
           @tag = argv.option('tag')
-          @oss_key = argv.option('oss_key')
           @cli = HighLine.new
           super
         end
@@ -51,18 +47,24 @@ module Lhj
             results << file_list[ma[:begin].to_i..ma[:end].to_i] if ma
             results << file_list[i.to_i] unless ma
           end
-          results.flatten.each do |f|
+          results = results.flatten
+          results.each do |f|
             file_name = File.basename(f)
+            file_name = rename_oss_key(file_name) if results.length == 1
             puts "上传的文件名:#{file_name}".yellow
-            upload(f)
+            upload(f, file_name)
           end
         end
 
         private
 
-        def upload(file)
-          file_name = File.basename(file)
-          file_name = @oss_key if @oss_key
+        def rename_oss_key(original_key)
+          @cli.ask(HighLine.color('重定义OSS_KEY:', :green), String) do |q|
+            q.default = original_key
+          end
+        end
+
+        def upload(file, file_name)
           oss_key = file_name
           oss_key = "#{@tag}/#{file_name}" if @tag
           Lhj::OSS::Helper.instance.upload(oss_key, file)

data/lib/lhj/version.rb

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

metadata

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