cocoapods-aqara-localzedLoader 0.1.15 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee5cec583ea6486b9bc763ec3912c302c0b225343718451ca8f60e283bb9d611
-  data.tar.gz: 759da241c72963c6fb91df5682e896b0c359b33ef66591ee3c23ca6709ef91af
+  metadata.gz: 0014ff7ca1b9fd3a2e93e4adede8455537da274e28704c3523fd357eebb86aab
+  data.tar.gz: 5066c47affcedfa80643d8fee28f85655656675063561d2de542299c753829a1
 SHA512:
-  metadata.gz: 8c08a4b2fdf2382037e86cc0ed9d684b9e3e83cab109b4b8c2bc210bef498d8023296f47006d1103fc9708e548ebbb9c2bd144eb80b54ff0ea7540a6edbebfe0
-  data.tar.gz: 9bbdfda02feeb90f7f88dc9fb37205bfb4b1f2008be1ed4d86f1c36d2849572ff98563a00a07ef784939d3c870f4f1665b524d0a26c2b60785a100b3670ab33f
+  metadata.gz: 98720fd614a55a077693d8d72fb16434d4cf494a7c8686947697d006e298c76cc7f92b40ce5dab0c4ea3c225a278a2de3af2b32519af9e2c4cf55d46a4326ab0
+  data.tar.gz: d62b44c11a5fa882981f5bebfb3c0c0137994b2c995916c914900df6b980c0afba617841bac64d8752a92eb6b02cc29da23a5b3532f6fb598f7d4e0f1d52f8f4

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

@@ -3,9 +3,7 @@ import os, sys, stat
 import time
 import requests
 import zipfile
-import csv
 from typing import Optional
-from openpyxl import Workbook
 
 
 #########  火山多语言  #############
@@ -268,19 +266,18 @@ class CrowdinPlatform():
         os.remove(zip_path)
 
         if self.project_id == DEFAULT_LIFE_PROJECT_ID:
-            csv_path = find_life_csv_file(output_dir)
-            if not csv_path:
-                raise FileNotFoundError(f"未找到 Life 项目的 CSV 文件: {output_dir}")
-
+            life_xlsx_path = os.path.join(output_dir, DEFAULT_LIFE_SOURCE_FILE_NAME)
             xlsx_path = os.path.join(output_dir, DEFAULT_TARGET_FILE_NAME)
-            convert_csv_to_xlsx(csv_path, xlsx_path)
+            if not os.path.exists(life_xlsx_path):
+                raise FileNotFoundError(f"未找到 Life 项目的 Excel 文件: {life_xlsx_path}")
+            os.replace(life_xlsx_path, xlsx_path)
+            print(f"已将 Life 多语言文件重命名为: {xlsx_path}")
 
         print(f"多语言文件已解压到: {output_dir}APP.xlsx")
 
-# 默认配置（需要设置）
-DEFAULT_ACCESS_TOKEN = "db0506fb755d528c7b9b750e15174d3cfa483859488da978748ad6b9e34d13dc94d8716810a2f978"  # 需要设置
 DEFAULT_LEGACY_PROJECT_ID = "71"
 DEFAULT_LIFE_PROJECT_ID = "85"
+DEFAULT_LIFE_SOURCE_FILE_NAME = "APP_Life_APP.xlsx"
 DEFAULT_TARGET_FILE_NAME = "APP.xlsx"
 
 CROWDIN_PROJECTS = (
@@ -301,81 +298,19 @@ def resolve_crowdin_project(localizable_path: str) -> tuple[Optional[str], Optio
     return None, None
 
 
-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):
-        return preferred_path
-
-    fallback_csv_paths = []
-    for root, _, file_names in os.walk(output_dir):
-        for file_name in sorted(file_names):
-            file_path = os.path.join(root, file_name)
-            if file_name == "APP_Life_APP.csv":
-                return file_path
-            if file_name.lower().endswith(".csv"):
-                fallback_csv_paths.append(file_path)
-
-    if fallback_csv_paths:
-        return fallback_csv_paths[0]
-    return None
-
-
-def convert_csv_to_xlsx(csv_path: str, xlsx_path: str) -> None:
-    with open(csv_path, "r", encoding="utf-8-sig", newline="") as csv_file:
-        sample = csv_file.read(4096)
-        csv_file.seek(0)
-
-        try:
-            dialect = csv.Sniffer().sniff(sample)
-        except csv.Error:
-            dialect = csv.excel
-
-        reader = csv.reader(csv_file, dialect)
-        workbook = Workbook()
-        worksheet = workbook.active
-
-        rows = list(reader)
-        if not rows:
-            workbook.save(xlsx_path)
-            print(f"已将空 CSV 转换为 Excel: {xlsx_path}")
-            return
-
-        # 统一成旧项目 APP.xlsx 的列结构：
-        # keys | source | tag | length limit | context | en-US | ...
-        normalized_rows = []
-        for row_index, row in enumerate(rows):
-            normalized_row = []
-            keys_value = row[0] if len(row) > 0 else ""
-            source_value = row[1] if len(row) > 1 else ""
-            context_value = row[2] if len(row) > 2 else ""
-            remaining_values = list(row[3:]) if len(row) > 3 else []
-
-            if row_index == 0:
-                normalized_row = [
-                    "keys",
-                    "source",
-                    "tag",
-                    "length limit",
-                    "context",
-                    "en-US",
-                ]
-                normalized_row.extend(remaining_values[1:])
-            else:
-                normalized_row = [
-                    keys_value,
-                    source_value,
-                    "",
-                    "",
-                    context_value,
-                ]
-                normalized_row.extend(remaining_values)
-            normalized_rows.append(normalized_row)
-
-        for row in normalized_rows:
-            worksheet.append(row)
-
-        workbook.save(xlsx_path)
-        print(f"已将 CSV 转换为 Excel: {xlsx_path}")
+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
 
 
 ############################
@@ -388,6 +323,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 +331,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.15"
+  VERSION = "0.1.17"
 end

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

@@ -89,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)
@@ -102,11 +109,15 @@ 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
 
@@ -117,13 +128,14 @@ class BundleGenerater
     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
@@ -276,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.15
+  version: 0.1.17
 platform: ruby
 authors:
 - zhaoxifan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-10 00:00:00.000000000 Z
+date: 2026-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler