lhj-tools 0.2.63 → 0.2.64

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77f66fd979d6fe1773bd9c603fda0dd2cbb1b3107267d64ded1360377e573b2f
-  data.tar.gz: 50d1e50e766fe708bde20971ab1235437514a3680abacc286ed2ca91d37eba57
+  metadata.gz: 0de734ea2fe45a654cbde025268b400ff16becedddf5a8340f1ad4f6d9ea54df
+  data.tar.gz: 1efd0f01fffd19a3d89f7e62de250fb602b0b7300fc3772de0b1d30f59e66ffa
 SHA512:
-  metadata.gz: dde586d855c8c511510922f81699041945fcb4efe834d786cbebbd52beee3440236db020568d38c906587eeddb62cf8760a6727c1cfbe2fc878dfa36c89fd88d
-  data.tar.gz: 4de47cd395f046a096215ff2b5fde89761ae19f2e03bc8c57ba5819924ae974e58e80cb22a7bc9d55f747153d88760768ea82b52a6e5f1d9b4224e26312c1f80
+  metadata.gz: 592fd748fd75a73788f1ee020687a6c7742a444ed4e69f31867dcfdf7feec0cd5d535bbb756354b5e995e1129ccec84e66f6198669d8918d67ddac3ef35f633b
+  data.tar.gz: 864226db596b7811dae68baf5ebf037690f4bced76b2cc3bc81159d88d165cee4f63840748270a5ae3f4051d48635a170e62dd73286d1f68c1be46c14d87a2e2

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

@@ -2,6 +2,8 @@
 # frozen_string_literal: true
 require 'lhj/helper/oss_helper'
 require 'highline'
+require 'faraday'
+require 'faraday_middleware'
 
 module Lhj
   class Command
@@ -69,12 +71,24 @@ module Lhj
 
         def download_with_key(oss_key)
           puts "下载的key为:#{oss_key}".yellow
-          file_key = oss_key.split('/').last
+          file_key = oss_key.split(/\?/)[0].split('/').last
           file = File.join(@current_path, file_key)
           File.rename(file_key, "#{file_key}.bak") if File.exist?(file_key)
-          Lhj::OSS::Helper.instance.down_load(oss_key, file)
+          if %r{^https://} =~ oss_key || %r{^http://} =~ oss_key
+            download_file(oss_key, file)
+          else
+            Lhj::OSS::Helper.instance.down_load(oss_key, file)
+          end
           puts "下载文件到目录: #{file}\n".yellow
         end
+
+        def download_file(url, file)
+          http_client = Faraday.new do |c|
+            c.adapter Faraday.default_adapter
+          end
+          response = http_client.get(url)
+          File.open(file, 'wb') { |fp| fp.write(response.body) }
+        end
       end
     end
   end

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

@@ -7,17 +7,18 @@ module Lhj
       class List < OSS
 
         self.arguments = [
-          CLAide::Argument.new(%(--save, --clear), false, false),
+          CLAide::Argument.new(%(--save, --clear, --output_suffix), false, false),
           CLAide::Argument.new(%(--all_folder, --prefix, --marker), false, false)
         ]
 
         self.description = <<-DESC
-          查看OSS对象列表
-          --save 保存文件oss_key.yml与oss_url.yml到当前目录
-          --clear 清空控制台输出，当oss数量较多时使用，配合save使用
-          --all_folder 则会添加 delimiter='/'，只用于查看oss的目录结构
-          --prefix 添加oss的前缀过滤
-          --marker 会改oss key值，会输出key之后的oss列表
+          查看OSS对象列表 \n
+          --save 保存文件oss_key.yml与oss_url.yml到当前目录 \n
+          --clear 清空控制台输出，当oss数量较多时使用，配合save使用 \n
+          --output_suffix 添加后缀输出控制台,如?x-oss-process=image/watermark,image_YXBwbGUucG5n \n
+          --all_folder 则会添加 delimiter='/'，只用于查看oss的目录结构 \n
+          --prefix 添加oss的前缀过滤 \n
+          --marker 参数可以指定从该位置开始list
         DESC
 
         def self.options
@@ -26,7 +27,7 @@ module Lhj
             %w[--clear 清空控制台输出],
             %w[--all_folder 列出所有的子目录],
             %w[--prefix 前缀过滤],
-            %w[--marker key之后的列表数据]
+            %w[--marker 指定从该位置开始list]
           ]
         end
 
@@ -35,6 +36,7 @@ module Lhj
           @clear = argv.flag?('clear', false)
           @all_folder = argv.flag?('all_folder', false)
           @prefix = argv.option('prefix')
+          @output_suffix = argv.option('output_suffix')
           @marker = argv.option('marker')
           @current_path = argv.shift_argument || Dir.pwd
           super
@@ -53,7 +55,8 @@ module Lhj
         end
 
         def save(obj_keys)
-          obj_urls = obj_keys.map { |k| "#{Lhj::OSS::Helper.instance.url_path}/#{k}" }
+          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
@@ -63,8 +66,12 @@ module Lhj
         def print(obj_keys)
           rows = []
           obj_keys.each_with_index do |k, i|
-            path = "#{i}.#{Lhj::OSS::Helper.instance.url_path}/#{k}" unless @all_folder
-            path = k if @all_folder
+            if @all_folder
+              path = k
+            else
+              path = "#{i}.#{Lhj::OSS::Helper.instance.url_path}/#{k}"
+              path = "#{path}#{@output_suffix}" if @output_suffix
+            end
             rows << [path]
           end
           table = Terminal::Table.new title: 'OSS List', headings: ['URL'], rows: rows

data/lib/lhj/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.2.63
+  version: 0.2.64
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-27 00:00:00.000000000 Z
+date: 2023-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj