pixab 1.1.1 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1aeab2e736e3207b8fce982411852aa8b83e28791658652e32aae8bb6a77af43
-  data.tar.gz: 4915bf4fc9c70b6a16b835fc2d72a33610af72e63a3fd6f80ba99db05d230fcf
+  metadata.gz: 620f8ce01d8a6d133e14e0bf9fd5b38ae12d59690f8755c311dbad00162e3378
+  data.tar.gz: 5949bd4e8a44174d1a6702698bd47aabb5b499940ef8bb7785674dcd3e5d4ddc
 SHA512:
-  metadata.gz: b7de12d1d9e4feb61704c9c7f8c4473ee5719d8c7e8d2907a66c985e95b99bee14c79649435d14ac36fa8ca714ad8e37935dc711ef18d7c52c6b01c5f52b4d8c
-  data.tar.gz: b2addac7aa9cbbb46893cd3aeaa1d0edd7319b2420e3473fe2395044263179c95967a00779d2103a789415d8b825f00f1c907d9f03c7f3ffc489270d48166170
+  metadata.gz: 3f64497e1c775ea0f8fe164f66d15b463c967e6ddcb568e8447541d366828e7e84c50e99ec22836afa26968cdf6172cb31f699ba53eea8e24a5623ebcc5ea0b6
+  data.tar.gz: fc3c3013e9e97e39fa622fcfff40125df59c2aa5735455aa50d6fe6df82ea1bbcd92d5929975f08b967238159322828b5a17e841320f9422e82896a42359a61f

data/exe/pixab

@@ -19,7 +19,7 @@ when 'sync'
     commands = ["-m"]
     if !synchronizer.updated_repo_names.empty?
       default_commit_msg = "[Feature]Update"
-      updated_repo_names.each do |repo_name|
+      synchronizer.updated_repo_names.each do |repo_name|
         default_commit_msg += " #{repo_name}"
       end
       commands.push("--commit-m")

data/lib/ComponentSynchronizer.rb

@@ -105,6 +105,7 @@ module Pixab
         repo_name = repo["name"]
         repo_target_branch = repo["target_branch"]
         FileUtils.cd("#{repo_manager.root_path}/#{repo_name}")
+        `git fetch origin #{repo_target_branch}`
         commit_id = `git log origin/#{repo_target_branch} -n 1 --pretty=format:"%H"`
         if !commit_id.nil?
           repo_commite_id[repo_name] = commit_id

data/lib/Localization.rb

@@ -27,21 +27,18 @@ module Pixab
           add_project(Project_AirBrush)
         when '--project-abv'
           add_project(Project_AirBrush_Video)
-        when '--tags' 
-          @tags = commands[index + 1]
-        when '--platform'
-          @platform = commands[index + 1]
-        when '--mode'
-          @mode = commands[index + 1]
         when '--ab-android'
           @projects = "#{Project_AirBrush},#{Project_AirBrush_Video}"
           @platform = 'android'
+          @tags = 'android'
         when '--ab-iOS'
           @projects = "#{Project_AirBrush}"
           @mode = 'add'
+          @tags = 'iOS'
         when '--abv-iOS'
           @projects = "#{Project_AirBrush_Video}"
           @mode = 'add'
+          @tags = 'iOS'
         end
       end
 
@@ -50,6 +47,12 @@ module Pixab
         case command
         when '--projects'
           @projects = commands[index + 1] 
+        when '--tags' 
+          @tags = commands[index + 1]
+        when '--platform'
+          @platform = commands[index + 1]
+        when '--mode'
+          @mode = commands[index + 1]
         end
       end
 
@@ -70,14 +73,23 @@ module Pixab
       localized_info_category = {}
       project_array = projects.split(',')
       project_array.each do |project|
-        command = "\"https://api.phrase.com/v2/projects/#{project}/translations" 
-        if !tags.nil?
-          command += "?q=tags:#{tags}"
-        end
-        command += "\" -u #{ACCESS_TOKEN}:"
-        localized_string = `curl #{command}`
-        localized_info_category.merge!(assemble_data(localized_string)) do |key, oldval, newval|
-          oldval + newval
+        page_number = 1
+        while true
+          link = "\"https://api.phrase.com/v2/projects/#{project}/translations?page=#{page_number}&per_page=100&sort=created_at" 
+          if !tags.nil?
+            link += "&q=tags:#{tags}"
+          end
+          link += "\""
+          access_token = "-u #{ACCESS_TOKEN}:"
+          localized_string = `curl #{link} #{access_token}`
+          per_localized_info_category = assemble_data(localized_string)
+          if per_localized_info_category.empty?
+            break
+          end
+          localized_info_category.merge!(per_localized_info_category) do |key, oldval, newval|
+            oldval + newval
+          end
+          page_number += 1
         end
       end
       return localized_info_category
@@ -85,8 +97,12 @@ module Pixab
 
     # 重新组装本地化数据
     def assemble_data(string)
-      objects = JSON.parse(string)
+      if string.nil? || string.empty?
+        return {}
+      end
+
       localized_info_category = {}
+      objects = JSON.parse(string)
       objects.each do |object|
         locale_name = object["locale"]["name"]
         localized_infos = localized_info_category[locale_name]

data/lib/LocalizationPlatform.rb

@@ -16,15 +16,16 @@ module Pixab
     end
 
     def resolve_commands(commands)
-      if !commands.nil?
-        commands.each_index do |index|
-          command = commands[index]
-          case command
-          when "--mode"
-            mode = commands[index + 1]
-            if mode == 'add'
-              @file_mode = 'a+'
-            end
+      if commands.nil?
+        return
+      end
+      commands.each_index do |index|
+        command = commands[index]
+        case command
+        when "--mode"
+          mode = commands[index + 1]
+          if mode == 'add'
+            @file_mode = 'a+'
           end
         end
       end
@@ -48,18 +49,29 @@ module Pixab
     def run(localized_info_category, commands)
       super(localized_info_category, commands)
 
+      begin_prompt = "\n// Created from phrase api <<<<<<<<<< begin\n"
+      end_prompt = "\n// Created from phrase api <<<<<<<<<< end\n"
+
       localized_info_category.each do |locale, localized_infos|
         content_dir_path = dir_name(locale)
         if !Dir.exists?(content_dir_path)
           FileUtils.mkdir_p content_dir_path
         end
         content_file_path = "#{content_dir_path}/#{File_name}"
-        File.open(content_file_path, @file_mode) do |aFile|
-          aFile.syswrite("\n// Created from phrase api <<<<<<<<<< begin\n")
+        if @file_mode == 'a+' and File::exists?(content_file_path)
+          # 移除以前脚本添加的本地化文案
+          content = File.read(content_file_path)
+          content = content.sub(/#{begin_prompt}.*#{end_prompt}/m, '')
+          File.open(content_file_path, 'w+') do |file|
+            file.syswrite(content)
+          end
+        end
+        File.open(content_file_path, @file_mode) do |file|
+          file.syswrite(begin_prompt)
           localized_infos.each do |localized_info|
-            aFile.syswrite("\n\"#{localized_info['key']}\" = \"#{localized_info['value']}\";\n")
+            file.syswrite("\n\"#{localized_info['key']}\" = \"#{localized_info['value']}\";\n")
           end
-          aFile.syswrite("\n// Created from phrase api <<<<<<<<<< end\n")
+          file.syswrite(end_prompt)
         end
       end
     end
@@ -92,13 +104,13 @@ module Pixab
           FileUtils.mkdir_p content_dir_path
         end
         content_file_path = "#{content_dir_path}/#{File_name}"
-        File.open(content_file_path, @file_mode) do |aFile|
-          aFile.syswrite("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n")
-          aFile.syswrite("<resources>\n")
+        File.open(content_file_path, @file_mode) do |file|
+          file.syswrite("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n")
+          file.syswrite("<resources>\n")
           localized_infos.each do |localized_info|
-            aFile.syswrite("  <string name=\"#{localized_info['key']}\">#{localized_info['value']}</string>\n")
+            file.syswrite("  <string name=\"#{localized_info['key']}\">#{localized_info['value']}</string>\n")
           end
-          aFile.syswrite("</resources>\n")
+          file.syswrite("</resources>\n")
         end
       end
     end

data/lib/pixab/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pixab
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.3
 platform: ruby
 authors:
 - 廖再润
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-05 00:00:00.000000000 Z
+date: 2023-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored2