cocoapods-aqara-localzedLoader 0.1.16 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c557d47179504b09a3ce83e5249bc53770e57e8381afc9083fa98d3536787b44
-  data.tar.gz: e27468da9cb5661d6b3c386b80086795331739e98cff87f4969064c25d0692a9
+  metadata.gz: 117721b779a2b5b9b4248aec75a4686764850213a52bfbff7ee030da4c9db6c2
+  data.tar.gz: 62ab2138d5a2b2feeeae988fb3c9708246f8127a4a5ed6abb315a56fd177481f
 SHA512:
-  metadata.gz: bf0d7310384c515dc492b01409b9fae7fe2f52f90bd9410713edacce678130e5428cc1a36ba041fae7d96feada5fee9cb52400635311ee4611788c7b49b4e97e
-  data.tar.gz: 2324c2bf0ae30d9c31bfb049698b6314d5233a40f81bcde8319c57629591093bd73e1d7e658d42ce5bd4d1d3d9c9123c7718dfd1c08925e456e4f4d6b2d3c8ea
+  metadata.gz: 4e4a48cb30a6165fd27c3a093527a3833e01563bc531cd2e62d4c05a864fa0670d054637ec4fcccd0e5710b6d42cdd76f088d76c7e5f3f52fd6d74e5d1fd3c00
+  data.tar.gz: 2f2ace5ab90667ec0929e8c5e66126839696d40bd69f4b8dc76f46271edb47586edb6039bdc9c5bb17ac6a55af19d276d6106589f592a5835526e8b894d19e65

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,30 +266,32 @@ 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_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 = (
-    ("crowdin_life.yml", DEFAULT_LIFE_PROJECT_ID),
-    ("crowdin.yml", DEFAULT_LEGACY_PROJECT_ID),
+    ("crowdin_life.yml", DEFAULT_LIFE_PROJECT_ID, "AqaraLife"),
+    ("crowdin_space.yml", DEFAULT_LIFE_PROJECT_ID, "AqaraSpace"),
+    ("crowdin.yml", DEFAULT_LEGACY_PROJECT_ID, "AqaraHome"),
 )
 
 
 def resolve_crowdin_project(localizable_path: str) -> tuple[Optional[str], Optional[str]]:
-    for config_name, project_id in CROWDIN_PROJECTS:
+    for config_name, project_id, app_dir in CROWDIN_PROJECTS:
         candidate_paths = (
             os.path.join(localizable_path, config_name),
-            os.path.join(localizable_path, "AqaraHome", "Common", config_name),
+            os.path.join(localizable_path, app_dir, "Common", config_name),
         )
         for config_path in candidate_paths:
             if os.path.exists(config_path):
@@ -314,83 +314,6 @@ def resolve_crowdin_access_token(cli_token: Optional[str] = None) -> str:
     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):
-        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 str_to_bool(v: str) -> bool:
@@ -406,7 +329,7 @@ if __name__ == '__main__':
     if crowdin:
         config_path, project_id = resolve_crowdin_project(localizable_path)
         if not config_path or not project_id:
-            raise FileNotFoundError("未找到 crowdin.yml 或 crowdin_life.yml，无法确定 Crowdin project_id")
+            raise FileNotFoundError("未找到 crowdin.yml、crowdin_life.yml 或 crowdin_space.yml，无法确定 Crowdin project_id")
 
         print(f"检测到 Crowdin 配置: {config_path}，project_id={project_id}")
         platform = CrowdinPlatform(resolve_crowdin_access_token(crowdin_access_token), project_id)

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

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

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

@@ -7,12 +7,9 @@ require 'open3'
 # require 'colored2'
 class BundleGenerater
   CROWDIN_PROJECTS = {
-    "crowdin_life.yml" => "85",
-    "crowdin.yml" => "71"
-  }.freeze
-  PROJECT_APP_DIRS = {
-    "85" => "AqaraLife",
-    "71" => "AqaraHome"
+    "crowdin_life.yml" => { project_id: "85", app_dir: "AqaraLife" },
+    "crowdin_space.yml" => { project_id: "85", app_dir: "AqaraSpace" },
+    "crowdin.yml" => { project_id: "71", app_dir: "AqaraHome" }
   }.freeze
 
 
@@ -61,13 +58,9 @@ 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)
+    CROWDIN_PROJECTS.each do |config_name, project_info|
+      app_dir = project_info[:app_dir]
       [
         "#{project_path}/#{config_name}",
         "#{project_path}/#{app_dir}/Common/#{config_name}"
@@ -77,7 +70,8 @@ class BundleGenerater
         return {
           enabled: true,
           config_path: config_path,
-          project_id: project_id
+          project_id: project_info[:project_id],
+          app_dir: app_dir
         }
       end
     end
@@ -85,7 +79,8 @@ class BundleGenerater
     {
       enabled: false,
       config_path: nil,
-      project_id: nil
+      project_id: nil,
+      app_dir: "AqaraHome"
     }
   end
 
@@ -123,11 +118,11 @@ class BundleGenerater
 
     crowdin_info = self.resolve_crowdin_project(project_path)
     crowdin = crowdin_info[:enabled]
-    app_dir = self.app_dir_name(crowdin_info[:project_id])
+    app_dir = crowdin_info[:app_dir]
 
     f_path = "#{project_path}/download.xlsx"
     if crowdin
-      puts "检测到 Crowdin 配置: #{crowdin_info[:config_path]}，project_id=#{crowdin_info[:project_id]}"
+      puts "检测到 Crowdin 配置: #{crowdin_info[:config_path]}，project_id=#{crowdin_info[:project_id]}，app_dir=#{app_dir}"
       crowdin_token = self.resolve_crowdin_token(crowdin_token)
       f_path = "#{project_path}/APP/APP.xlsx"
     end

metadata

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