pixab 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea5e126059d8afc2bf728cbad73ebdc6daef4302d8d1eb175d25799191949f75
-  data.tar.gz: fe311f10dbde070db2f146060bcd79c531a49c0f08d5429be5e0e36696e9d823
+  metadata.gz: fdba62ae7047c7ef946363083adac26824b0cb07b225e271835be82bc6665ed6
+  data.tar.gz: cfceb1c4a436385adf52dfc6eef0ac38d059ce0696abff97e348c2c6d4f62e15
 SHA512:
-  metadata.gz: dc0aa68915ddc765958ec7931afe991779b4ec29559af33701b64dcd737bd7df019aee59717a16f1fcf4ef4e6f14b6f13f631bd7a93fe4a254ff9ad4d8bb5765
-  data.tar.gz: 87b5b227fffc9666c624c92f18ff9866a5b00cef3d3e0d7d549bc6a0ce032bf139186a388368a500788b30e24b2dbf95cf3e21ae35604b2150fa854fad109c10
+  metadata.gz: bd569f56a0420a882377aede3a6f78ae0909ca066477a4669dc2166e7aec4c077d0f050f49ac965519bc07bd15521cb01b8f578ff279fa03ea62176c75144569
+  data.tar.gz: 0face14f5ad601b66713ab16432cb930e8a20637a71fad8770e34b12f989894c545997f95776a621ebdd9a1d86784e00cee7ecc7d4d8aa04093ed0291a62f84a

data/exe/pixab

@@ -10,6 +10,7 @@ require_relative '../lib/Package.rb'
 require_relative '../lib/LocalizationSmartcat.rb'
 require_relative '../lib/LocalizationSmartcatImport.rb'
 require_relative '../lib/LocalizationSmartcatMerge.rb'
+require_relative '../lib/mbox/Mbox.rb'
 
 case ARGV[0]
 when '--version'
@@ -52,6 +53,8 @@ when 'localize'
   else
     Pixab::LocalizationSmartcat.new.run(ARGV[1..-1])
   end
+when 'mbox'
+  Pixab::Mbox.new.run(ARGV[1..-1])
 else
   puts "Invalid command".red
 end

data/lib/ComponentSynchronizer.rb

@@ -4,14 +4,14 @@
 require "fileutils"
 require 'colored2'
 require 'open3'
-require_relative './Utilities.rb'
+require_relative './GitUtils.rb'
 require_relative './RepoManager.rb'
 
 module Pixab
 
   class ComponentSynchronizer
 
-    attr_accessor :is_need_build, :is_need_remote_repo, :is_need_pod_install
+    attr_accessor :is_need_build, :is_need_remote_repo, :is_need_pod_install, :is_use__target_branch
     attr_reader :repo_manager, :repos, :main_repo_name, :updated_repo_names
   
     def initialize(repo_manager = RepoManager.new, commands = nil)
@@ -19,6 +19,8 @@ module Pixab
       @is_need_build = false
       @is_need_remote_repo = false
       @is_need_pod_install = true
+      @is_use__target_branch = true
+
       if commands.nil?
         return
       end
@@ -31,9 +33,12 @@ module Pixab
           @is_need_remote_repo = true
         when "--no-pod-install"
           @is_need_pod_install = false
+        when "--current-branch"
+          @is_use__target_branch = false
         else
         end
       end
+
     end
   
     def run
@@ -121,9 +126,14 @@ module Pixab
       repo_commite_id = {}
       repos.each do |repo|
         repo_name = repo["name"]
-        repo_target_branch = repo["target_branch"]
+
         FileUtils.cd("#{repo_manager.root_path}/#{repo_name}")
-        `git fetch origin #{repo_target_branch}`
+        repo_target_branch = @is_use__target_branch ? repo_target_branch = repo["target_branch"] : GitUtils.current_branch
+        next unless GitUtils.check_remote_branch_exists_fast("origin/#{repo_target_branch}")    
+
+        stdout, status = Open3.capture2("git fetch origin #{repo_target_branch}")
+        next unless status.success?
+
         commit_id = `git log origin/#{repo_target_branch} -n 1 --pretty=format:"%H"`
         if !commit_id.nil?
           repo_commite_id[repo_name] = commit_id
@@ -199,5 +209,4 @@ module Pixab
   
   end
   
-end
-
+end

data/lib/GitUtils.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 # encoding: UTF-8
 
+require 'open3'
 require_relative './Utilities.rb'
 
 module Pixab
@@ -96,6 +97,39 @@ module Pixab
       return Utilities.execute_shell(commad)
     end
 
+    # 获取当前分支的远程分支
+    def current_remote_branch
+      local_branch = current_branch
+      return nil if local_branch.nil?
+
+      remote_branch, status = Open3.capture2("git for-each-ref --format='%(upstream:short)' refs/heads/#{local_branch}")
+      remote_branch.strip!
+      return nil if !status.success? || remote_branch.empty?
+
+      return nil unless check_remote_branch_exists_fast(remote_branch)
+      return remote_branch 
+    rescue => e
+      puts "Error: get current remote branch failed, #{e.message}".red
+      return nil
+    end
+
+    # 在远程仓库检查远程分支是否存在
+    # remote_branch: 远程分支名称，不需要remote前缀，使用origin作为remote
+    def check_remote_branch_exists(remote_branch)
+      exisit_remote_branch, status= Open3.capture2("git ls-remote --heads origin #{remote_branch}")
+      return status.success? && !exisit_remote_branch.strip.empty?
+    rescue => e
+      puts "Error: check remote branch exists failed, #{e.message}".red
+      return false
+    end
+
+    # 在本地仓库检查远程分支是否存在
+    # remote_branch: 远程分支名称
+    def check_remote_branch_exists_fast(remote_branch)
+      exisit_remote_branch, status = Open3.capture2("git branch -r --list #{remote_branch}")
+      status.success? && !exisit_remote_branch.strip.empty?
+    end
+
   end
 
   class << GitUtils

data/lib/LocalizationSmartcatImport.rb

@@ -6,7 +6,11 @@ module Pixab
 
   class LocalizationSmartcatImport
 
-    attr_accessor :project, :collection, :format, :tags, :completion_state, :conflicting_values
+    attr_accessor :project, :collection, :format, :tags, :completion_state, :conflicting_values, :delete_file_after_import
+
+    def initialize()
+      @delete_file_after_import = false
+    end
 
     def run(commands = nil)
       commands.each_index do |index|
@@ -40,6 +44,10 @@ module Pixab
           @completion_state = commands[index + 1]
         when '--conflicting-values'
           @conflicting_values = commands[index + 1]
+        when '--delete-file-after-import'
+          @delete_file_after_import = true
+        when '--keep-file-after-import'
+          @delete_file_after_import = false
         end
       end
 
@@ -70,7 +78,9 @@ module Pixab
         import_params = generate_import_params_from_file_name(entry)
         import_id = import_localization(import_url, import_params, file_path)
         puts "#{entry} 正在上传中，上传ID：#{import_id}"
-        File.delete(file_path) if File.exist?(file_path)
+        if @delete_file_after_import
+          File.delete(file_path) if File.exist?(file_path)
+        end
       end 
 
       puts "\n》》》》》本地化文案上传已完成 》》》》》》》》》》\n".green

data/lib/LocalizationSmartcatInfo.rb

@@ -12,6 +12,8 @@ module Pixab
 
     Project_AirBrushVideo = '16cbeffd-bb6e-46e8-a32e-9c79d23a796f'
 
+    Project_AirBrush_test = '0dafd468-f131-4c33-91f8-66d13e1eb6f4'
+
   end
 
 end

data/lib/LocalizationSmartcatMerge.rb

@@ -8,7 +8,7 @@ module Pixab
 
     def run(commands=nil)
       download_params = []
-      import_params = []
+      import_params = ["--delete-file-after-import"]
       commands.each_index do |index|
         command = commands[index]
 

data/lib/RepoManager.rb

@@ -37,6 +37,10 @@ module Pixab
     def main_repo
       repos.first
     end
+
+    def main_repo_name
+      main_repo["name"]
+    end
   
     def sub_repos
       if repos.length > 1
@@ -47,6 +51,12 @@ module Pixab
       return []
     end
 
+    def sub_repo_names
+      sub_repos.map do |sub_repo|
+        sub_repo["name"]
+      end
+    end
+
     def feature_name
       feature["name"]
     end

data/lib/mbox/AirBrushProjectInfo.rb

@@ -0,0 +1,11 @@
+module Pixab
+
+  class AirBrushProjectInfo
+
+    COMPONENT_FILE_PATH = 'AirBrushPodfiles/pix_ab_component.rb'
+
+    DEFAULT_BRANCH = 'develop'
+
+  end
+
+end

data/lib/mbox/Mbox.rb

@@ -0,0 +1,33 @@
+require_relative './MboxAdd.rb'
+require_relative './MboxRemove.rb'
+
+module Pixab
+  
+  class  Mbox
+
+    attr_reader :repo_manager
+
+    def initialize
+      @repo_manager = RepoManager.new
+    end
+
+    def run(commands)
+      if commands.empty?
+        puts "请输入命令".red
+        return
+      end
+
+      command = commands[0]
+      case command
+      when "add"
+        MboxAdd.new(repo_manager).run(commands[1..-1])
+      when "remove"
+        MboxRemove.new(repo_manager).run(commands[1..-1])
+      else
+        `mbox #{commands.join(" ")}`
+      end
+    end
+
+  end
+  
+end

data/lib/mbox/MboxAdd.rb

@@ -0,0 +1,84 @@
+require 'open3'
+require_relative './AirBrushProjectInfo.rb'
+require_relative '../Utilities.rb'
+require_relative '../RepoManager.rb'
+
+module Pixab
+
+  class MboxAdd
+
+    attr_reader :repo_manager
+
+    def initialize(repo_manager)
+      @repo_manager = repo_manager
+    end
+
+    def run(commands)
+      if commands.empty?
+        repo_names = get_all_sub_repo_names
+        if !repo_names.empty?
+          selected_item_names = Utilities.display_choose_list(repo_names, nil, "仓库", "请选择需要添加的仓库：", nil, nil, true)
+          selected_item_names.each do |repo_name|
+            add_repo([repo_name.strip, AirBrushProjectInfo::DEFAULT_BRANCH])
+          end
+        end
+      elsif commands[0] == "--all"
+        repo_names = get_all_sub_repo_names
+        repo_names.each do |repo_name|
+          add_repo([repo_name, AirBrushProjectInfo::DEFAULT_BRANCH])
+        end
+      else
+        add_repo(commands)
+      end
+
+      system("mbox status")
+
+    end
+
+    def add_repo(commands)
+      return if commands.empty?
+
+      execute_commad = "mbox add"
+      commands.each do |command|
+        execute_commad += " #{command}"
+      end
+
+      stdout, status = Open3.capture2(execute_commad)
+      if status.success?
+        pull_lfs_files_if_needed(commands[0])
+      end
+    end
+
+    # 获取所有的子仓名
+    def get_all_sub_repo_names
+      podfile_path = "#{@repo_manager.root_path}/#{@repo_manager.main_repo_name}/#{AirBrushProjectInfo::COMPONENT_FILE_PATH}" 
+      podfile_content = File.read(podfile_path)
+      matches = podfile_content.match(/def pix_ab_component(.*?)end/m)
+      return [] if matches.nil?
+      podfile_content = matches[0]
+      reg = /'([^']+).+:commit => '(.+)'/
+      matches = podfile_content.scan(reg)
+      repo_names = matches.map do |match|
+        match[0]
+      end
+      repo_names - @repo_manager.sub_repo_names
+    end
+
+    # 如果使用了lfs，则拉取lfs文件
+    def pull_lfs_files_if_needed(repo_name)
+      # 使用此方法切换路径时可以避免在控制台打印路径，并在执行完成后会切换回原路径
+      FileUtils.cd("#{@repo_manager.root_path}/#{repo_name}") do
+        break unless File.exist?(".gitattributes")
+
+        file_content = File.read(".gitattributes")
+        break unless file_content.include?("filter=lfs")
+
+        Open3.capture3("mbox git hooks --disable")
+        `git lfs pull`
+        Open3.capture3("mbox git hooks --enable")
+      end
+    end
+
+  end
+
+end

data/lib/mbox/MboxRemove.rb

@@ -0,0 +1,46 @@
+module Pixab
+
+  class MboxRemove
+
+    attr_reader :repo_manager
+
+    def initialize(repo_manager)
+      @repo_manager = repo_manager
+    end
+
+    def run(commands)
+      if commands.empty?
+        repo_names = @repo_manager.sub_repo_names
+        if !repo_names.empty?
+          selected_item_names = Utilities.display_choose_list(repo_names, nil, "仓库", "请选择需要移除的仓库：", nil, nil, true)
+          selected_item_names.each do |repo_name|
+            remove_repo([repo_name.strip])
+          end
+        end
+      elsif commands[0] == "--all"
+        repo_names = @repo_manager.sub_repo_names
+        repo_names.each do |repo_name|
+          remove_repo([repo_name])
+        end
+      else
+        remove_repo(commands)
+      end
+
+      system("mbox status")
+
+    end
+
+    def remove_repo(commands)
+      return if commands.empty?
+
+      execute_commad = "mbox remove"
+      commands.each do |command|
+        execute_commad += " #{command}"
+      end
+
+      `#{execute_commad}`
+    end
+
+  end
+
+end

data/lib/pixab/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pixab
-  VERSION = "1.8.0"
+  VERSION = "1.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pixab
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - 廖再润
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-11 00:00:00.000000000 Z
+date: 2024-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored2
@@ -93,6 +93,10 @@ files:
 - lib/Package.rb
 - lib/RepoManager.rb
 - lib/Utilities.rb
+- lib/mbox/AirBrushProjectInfo.rb
+- lib/mbox/Mbox.rb
+- lib/mbox/MboxAdd.rb
+- lib/mbox/MboxRemove.rb
 - lib/pixab.rb
 - lib/pixab/version.rb
 - pixab.gemspec