pixab 1.7.3 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84d54a1ab3a12281357538f78851d2b729803cf110e51570a17f2ee0e1c480de
-  data.tar.gz: 2223cb8f2541517bcde9f0490cc064061043ddfc964d42d93d4ea953eaf2e417
+  metadata.gz: ea5e126059d8afc2bf728cbad73ebdc6daef4302d8d1eb175d25799191949f75
+  data.tar.gz: fe311f10dbde070db2f146060bcd79c531a49c0f08d5429be5e0e36696e9d823
 SHA512:
-  metadata.gz: feb82c51f413c5a117ef86728574aa5498f9d5a13181eef65c555fc10b525af202f94dddbbf13f08b5b56c105dbb9fa0eb7e2fa376a1d95b8706b36ee0767c62
-  data.tar.gz: 43ad564e1d758c1ed30bc929207af08c25e5426b33f8a59f80b731d8d055881f93afb37a0017428759ae511a37b00feaf140924c358594e15b6a3ca339b85390
+  metadata.gz: dc0aa68915ddc765958ec7931afe991779b4ec29559af33701b64dcd737bd7df019aee59717a16f1fcf4ef4e6f14b6f13f631bd7a93fe4a254ff9ad4d8bb5765
+  data.tar.gz: 87b5b227fffc9666c624c92f18ff9866a5b00cef3d3e0d7d549bc6a0ce032bf139186a388368a500788b30e24b2dbf95cf3e21ae35604b2150fa854fad109c10

data/exe/pixab

@@ -8,6 +8,8 @@ require_relative '../lib/ComponentSynchronizer.rb'
 require_relative '../lib/Localization.rb'
 require_relative '../lib/Package.rb'
 require_relative '../lib/LocalizationSmartcat.rb'
+require_relative '../lib/LocalizationSmartcatImport.rb'
+require_relative '../lib/LocalizationSmartcatMerge.rb'
 
 case ARGV[0]
 when '--version'
@@ -37,7 +39,19 @@ when 'localizePhrase'
 when 'package'
   Pixab::Package.new.run
 when 'localize'
-  Pixab::LocalizationSmartcat.new.run(ARGV[1..-1])
+  if ARGV.count > 1
+    sub_command = ARGV[1]
+    case sub_command
+    when 'import'
+      Pixab::LocalizationSmartcatImport.new.run(ARGV[2..-1])
+    when 'merge'
+      Pixab::LocalizationSmartcatMerge.new.run(ARGV[2..-1])
+    else
+      Pixab::LocalizationSmartcat.new.run(ARGV[1..-1])
+    end
+  else
+    Pixab::LocalizationSmartcat.new.run(ARGV[1..-1])
+  end
 else
   puts "Invalid command".red
 end

data/lib/LocalizationSmartcat.rb

@@ -3,23 +3,18 @@ require 'uri'
 require 'zip'
 require 'colored2'
 require 'nokogiri'
+require_relative './LocalizationSmartcatInfo.rb'
 
 module Pixab
 
   class LocalizationSmartcat
 
-    # 设置基本认证信息
-    USERNAME = '4c8b26ac-ff12-427f-a460-afaacbb3fa3c'
-    PASSWORD = '6_nDd3whcOZQHv5dPAusbq5Wmfl'
     Localization_FILE_NAME = 'Localization.zip'
 
-    Project_AirBrush = '6cd2db15-6325-43ae-9087-f78aca9bec9a'
-    Project_AirBrushVideo = '16cbeffd-bb6e-46e8-a32e-9c79d23a796f'
-
-    attr_accessor :projects, :tags, :platform, :collections
+    attr_accessor :projects, :tags, :platform, :collections, :languages, :format, :output
 
     def initialize()
-      @projects = Project_AirBrush
+      @projects = LocalizationSmartcatInfo::Project_AirBrush
       @collections = 'main'
     end
 
@@ -31,16 +26,18 @@ module Pixab
           @platform = 'android'
           @tags = 'android'
           @collections = 'AirBrush'
+          @languages = 'en,ru,tr,de,fr,zh-Hans,zh-Hant,pt-BR,es,ar'
         when '--ab-iOS'
           @platform = 'iOS'
           @tags = 'iOS'
           @collections = 'AirBrush'
+          @languages = 'en,ru,tr,de,fr,zh-Hans,zh-Hant,pt-BR,es,ar'
         when '--abv-iOS'
-          @projects = Project_AirBrushVideo
+          @projects = LocalizationSmartcatInfo::Project_AirBrushVideo
           @platform = 'iOS'
           @tags = 'iOS'
         when '--abv-android'
-          @projects = Project_AirBrushVideo
+          @projects = LocalizationSmartcatInfo::Project_AirBrushVideo
           @platform = 'android'
           @tags = 'android'
         end
@@ -57,6 +54,12 @@ module Pixab
           @platform = commands[index + 1]
         when '--collections'
           @collections = commands[index + 1]
+        when '--languages'
+          @languages = commands[index + 1]
+        when '--format'
+          @format = commands[index + 1]
+        when '--output'
+          @output = commands[index + 1]
         end
       end
 
@@ -82,7 +85,7 @@ module Pixab
       uri.query = URI.encode_www_form(export_params)
 
       request = Net::HTTP::Post.new(uri)
-      request.basic_auth(USERNAME,PASSWORD)
+      request.basic_auth(LocalizationSmartcatInfo::USERNAME, LocalizationSmartcatInfo::PASSWORD)
 
       response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == "https") do |http|
         http.request(request)
@@ -97,7 +100,7 @@ module Pixab
       while retries < max_retries
         uri = URI("#{download_url}/#{export_id}")
         request = Net::HTTP::Get.new(uri)
-        request.basic_auth(USERNAME,PASSWORD)
+        request.basic_auth(LocalizationSmartcatInfo::USERNAME, LocalizationSmartcatInfo::PASSWORD)
 
         response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == "https") do |http|
           http.request(request)
@@ -115,17 +118,20 @@ module Pixab
         end
       end
 
-      puts "Failed to download after #{max_retries} retries. Export ID: #{export_id}"
+      puts "\nFailed to download after #{max_retries} retries. Export ID: #{export_id}"
       return false
     end
 
     # 第三步：解压缩ZIP文件
     def unzip_file(zip_path)
       Zip::File.open(zip_path) do |zip_file|
-        if platform == 'android'
+        case platform
+        when 'android'
           unzip_file_android(zip_file)
-        else
+        when 'iOS'
           unzip_file_iOS(zip_file)
+        else
+          unzip_file_common(zip_file)          
         end
       end
 
@@ -133,6 +139,15 @@ module Pixab
 
     end
 
+    def unzip_file_common(zip_file)
+      zip_file.each do |f|
+        f_path = f.name
+        FileUtils.mkdir_p(File.dirname(f_path))
+        File.delete(f_path) if File.exist?(f_path)
+        f.extract(f_path)
+      end
+    end
+
     def unzip_file_iOS(zip_file)
       zip_file.each do |f|
         if is_ignored_file_path(f.name)
@@ -141,7 +156,7 @@ module Pixab
         f_path = extract_localization_file_path(f.name)
         FileUtils.mkdir_p(File.dirname(f_path))
         content = f.get_input_stream.read
-        if projects == Project_AirBrush
+        if projects == LocalizationSmartcatInfo::Project_AirBrush
           content = content.gsub(/=\s*".*";/) do |match|
             match.gsub('%s', '%@')
           end
@@ -177,25 +192,42 @@ module Pixab
         'include-default-language' => nil,
       }
 
-      if !platform.nil?
-        format = nil
-        template = nil
-        if platform == 'android'
-          format = 'android-xml'
-          if projects == Project_AirBrush
-            template = '{LOCALE:ANDROID}/strings_ph.xml'
+      final_format = nil
+      final_output = nil
+      unless platform.nil?
+        case platform
+        when 'android'
+          final_format = 'android-xml'
+          if projects == LocalizationSmartcatInfo::Project_AirBrush
+            final_output = '{LOCALE:ANDROID}/strings_ph.xml'
           else
-            template = '{LOCALE:ANDROID}/strings.xml'
+            final_output = '{LOCALE:ANDROID}/strings.xml'
           end
-        else
-          format = 'ios-strings'
-          template = '{LOCALE:IOS}.lproj/Localizable.strings'
+        when 'iOS'
+          final_format = 'ios-strings'
+          final_output = '{LOCALE:IOS}.lproj/Localizable.strings'
         end
-        export_params['format'] = format
-        export_params['output-file-path-template'] = template
       end
 
-      if !tags.nil?
+      unless @format.nil?
+        final_format = @format
+      end
+      unless @output.nil?
+        final_output = @output
+      end
+
+      unless final_format.nil?
+        export_params['format'] = final_format
+      end
+      unless final_output.nil?
+        export_params['output-file-path-template'] = final_output
+      end
+
+      unless languages.nil?
+        export_params['languages'] = languages
+      end
+
+      unless tags.nil?
         export_params['labels'] = tags
       end
 
@@ -204,7 +236,7 @@ module Pixab
 
     def extract_localization_file_path(zip_file_path)
       case projects
-      when Project_AirBrush
+      when LocalizationSmartcatInfo::Project_AirBrush
         if platform.nil? || platform != 'android'
           return zip_file_path
         end
@@ -229,7 +261,7 @@ module Pixab
         end
         return "values#{localization}/#{File.basename(zip_file_path)}"
       
-      when Project_AirBrushVideo
+      when LocalizationSmartcatInfo::Project_AirBrushVideo
         if platform.nil?
           return zip_file_path
         end
@@ -260,11 +292,12 @@ module Pixab
         end
       end
 
+      return zip_file_path
     end
 
     def is_ignored_file_path(file_path)
       case projects
-      when Project_AirBrush
+      when LocalizationSmartcatInfo::Project_AirBrush
         return false unless platform == 'android'
 
         path = File.dirname(file_path)

data/lib/LocalizationSmartcatImport.rb

@@ -0,0 +1,160 @@
+require 'uri'
+require 'rest-client'
+require_relative './LocalizationSmartcatInfo.rb'
+
+module Pixab
+
+  class LocalizationSmartcatImport
+
+    attr_accessor :project, :collection, :format, :tags, :completion_state, :conflicting_values
+
+    def run(commands = nil)
+      commands.each_index do |index|
+        command = commands[index]
+        case command
+        when '--ab'
+          @project = LocalizationSmartcatInfo::Project_AirBrush
+          @collection = 'AirBrush'
+          @tags = 'iOS,android'
+          @conflicting_values = 'skip'
+        when '--abtest'
+          @project = LocalizationSmartcatInfo::Project_AirBrush_test
+          @collection = 'merge_test'
+          @tags = 'iOS,android'
+          @conflicting_values = 'skip'
+        end
+      end
+
+      commands.each_index do |index|
+        command = commands[index]
+        case command
+        when '--project'
+          @project = commands[index + 1]
+        when '--collection'
+          @collection = commands[index + 1]
+        when '--format'
+          @format = commands[index + 1]
+        when '--tags'
+          @tags = commands[index + 1]
+        when '--completion-state'
+          @completion_state = commands[index + 1]
+        when '--conflicting-values'
+          @conflicting_values = commands[index + 1]
+        end
+      end
+
+      import_localization_from_directory(Dir.pwd)
+
+    end
+
+    #  遍历目录上传本地化文案
+    def import_localization_from_directory(directory)
+      import_url = "https://smartcat.com/api/integration/v2/project/#{@project}/import"
+      entries = []
+      Dir.foreach(directory) do |entry|
+        if entry.start_with?(".")
+          next
+        end
+
+        if File.basename(entry, File.extname(entry)) == 'en'
+          entries.unshift(entry)
+        else
+          entries.push(entry)
+        end
+      end
+
+      puts "\n》》》》》正在上传本地化文案 》》》》》》》》》》\n".green
+
+      entries.each do |entry|
+        file_path = "#{directory}/#{entry}"
+        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)
+      end 
+
+      puts "\n》》》》》本地化文案上传已完成 》》》》》》》》》》\n".green
+      puts "提示：由于Smartcat后台延迟，上传文案可能需要等待1-2分钟才能在后台全部显示。"
+
+    end
+
+    # 导入本地化文案
+    def import_localization(import_url, import_params, file_path)
+      uri = URI(import_url)
+      uri.query = URI.encode_www_form(import_params)
+      response = RestClient::Request.execute(
+        method: :post,
+        url: uri.to_s,
+        user: LocalizationSmartcatInfo::USERNAME,
+        password: LocalizationSmartcatInfo::PASSWORD,
+        payload: {
+          multipart: true,
+          file: File.new(file_path, 'rb')
+        }
+      )
+      return response.body
+    end
+
+    # 通过文件名称获取上传参数
+    def generate_import_params_from_file_name(file_name)
+      params = {}
+
+      unless @collection.nil?
+        params['collection'] = @collection
+      end
+
+      file_base_name = File.basename(file_name, File.extname(file_name))
+      params['language'] = file_base_name
+
+      unless @format.nil?
+        params['format'] = @format
+      end
+
+      unless @tags.nil?
+        params['labels'] = @tags
+      end
+
+      unless @completion_state.nil?
+        params['completion-state'] = @completion_state
+      end
+
+      unless @conflicting_values.nil?
+        if @conflicting_values == 'skip'
+          params['skip-conflicting-values'] = nil
+        elsif @conflicting_values == 'overwrite'
+          params['overwrite-conflicting-values'] = nil
+        end
+      end
+
+      return params
+    end
+
+    # 检查文件上传是否成功
+    def check_import_status(import_id, max_retries=60)
+      # 移除双引号
+      import_id = import_id.tr('"','')
+      retries = 0
+      while retries < max_retries
+        import_result_url = "https://smartcat.ai/api/v2/project/import-result/#{import_id}"
+        uri = URI(import_result_url)
+        request = Net::HTTP::Get.new(uri)
+        request.basic_auth(LocalizationSmartcatInfo::USERNAME, LocalizationSmartcatInfo::PASSWORD)
+        response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == "https") do |http|
+          http.request(request)
+        end
+
+        if response.code == "200"
+          puts response.body
+          retries += 1
+          sleep(1)
+        else
+          puts response.body
+          return false
+        end
+
+      end
+    end
+
+  end
+
+end

data/lib/LocalizationSmartcatInfo.rb

@@ -0,0 +1,17 @@
+
+module Pixab
+
+  class LocalizationSmartcatInfo
+
+    # 基本认证信息
+    USERNAME = '4c8b26ac-ff12-427f-a460-afaacbb3fa3c'
+
+    PASSWORD = '6_nDd3whcOZQHv5dPAusbq5Wmfl'
+
+    Project_AirBrush = '6cd2db15-6325-43ae-9087-f78aca9bec9a'
+
+    Project_AirBrushVideo = '16cbeffd-bb6e-46e8-a32e-9c79d23a796f'
+
+  end
+
+end

data/lib/LocalizationSmartcatMerge.rb

@@ -0,0 +1,47 @@
+
+require_relative './LocalizationSmartcat.rb'
+require_relative './LocalizationSmartcatImport.rb'
+
+module Pixab 
+  
+  class LocalizationSmartcatMerge
+
+    def run(commands=nil)
+      download_params = []
+      import_params = []
+      commands.each_index do |index|
+        command = commands[index]
+
+        unless command.start_with?("--")
+          next
+        end
+
+        if command == "--ab"
+          download_params += ["--output", "{LANGUAGE}.json", "--tags", "ab"]
+          import_params.push("--ab")
+          next
+        end
+
+        if command == "--abtest"
+          download_params += ["--output", "{LANGUAGE}.json", "--tags", "merge_test"]
+          import_params.push("--abtest")
+          next
+        end
+
+        if command.start_with?("--to-")
+          import_params.push(command.sub("--to-", "--"))
+          import_params.push(commands[index + 1])
+        else
+          download_params.push(command)
+          download_params.push(commands[index + 1])
+        end
+
+      end
+
+      LocalizationSmartcat.new.run(download_params)
+      LocalizationSmartcatImport.new.run(import_params)
+    end
+
+  end
+  
+end

data/lib/pixab/version.rb

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

data/pixab.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "colored2"
   spec.add_dependency 'rubyzip'
   spec.add_dependency 'nokogiri'
+  spec.add_dependency 'rest-client'
 
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pixab
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.8.0
 platform: ruby
 authors:
 - 廖再润
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-09 00:00:00.000000000 Z
+date: 2024-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored2
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Write a longer description or delete this line.
 email:
 - lzr3@us.meitu.com
@@ -72,6 +86,9 @@ files:
 - lib/Localization.rb
 - lib/LocalizationPlatform.rb
 - lib/LocalizationSmartcat.rb
+- lib/LocalizationSmartcatImport.rb
+- lib/LocalizationSmartcatInfo.rb
+- lib/LocalizationSmartcatMerge.rb
 - lib/MergeRequest.rb
 - lib/Package.rb
 - lib/RepoManager.rb