cocoapods-aqara-localzedLoader 0.1.14 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5948996583d83aa8a72956d07acff0109ab3d72967c56fb7ced1824fe98d14e8
-  data.tar.gz: eeb047467d631e9aaf3816ff82176429ff753b6f6ac90b0c10ee7d07b52a16b5
+  metadata.gz: c557d47179504b09a3ce83e5249bc53770e57e8381afc9083fa98d3536787b44
+  data.tar.gz: e27468da9cb5661d6b3c386b80086795331739e98cff87f4969064c25d0692a9
 SHA512:
-  metadata.gz: 4ff0b6b2062358e45fb3d3c804f1aff3bfe0d2e2b5abf4ee8a0c302ec5921057fd83fa30651b913cab235594d26735409fd8ce88cdc0ca6c13039c47cbf0129a
-  data.tar.gz: c70258231afbf89737ee7c6accddea47b62c655d548be43f2f9f6bb9b6e3b04d5c20097043f6ea8f59fa089d0f1320b10ecd568eb833ae5e1679d2f87c2d88cd
+  metadata.gz: bf0d7310384c515dc492b01409b9fae7fe2f52f90bd9410713edacce678130e5428cc1a36ba041fae7d96feada5fee9cb52400635311ee4611788c7b49b4e97e
+  data.tar.gz: 2324c2bf0ae30d9c31bfb049698b6314d5233a40f81bcde8319c57629591093bd73e1d7e658d42ce5bd4d1d3d9c9123c7718dfd1c08925e456e4f4d6b2d3c8ea

data/lib/cocoapods-aqara-localzedLoader/DownloadNewLanguage.py

@@ -277,8 +277,6 @@ class CrowdinPlatform():
 
         print(f"多语言文件已解压到: {output_dir}APP.xlsx")
 
-# 默认配置（需要设置）
-DEFAULT_ACCESS_TOKEN = "db0506fb755d528c7b9b750e15174d3cfa483859488da978748ad6b9e34d13dc94d8716810a2f978"  # 需要设置
 DEFAULT_LEGACY_PROJECT_ID = "71"
 DEFAULT_LIFE_PROJECT_ID = "85"
 DEFAULT_TARGET_FILE_NAME = "APP.xlsx"
@@ -301,6 +299,21 @@ def resolve_crowdin_project(localizable_path: str) -> tuple[Optional[str], Optio
     return None, None
 
 
+def resolve_crowdin_access_token(cli_token: Optional[str] = None) -> str:
+    access_token = (
+        cli_token
+        or os.getenv("CROWDIN_ACCESS_TOKEN")
+        or os.getenv("CROWDIN_TOKEN")
+    )
+    if not access_token:
+        raise RuntimeError(
+            "未找到 Crowdin token，请在 Podfile 中通过 "
+            "plugin 'cocoapods-aqara-localzedLoader', :crowdin_token => '...' 配置，"
+            "或设置 CROWDIN_ACCESS_TOKEN 环境变量"
+        )
+    return access_token
+
+
 def find_life_csv_file(output_dir: str) -> Optional[str]:
     preferred_path = os.path.join(output_dir, "APP_Life_APP.csv")
     if os.path.exists(preferred_path):
@@ -388,6 +401,7 @@ if __name__ == '__main__':
     crowdin = False
     if len(sys.argv) > 2:
         crowdin = str_to_bool(sys.argv[2])
+    crowdin_access_token = sys.argv[3].strip() if len(sys.argv) > 3 else None
 
     if crowdin:
         config_path, project_id = resolve_crowdin_project(localizable_path)
@@ -395,7 +409,7 @@ if __name__ == '__main__':
             raise FileNotFoundError("未找到 crowdin.yml 或 crowdin_life.yml，无法确定 Crowdin project_id")
 
         print(f"检测到 Crowdin 配置: {config_path}，project_id={project_id}")
-        platform = CrowdinPlatform(DEFAULT_ACCESS_TOKEN, project_id)
+        platform = CrowdinPlatform(resolve_crowdin_access_token(crowdin_access_token), project_id)
         target_path = f"{localizable_path}/APP/"
         platform.download_and_extract_translations(target_path)
     else:

data/lib/cocoapods-aqara-localzedLoader/command/localzedLoader.rb

@@ -31,6 +31,7 @@ module Pod
         super
         # puts "初始化:#{argv}"
         project_directory = argv.option('project-directory')
+        @crowdin_token = argv.option('crowdin-token') || ENV['CROWDIN_ACCESS_TOKEN']
         puts project_directory
         project_directory = Dir.pwd if project_directory.nil?
         puts project_directory
@@ -40,12 +41,13 @@ module Pod
       end
       def self.options
         [
-          ['--project-directory=/project/dir/', 'The path to the root of the project directory']
+          ['--project-directory=/project/dir/', 'The path to the root of the project directory'],
+          ['--crowdin-token=TOKEN', 'Crowdin access token for downloading translations']
         ].concat(super)
       end
       def run
         UI.puts "项目路径 #{@project_directory}"
-        BundleGenerater.generate(@project_directory)
+        BundleGenerater.generate(@project_directory, @crowdin_token)
       end
     end
   end

data/lib/cocoapods-aqara-localzedLoader/crowdin_util.rb

@@ -4,13 +4,15 @@ require "uri"
 require "json"
 class CrowdinUtil
 
-  def initialize(project_id = "71")
+  def initialize(project_id = "71", access_token = nil)
     @project_id = project_id
+    @access_token = access_token || ENV["CROWDIN_ACCESS_TOKEN"] || ENV["CROWDIN_TOKEN"]
+    raise "未找到 Crowdin token，无法发布 OTA Release" if @access_token.to_s.empty?
   end
 
   def crowdin_headers
     {
-      "Authorization" => "Bearer db0506fb755d528c7b9b750e15174d3cfa483859488da978748ad6b9e34d13dc94d8716810a2f978",
+      "Authorization" => "Bearer #{@access_token}",
       "Content-Type"  => "application/json"
     }
   end

data/lib/cocoapods-aqara-localzedLoader/gem_version.rb

@@ -1,3 +1,3 @@
 module Localzedloader
-  VERSION = "0.1.14"
+  VERSION = "0.1.16"
 end

data/lib/cocoapods-aqara-localzedLoader/ios_bundle_generate.rb

@@ -10,6 +10,10 @@ class BundleGenerater
     "crowdin_life.yml" => "85",
     "crowdin.yml" => "71"
   }.freeze
+  PROJECT_APP_DIRS = {
+    "85" => "AqaraLife",
+    "71" => "AqaraHome"
+  }.freeze
 
 
   # INFO_PLIST_ARRAY = [NSAppleMusicUsageDescription","NSLocalNetworkUsageDescription"]
@@ -57,11 +61,16 @@ class BundleGenerater
 
   @@download_Count = 1
 
+  def self.app_dir_name(project_id)
+    PROJECT_APP_DIRS.fetch(project_id, "AqaraHome")
+  end
+
   def self.resolve_crowdin_project(project_path)
     CROWDIN_PROJECTS.each do |config_name, project_id|
+      app_dir = self.app_dir_name(project_id)
       [
         "#{project_path}/#{config_name}",
-        "#{project_path}/AqaraHome/Common/#{config_name}"
+        "#{project_path}/#{app_dir}/Common/#{config_name}"
       ].each do |config_path|
         next unless File.exist?(config_path)
 
@@ -80,7 +89,14 @@ class BundleGenerater
     }
   end
 
-  def self.downloadxls(project_path, crowdin=false)
+  def self.resolve_crowdin_token(crowdin_token)
+    token = crowdin_token || ENV["CROWDIN_ACCESS_TOKEN"] || ENV["CROWDIN_TOKEN"]
+    return token unless token.to_s.empty?
+
+    raise "未找到 Crowdin token，请在 Podfile 中通过 plugin 'cocoapods-aqara-localzedLoader', :crowdin_token => '...' 配置，或设置 CROWDIN_ACCESS_TOKEN 环境变量"
+  end
+
+  def self.downloadxls(project_path, crowdin=false, crowdin_token=nil)
     if @@download_Count > 10
       puts "当前无网络，程序即将退出。"
       exit(1)
@@ -93,27 +109,33 @@ class BundleGenerater
     end
     puts "当前进行第#{@@download_Count}次尝试下载多语言文件"
     crowdin_arg = crowdin ? "true" : "false"
-    system "cd #{File.dirname(__FILE__)};python3 DownloadNewLanguage.py #{project_path} #{crowdin_arg}"
+    env = {}
+    env["CROWDIN_ACCESS_TOKEN"] = crowdin_token if crowdin_token && !crowdin_token.to_s.empty?
+    Dir.chdir(File.dirname(__FILE__)) do
+      system(env, "python3", "DownloadNewLanguage.py", project_path.to_s, crowdin_arg)
+    end
     @@download_Count = @@download_Count + 1
   end
 
-  def self.generate(project_path)
+  def self.generate(project_path, crowdin_token=nil)
     # 下载excel
     puts "开始下载多语言文件...".green
 
     crowdin_info = self.resolve_crowdin_project(project_path)
     crowdin = crowdin_info[:enabled]
+    app_dir = self.app_dir_name(crowdin_info[:project_id])
 
     f_path = "#{project_path}/download.xlsx"
     if crowdin
       puts "检测到 Crowdin 配置: #{crowdin_info[:config_path]}，project_id=#{crowdin_info[:project_id]}"
+      crowdin_token = self.resolve_crowdin_token(crowdin_token)
       f_path = "#{project_path}/APP/APP.xlsx"
     end
 
     puts f_path
 
     until File.exist?(f_path)
-      self.downloadxls(project_path, crowdin)
+      self.downloadxls(project_path, crowdin, crowdin_token)
     end
     # 读取excel到内存
     file_til = File_util.new
@@ -221,7 +243,7 @@ class BundleGenerater
     #拷贝到代码仓库里
     #查找bundle路径
     bundPath = ""
-    info_plist_path = "./AqaraHome/Resource"
+    info_plist_path = "./#{app_dir}/Resource"
     require 'find'
     Find.find("./") do |filePath|
       if  filePath.end_with?("LMFramework.bundle")
@@ -238,7 +260,7 @@ class BundleGenerater
     file_til.getLangList.each do |lang|
       path = "./#{lang}.lproj/Localizable.strings"
       dest = bundPath + "/#{lang}.lproj"
-      dest2 = "./AqaraHome/Resource/#{lang}.lproj"
+      dest2 = "./#{app_dir}/Resource/#{lang}.lproj"
       FileUtils.mkdir_p dest
       FileUtils.cp(path,dest2)
       FileUtils.mv("#{path}",dest,force:true)
@@ -247,7 +269,7 @@ class BundleGenerater
       # puts "path::::::#{info_plist_file}"
       if File.exist? info_plist_file
         copy_info_plist = true
-        dest = "./AqaraHome/Resource/#{lang}.lproj"
+        dest = "./#{app_dir}/Resource/#{lang}.lproj"
         FileUtils.mkdir_p dest
         FileUtils.mv("#{info_plist_file}",dest,force:true)
       end
@@ -266,7 +288,7 @@ class BundleGenerater
         Process.wait(pid)
 
         if $?.success?
-          crowdin_util = CrowdinUtil.new(crowdin_info[:project_id])
+          crowdin_util = CrowdinUtil.new(crowdin_info[:project_id], crowdin_token)
           crowdin_util.release_distribution
         end
       end

data/lib/cocoapods_plugin.rb

@@ -1,8 +1,15 @@
 require 'cocoapods-aqara-localzedLoader/command'
 require_relative 'cocoapods-aqara-localzedLoader/ios_bundle_generate'
 module Pod
-  Pod::HooksManager.register('cocoapods-aqara-localzedLoader', :pre_install) do |context|
+  Pod::HooksManager.register('cocoapods-aqara-localzedLoader', :pre_install) do |_, options|
+    crowdin_token = options && (
+      options[:crowdin_token] ||
+      options[:crowdinToken] ||
+      options[:access_token] ||
+      options[:token]
+    )
     args = ['download', "--project-directory=#{Config.instance.installation_root}"]
+    args << "--crowdin-token=#{crowdin_token}" if crowdin_token && !crowdin_token.to_s.empty?
     Pod::Command.run(args)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-aqara-localzedLoader
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.16
 platform: ruby
 authors:
 - zhaoxifan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-10 00:00:00.000000000 Z
+date: 2026-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler