lhj-tools 0.1.35 → 0.1.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acf5100c519b9b7580d251efae32f735575f9c827959517ca25cee51501f96ab
-  data.tar.gz: eab05a25fd97bfc21902294ab0204eda81e25f85a29c01edd2b4c99c0563b3dc
+  metadata.gz: b4b7a07edf3348968838d40729cca25f41ba64ce15e201923d13d931590e7e97
+  data.tar.gz: 5c5ec0c49a7653d41c07dab04c2838f8b10e94bb986eb645e2eeb3c664a61536
 SHA512:
-  metadata.gz: b35f861355ebc4bbc29a22e9c306c573e845d07a0642d9c795030fc86f93ea3c362ce857938f2fb352ca36b297db3df1cbe39d314787fef33461254cd98205e0
-  data.tar.gz: '09797b52b0e1b82ce17fa386bd6c0f6f21ad5deb1aafd392a1c19cd0b2a2adcaf4b695453b51e8a9ee1ca64068ea4df1965d208ebc19404e572b1feb60329c9d'
+  metadata.gz: 672eee52600ff602c54aa7ae0a98e2dd418b33efac5b0ccbe3dc61ca47008a6af9eb7a124087437265b77663a5f0b92a87a4efef80d852fc38d93717afa66437
+  data.tar.gz: eac0a1544282d3e4826419fb5e7e8648c067d3664717630d89da95632eae0a69f3eee1931e9cee65d218bc7a33ac0da7dbb53615b1f8adbe06d0dd491a275a08

data/lib/lhj/command/code/code_template.rb

@@ -0,0 +1,34 @@
+module Lhj
+  class Command
+    class CodeTemplate < Command
+      self.summary = '生成源码模板'
+      self.description = '生成的代码模板'
+
+      CODE_TEMPLATE_INDEX = [{ name: 'dispatch Source 模板', template: 'dispatch_source.erb' },
+                             { name: '消息队列', template: 'message_query.erb' },
+                             { name: '代码模板', template: 'test.erb' }].freeze
+
+      def initialize(argv)
+        @cli = HighLine.new
+        super
+      end
+
+      def handle
+        CODE_TEMPLATE_INDEX.each_index do |i|
+          puts "#{i}.#{CODE_TEMPLATE_INDEX[i][:name]}".yellow
+        end
+        idx = @cli.ask('请选择查看代码模板: '.green).strip.to_i
+        item = CODE_TEMPLATE_INDEX[idx]
+        template_name = item[:template]
+        template_str = render_template(template_name)
+        puts template_str
+      end
+
+      def render_template(template_name)
+        temp_str = File.read(File.join(File.dirname(__FILE__), 'template', template_name))
+        Lhj::ErbFormatter::Service.new(self).render_template(temp_str)
+      end
+
+    end
+  end
+end

data/lib/lhj/command/code/template/dispatch_source.erb

@@ -0,0 +1,36 @@
+@implementation ODOrderTimerManager
+
++ (instancetype)sharedInstance {
+    static dispatch_once_t onceToken;
+    static ODOrderTimerManager *instance = nil;
+    dispatch_once(&onceToken,^{
+        instance = [[ODOrderTimerManager alloc] init];
+    });
+    return instance;
+}
+
+- (void)calcOrderPay:(NSString *)orderId timeout:(NSInteger)timeout
+{
+    self.leftTime = timeout;
+    self.orderId = orderId;
+    if(self.timer){
+        dispatch_source_cancel(self.timer);
+    }
+    if(timeout > 0){
+        self.timer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT,0));
+        dispatch_source_set_timer(self.timer, DISPATCH_TIME_NOW, 1.0 * NSEC_PER_SEC, 0);
+        __weak __typeof(self)weakSelf = self;
+        dispatch_source_set_event_handler(self.timer, ^{
+            if(weakSelf.leftTime <= 0){ //倒計時結束，關閉
+                [[NSNotificationCenter defaultCenter] postNotificationName:kOrderTimerFinishedNotification object:nil];
+                dispatch_source_cancel(weakSelf.timer);
+            }else{
+                [[NSNotificationCenter defaultCenter] postNotificationName:kOrderTimerProcessingNotification object:@(self.leftTime)];
+                weakSelf.leftTime--;
+            }
+        });
+        dispatch_resume(self.timer);
+    }
+}
+
+@end

data/lib/lhj/command/code/template/message_query.erb

@@ -0,0 +1,58 @@
+- (void)handleWithBlock:(void (^)(AMGoodsSellingMessageModel *, void(^completion)(BOOL finished, AMGoodsSellingMessageModel *current)))block completion:(void (^)(AMGoodsSellingMessageModel *, void(^)(BOOL)))completion
+{
+    dispatch_once(&onceMessageQueueManagerToken, ^{
+        [self processWithPreModel:nil block:block completion:completion];
+    });
+}
+
+- (void)processWithPreModel:(AMGoodsSellingMessageModel *)preModel block:(void (^)(AMGoodsSellingMessageModel *, void(^completion)(BOOL finished, AMGoodsSellingMessageModel *current)))block completion:(void (^)(AMGoodsSellingMessageModel *, void(^)(BOOL)))completion
+{
+    AMGoodsSellingMessageModel *next = [self popModel];
+    if(next && block){
+        __weak __typeof(self)weakSelf = self;
+        if(preModel){
+            if(![next isEqual:preModel]){
+                next.animationType = AMMessageAnimationTypeReShowAndAnimation;
+                next.currentNum = MAX(1, [next.sellingNumber integerValue]);
+            }else{
+                next.animationType = AMMessageAnimationTypeAnimation;
+                NSInteger num = MAX(1, [next.sellingNumber integerValue]);
+                next.currentNum = preModel.currentNum + num;
+            }
+        }else{
+            next.animationType = AMMessageAnimationTypeShowAndAnimation;
+            next.currentNum = MAX(1, [next.sellingNumber integerValue]);
+        }
+        next.displayNumber = [NSString stringWithFormat:@"%ld", next.currentNum];
+        block(next, ^(BOOL finished, AMGoodsSellingMessageModel *current){
+            if(finished){
+                [weakSelf processWithPreModel:next block:block completion:completion];
+            }
+        });
+    }else{
+        if(completion){
+            completion(preModel, ^(BOOL finished){
+                onceMessageQueueManagerToken = 0;
+            });
+        }
+    }
+}
+
+-(void)beginProductSoldOutAnimation
+{
+      __weak __typeof(self)weakSelf = self;
+      [[AMMessageQueueManager sharedInstance] handleWithBlock:^(AMGoodsSellingMessageModel * model, void (^ _Nonnull completion)(BOOL ,AMGoodsSellingMessageModel *)) {
+          if(model){
+              [weakSelf productSoldOutViewAnimation:model completion:^(BOOL finished, AMGoodsSellingMessageModel *current) {
+              completion(finished, current);
+          }];
+      }
+      } completion:^(AMGoodsSellingMessageModel *preModel, void (^ _Nonnull finishCallback)(BOOL)) {
+          NSInteger des = preModel ? preModel.dismissSec : 3;
+          [[AMMessageTimerManager sharedInstance] scheduledWithMessageType:AMCustomMessageTypeGoodsSelling timeout:des completion:^{
+              [weakSelf hideProductSoldOutView:^(BOOL finished) {
+                  finishCallback(finished);
+              }];
+          }];
+      }];
+}

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require 'lhj/helper/oss_helper'
+require 'highline'
 
 module Lhj
   class Command
@@ -7,42 +8,24 @@ module Lhj
       class Del < OSS
         self.summary = '删除OSS的key'
 
-        self.arguments = [
-          CLAide::Argument.new('--key=XX', true),
-          CLAide::Argument.new('--type=XX', true)
-        ]
-
-        def self.options
-          [
-            %w[--key OSS对应的key],
-            %w[--type OSS对应的类型]
-          ]
-        end
-
         def initialize(argv)
-          @key = argv.option('key')
-          @type = argv.option('type')
-          super
-        end
-
-        def validate!
-          help! '请输入key或者类型' unless @key || @type
+          @cli = HighLine.new
           super
         end
 
         def handle
-          if @type
-            objects = Lhj::OSS::Helper.instance.list
-            objects.each do |o|
-              if /#{@type}/ =~ o.key
-                puts "成功删除#{o.key}"
-                Lhj::OSS::Helper.instance.delete(o.key)
-              end
-            end
-          else
-            Lhj::OSS::Helper.instance.delete(@key)
+          objects = Lhj::OSS::Helper.instance.list
+          obj_keys = []
+          objects.each_with_index do |o, i|
+            obj_keys << o.key
+            puts "#{i}.#{o.key}".yellow
           end
+          idx = @cli.ask('请选择删除的key: '.green).strip.to_i
+          oss_key = obj_keys[idx]
+          puts "删除的key为:#{oss_key}".red
+          Lhj::OSS::Helper.instance.delete(oss_key)
         end
+
       end
     end
   end

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

@@ -0,0 +1,38 @@
+
+# frozen_string_literal: true
+require 'lhj/helper/oss_helper'
+require 'highline'
+
+module Lhj
+  class Command
+    class OSS < Command
+      class Download < OSS
+        self.summary = '下载OSS'
+
+        def initialize(argv)
+          @current_path = argv.shift_argument || Dir.pwd
+          @cli = HighLine.new
+          super
+        end
+
+        def handle
+          objects = Lhj::OSS::Helper.instance.list
+          obj_keys = []
+          objects.each_with_index do |o, i|
+            obj_keys << o.key
+            puts "#{i}.#{o.key}".yellow
+          end
+          idx = @cli.ask('请选择下载的序号: '.green).strip.to_i
+          oss_key = obj_keys[idx]
+          puts "下载的key为:#{oss_key}".yellow
+
+          file_key = oss_key.split('/').last
+          file = File.join(@current_path, file_key)
+          Lhj::OSS::Helper.instance.down_load(oss_key, file)
+          puts "下载文件到目录: #{file}\n".yellow
+        end
+
+      end
+    end
+  end
+end

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

@@ -10,8 +10,8 @@ module Lhj
         def handle
           objects = Lhj::OSS::Helper.instance.list
           rows = []
-          objects.each do |o|
-            path = "#{Lhj::OSS::Helper.instance.url_path}/#{o.key}"
+          objects.each_with_index do |o, i|
+            path = "#{i}.#{Lhj::OSS::Helper.instance.url_path}/#{o.key}"
             rows << [path]
           end
           table = Terminal::Table.new title: 'OSS List', headings: ['URL'], rows: rows

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

@@ -1,50 +1,44 @@
 # frozen_string_literal: true
 
 require 'lhj/helper/oss_helper'
+require 'highline'
 
 module Lhj
   class Command
     class OSS < Command
       # OSS file upload
       class Upload < OSS
-        self.summary = '上传文件'
+        self.summary = '上传文件(添加标签 --tag=XX)'
 
         self.arguments = [
-          CLAide::Argument.new('type', false),
-          CLAide::Argument.new('name', false),
           CLAide::Argument.new('tag', false)
         ]
 
         def self.options
           [
-            %w[--type 文件类型],
-            %w[--name 文件名],
             %w[--tag 标签]
           ]
         end
 
-        def validate!
-          super
-          help! '类型或名字必须输入' unless @name || @type
-        end
-
         def initialize(argv)
           @current_path = argv.shift_argument || Dir.pwd
-          @type = argv.option('type')
-          @name = argv.option('name')
           @tag = argv.option('tag')
+          @cli = HighLine.new
           super
         end
 
         def handle
-          Dir.glob("#{@current_path}/*").each do |f|
-            file_name = File.basename(f)
-            if @name && /#{@name}/ =~ file_name
-              upload(f, file_name)
-            elsif @type && /#{@type}/ =~ file_name
-              upload(f, file_name)
-            end
+          file_list = []
+          file_name_list = []
+          Dir.glob("#{@current_path}/*").each_with_index do |f, i|
+            file_base_name = File.basename(f)
+            file_list << f
+            file_name_list << file_base_name
+            puts "#{i}.#{file_base_name}".yellow
           end
+          idx = @cli.ask('请选择上传文件序号: '.green).strip.to_i
+          puts "上传的文件名:#{file_name_list[idx]}".yellow
+          upload(file_list[idx], file_name_list[idx])
         end
 
         private
@@ -54,7 +48,7 @@ module Lhj
           oss_key = "#{@tag}/#{file_name}" if @tag
           Lhj::OSS::Helper.instance.upload(oss_key, file)
           url = Lhj::OSS::Helper.instance.object_url(oss_key)
-          puts "云端上传成功：#{url}\n"
+          puts "云端上传成功：#{url}\n".yellow
         end
       end
     end

data/lib/lhj/command/refactor_rename.rb

@@ -53,6 +53,8 @@ module Lhj
 
       def modify_file(file)
         File.chmod(0o644, file)
+        # arr = File.open(file, 'r+').readlines
+        # lines = arr.size
         str = file_string(file)
         File.open(file, 'w+') do |f|
           f.write(str)

data/lib/lhj/command/trans.rb

@@ -26,7 +26,8 @@ module Lhj
       end
 
       def handler_files
-        Dir.glob("#{@current_path}/**/*.{#{@file_type}}").each do |f|
+        search_type = @file_type.gsub('.', '')
+        Dir.glob("#{@current_path}/**/*.{#{search_type}}").each do |f|
           handler_file f
         end
       end

data/lib/lhj/command.rb

@@ -17,7 +17,9 @@ module Lhj
     require 'lhj/command/oss/del'
     require 'lhj/command/oss/upload'
     require 'lhj/command/oss/list'
-    require 'lhj/command/view'
+    require 'lhj/command/oss/download'
+    require 'lhj/command/code/view'
+    require 'lhj/command/code/code_template'
     require 'lhj/command/rename_image'
     require 'lhj/command/trans'
     require 'lhj/command/yapi'

data/lib/lhj/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.35"
+    VERSION = "0.1.38"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.35
+  version: 0.1.38
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-29 00:00:00.000000000 Z
+date: 2022-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -294,6 +294,10 @@ files:
 - bin/lhj
 - lib/lhj/action/sh_helper.rb
 - lib/lhj/command.rb
+- lib/lhj/command/code/code_template.rb
+- lib/lhj/command/code/template/dispatch_source.erb
+- lib/lhj/command/code/template/message_query.erb
+- lib/lhj/command/code/view.rb
 - lib/lhj/command/config.rb
 - lib/lhj/command/config/info.rb
 - lib/lhj/command/duplicate_imageset.rb
@@ -308,6 +312,7 @@ files:
 - lib/lhj/command/local/micro_service.rb
 - lib/lhj/command/oss.rb
 - lib/lhj/command/oss/del.rb
+- lib/lhj/command/oss/download.rb
 - lib/lhj/command/oss/list.rb
 - lib/lhj/command/oss/upload.rb
 - lib/lhj/command/pgyer_upload.rb
@@ -318,7 +323,6 @@ files:
 - lib/lhj/command/sync_pod_version.rb
 - lib/lhj/command/template.rb
 - lib/lhj/command/trans.rb
-- lib/lhj/command/view.rb
 - lib/lhj/command/yapi.rb
 - lib/lhj/command/yapi/formatters/base.rb
 - lib/lhj/command/yapi/formatters/command_context.rb