cocoapods-localzedLoader 0.1.1 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e1adfbe18a0ab61631028fbfb160cbdd9a68c5f363b2d33e52e132a701f845b
-  data.tar.gz: baf34df02655976e699afddeefaf175d4ca483182b4c93403df0ff0e6dac277d
+  metadata.gz: 38a0241050c77fad4ec3a6bba1bbea3982956ec4ce3d9dc66d9a31f5e1cb2788
+  data.tar.gz: a7e89c0bdaef7f80dd9ceb7614de36eecf0576fa6958d03f649e2d06590b3fb1
 SHA512:
-  metadata.gz: 95b18128410916003488e6dbaeb36882e83a7ae8ddc51b6aa073c5fc9dd218f2f1f84eec606b7d63e411e8560a22c74831991279005b6157d4d8f93dd3a8902f
-  data.tar.gz: 35d01e3c95d386a1900e88dcd7a6da73d07b5c7b491d8c0db6d37eea94c3935caa329dac40bef90576e3d427d8d2ca1fbcf89a373d471a148f3ff2b439c2690f
+  metadata.gz: 5b0fd8d9bc1dec67f5c540dee7ecb7e984d3d5f32d7a106d2ebd3efdc295737cab97c16d5bcf7ec45a84b58c9e686c896b1d5135ee633584d555645804bcd319
+  data.tar.gz: 8e840f0bb13fb5eee5bb1e1f5ee6646a9f28346c0a2dc08fa39d0508a8d974abf769ce5bae90fac04f96a759c289e37899775e8df5b5af8ba330758af89d4078

data/lib/cocoapods-localzedLoader/DownloadNewLanguage.py

@@ -0,0 +1,102 @@
+import os
+import shutil
+
+import requests
+# import zipfile
+
+# from __future__ import print_function
+
+from volcengine.iam.IamService import IamService
+
+from volcengine.ApiInfo import ApiInfo
+from volcengine.Credentials import Credentials
+from volcengine.base.Service import Service
+from volcengine.ServiceInfo import ServiceInfo
+
+from volcengine.auth.SignerV4 import SignerV4
+
+
+# 浏览器登录后抓取的 cookie
+myheader = '''
+accept: application/json, text/plain, */*
+accept-encoding: gzip, deflate, br
+accept-language: zh
+content-length: 155
+content-type: application/json
+cookie:experimentation_subject_id=IjZmOTJkNTAwLWRhNGQtNDllOS04NWJmLTViMDA3YWQyNzNmNSI%3D--ea0d856d9ab513dbab485429b3eb34d28baf575c; _ga_WF6G97Z3ZH=GS1.1.1655109583.7.0.1655109635.0; Hm_lvt_2df419cadb3951597d5f6df3a9e563d1=1677809958; __gads=ID=7b3f01c117b67f05-227ecfaf8fe20014:T=1688561915:RT=1695382086:S=ALNI_MZWfx6X7kl8bcHGz9c7kVOi5EJ97g; __gpi=UID=00000c96aea158eb:T=1688561915:RT=1695382086:S=ALNI_MaQoB1d1fZVX_-TNOZ9-FBy0AmJeQ; _ga_3EMB6JL0XV=GS1.1.1695897491.159.0.1695897491.60.0.0; _ga=GA1.1.726824286.1621481586; _ga_1MSMD2CRQ5=GS1.1.1695897492.25.0.1695897492.0.0.0; sensorsdata2015jssdkcross=%7B%22distinct_id%22%3A%222698037175171e6d.824697002942386177%22%2C%22first_id%22%3A%2217954f52ff723e-046b05611aed99-113a6054-1296000-17954f52ff9e4c%22%2C%22props%22%3A%7B%22%24latest_traffic_source_type%22%3A%22%E5%BC%95%E8%8D%90%E6%B5%81%E9%87%8F%22%2C%22%24latest_search_keyword%22%3A%22%E6%9C%AA%E5%8F%96%E5%88%B0%E5%80%BC%22%2C%22%24latest_referrer%22%3A%22https%3A%2F%2Fuc.aqara.cn%2F%22%7D%2C%22%24device_id%22%3A%2217954f52ff723e-046b05611aed99-113a6054-1296000-17954f52ff9e4c%22%7D; Token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiI4MzcyOTA5NzQ3NmUwMmYyLjY0MjA2ODExMTgyMzk1MzkyMSIsImlzcyI6Imh0dHBzOi8vYWlvdC1ycGMuYXFhcmEuY24iLCJhY2NvdW50Ijoid2FuaHVhLnlhbkBhcWFyYS5jb20iLCJpYXRHbXQ4IjoxNjk2NjQ2MDYyLCJqdGkiOiI4ZjJlNDJiNTk1MTE0ODFmOTBiMDI3NWExZmE2OWNkZDlkMjVhZDY5NGUzMDQ4MGZhNDM3ZDM2NGI5YTFjZTIzIn0.FqpQfHNi--7FxAu4ytiGpQBwUdMVGDgdKaqZI4hLAus; Userid=83729097476e02f2.642068111823953921; currentSid=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiI4MzcyOTA5NzQ3NmUwMmYyLjY0MjA2ODExMTgyMzk1MzkyMSIsImlzcyI6Imh0dHBzOi8vYWlvdC1ycGMuYXFhcmEuY24iLCJpYXRHbXQ4IjoxNjk2NjQ2MDYyLCJqdGkiOiJhNDZlZjExOGE3YTk0ZTIwYTBkNmE5YTE5YjRiM2UxYjM0ZmMxNjYzZTUzYjQ1NzI4Zjk5YzhiYzRhZGUzMGE4In0.W_fWYx-B0kvj2uAUz0pw8vOhw5VKJ4SM5oCwpY_YZkk; currentAccount=wanhua.yan@aqara.com; userInfo=%7B%22accountCategory%22%3A%220%22%2C%22company%22%3A%7B%22companyId%22%3A1%2C%22companyName%22%3A%22%E7%BB%BF%E7%B1%B3%E8%81%94%E5%88%9B%22%7D%2C%22user%22%3A%7B%22avatarUrl%22%3A%22%22%2C%22companyId%22%3A1%2C%22email%22%3A%22wanhua.yan%40aqara.com%22%2C%22nickName%22%3A%22%22%2C%22userType%22%3A0%7D%7D; sidebarStatus=0
+lang: zh
+nonce: z7isblgw7hzfrlebmu7fzoukr20vpvs8
+operate-platform: 40
+origin: https://intl-lang.aqara.com
+projectid: 5
+referer: https://intl-lang.aqara.com/
+sec-ch-ua: "Not/A)Brand";v="99", "Google Chrome";v="115", "Chromium";v="115"
+sec-ch-ua-mobile: ?1
+sec-ch-ua-platform: "Android"
+sec-fetch-dest: empty
+sec-fetch-mode: cors
+sec-fetch-site: same-origin
+time: 1690280776221
+timestamp: 1690280776221
+user-agent: Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/115.0.0.0 Mobile Safari/537.36
+'''
+
+
+
+def MakeHeader(headerText):
+    s = headerText.strip().split('\n')
+    s = {x.split(':', 1)[0].strip() :x.split(':', 1)[1].strip() for x in s}
+    return s
+
+def DownLatestLocalizableSource():
+    iam_service = IamService()
+    ak = 'AKLTZTFjNzFjYTczMzJjNGQyMjg0NTRkZjQ2ZTA4MTE1Mjc'
+    sk = 'TkdRMU9HSTJZemt6Tmpkak5ERXhaVGt5WXpVNU5qSmxPVFkzWWpBM1pqRQ=='
+    iam_service.set_ak(ak)
+    iam_service.set_sk(sk)
+
+    api_info = ApiInfo("GET", "/", {"serviceName": "i18n_openapi", "Action": "ProjectNamespaceTextDownload",
+                                    "Version": "2021-05-21"}, {}, {})
+    service_info = ServiceInfo("iam.volcengineapi.com", {'Accept': 'application/json'},
+                               Credentials(ak,sk, 'i18n_openapi', 'cn-north-1'),20,20)
+    iam_service.service_info = service_info
+
+    params = {'async': 0, 'projectId': 5788, 'namespaceId': 42835, 'format': 'xlsx'}
+
+    r = iam_service.prepare_request(api_info, params, 0)
+    SignerV4.sign(r, service_info.credentials)
+    url = r.build(0)
+    # print(r.headers)
+    # res = iam_service.projectNamespaceTextDownload(params)
+
+    resp = iam_service.session.get(url, headers=r.headers,
+                            timeout=(service_info.connection_timeout,service_info.socket_timeout))
+    if resp.status_code == 200:
+        print('成功l----')
+        with open("download" + ".xlsx", "wb") as code:
+            # 将 response 保存成本地文件
+            code.write(resp.content)
+            code.close()
+    else:
+        raise Exception(resp.text)
+
+
+
+# def Unzip():
+#     f = zipfile.ZipFile("./localizable.zip", 'r')  # 压缩文件位置
+#     for file in f.namelist():
+#         f.extract(file, "../")  # 解压位置
+#     f.close()
+#     os.remove('./localizable.zip')
+
+def UpdateSource_language():
+    DownLatestLocalizableSource()
+    return './download.xlsx'
+
+    # Unzip()
+    # os.rename('./download.xlsx', '../hit_all_str.xlsx')
+#     shutil.copy('./download.xlsx', '../source_language/hit_all_str.xlsx')
+#     os.remove('./download.xlsx')
+
+if __name__ == '__main__':
+    UpdateSource_language()

data/lib/cocoapods-localzedLoader/File_util.rb

@@ -20,21 +20,21 @@ class File_util
       row1 = worksheet[0]
       @key_hash = getkeyHash(row1)
       lang_hash = {}
-      worksheet.each_with_index do |row|
+      worksheet.each_with_index do |row,rowIndex|
+        next unless rowIndex>0
         ele = StringElement.new
         self_key = ''
         # 设置StringElement的值
         row.cells.each_with_index do |cell, i|
-
-          next unless cell
+          next unless cell.value
           case i
           when 0
-
-          when 1
             self_key = cell.value
           else
             key = @key_hash[i]
-            ele.langHash[key] = (cell.value || '')
+            if key
+              ele.langHash[key] = (cell.value || '')
+            end
           end
         end
 
@@ -48,38 +48,27 @@ class File_util
     # Command+Option+L 对齐快捷键
     def getkeyHash(row1,ios:true)
       keys_hash = {}
+      key = ''
       row1.cells.each_with_index do |cell, i|
-        next unless cell
-        if i > 1
-          result = cell.value.scan(/.*?\[(.*)\]/)
-          key = result[0][0]
-          case key
-          when /zh_HK/
-            key="zh-HK"
-          when /zh_TW/
-            key ="zh-Hant-TW"
-          when /zh/
-            key ="zh-Hans"
-          when /fr.*/
-            key ="fr"
-          when /it.*/
-            key="it"
-          when /ger.*/
-            key ="de"
-          else
-            key
-          end
-          keys_hash[i] = key
-        elsif i == 1
-          keys_hash[i] = cell.value
+        next unless cell.value && i > 3
+        if cell.value === "zh-CN"
+          key = 'zh-Hans'
+        elsif cell.value == "zh-TW"
+          key = 'zh-Hant-TW'
+        elsif cell.value == "zh-HK"
+          key = 'zh-HK'
+        else
+          key = cell.value.split("-")[0]
         end
+        # result = cell.value.scan(/.*?\[(.*)\]/)
+        keys_hash[i] = key
       end
       keys_hash
     end
 
     def getLangList
       list = @key_hash.values
-      list.delete_if{|item| item.downcase === "selfkey"}
+      list.delete_if{|item| item.downcase === "keys"||item.downcase === "source" || item.downcase === "length limit" || item.downcase === "context"}
       list
     end
 end
@@ -90,5 +79,5 @@ end
 #   puts value
 # end
 
-# p "sssssssss中文[zh]".scan(/.*?\[(.*)\]/)
+# p "key-sname".split("-")[0]
 

data/lib/cocoapods-localzedLoader/LanguageDownloader.rb

@@ -6,27 +6,16 @@ require 'colored2'
 
 class LanguageDownloader
 
-  HeaderString = %Q{accept: application/json, text/plain, */*
-accept-encoding: gzip, deflate, br
-accept-language: zh
-content-length: 182
-content-type: application/json
-cookie: sensorsdata2015jssdkcross=%7B%22distinct_id%22%3A%221859aeaeae8ac6-062e0ea9cca7ea-17525635-2073600-1859aeaeae9f16%22%2C%22first_id%22%3A%22%22%2C%22props%22%3A%7B%7D%2C%22%24device_id%22%3A%221859aeaeae8ac6-062e0ea9cca7ea-17525635-2073600-1859aeaeae9f16%22%7D; Token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiI0OTAyODA1ZjNlYTQxODgyLjY5Mjg0MTEzMjM5Mjc5MjA2NSIsImlzcyI6Imh0dHBzOi8vYWlvdC1ycGMuYXFhcmEuY24iLCJhY2NvdW50IjoiamluZ3lhLmx1LWExMDc5QGFxYXJhLmNvbSIsImlhdEdtdDgiOjE2NzQ5ODM4MTMsImp0aSI6IjYxMTE3MDY3ZTRmNDQ2Mzg5YzI3Y2IxNDNjYTk5ZTRlMDdiMGZjNThmOWZlNGJjNjg5MjI2NjMxNWYwMzIxZDUifQ.AA90VKxT6zjlxnkFpaOMO9ujTXrssEXxuRp0WRhliGM; Userid=4902805f3ea41882.692841132392792065; currentSid=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiI0OTAyODA1ZjNlYTQxODgyLjY5Mjg0MTEzMjM5Mjc5MjA2NSIsImlzcyI6Imh0dHBzOi8vYWlvdC1ycGMuYXFhcmEuY24iLCJpYXRHbXQ4IjoxNjc0OTgzODEzLCJqdGkiOiIwZTY3NThjMjM3NGY0YmJiOWE3NjBmYzI0ZmZkY2NmODYzNGI4ODRjZGM1NTRjM2NiNTU1YzNkZjdmN2NjNWNhIn0.r7cBEpWVHWSpHH6zDX32FXNjMQ6IZN0DFBc3Oa8Tb5w; currentAccount=jingya.lu-a1079@aqara.com; userInfo=%7B%22accountCategory%22%3A%220%22%2C%22company%22%3A%7B%22companyId%22%3A1%2C%22companyName%22%3A%22%E7%BB%BF%E7%B1%B3%E8%81%94%E5%88%9B%22%7D%2C%22user%22%3A%7B%22avatarUrl%22%3A%22%22%2C%22companyId%22%3A1%2C%22email%22%3A%22jingya.lu-a1079%40aqara.com%22%2C%22nickName%22%3A%22%22%2C%22userName%22%3A%22%E9%B2%81%E9%9D%99%E4%BA%9A%22%2C%22userType%22%3A0%7D%7D; sidebarStatus=0lang: zh
-nonce: k9a7yh3vjjyd6vb47ktmcyh50bv3m3c2
-operate-platform: 40
-origin: https://intl-lang.aqara.com
-projectid: 5
-referer: https://intl-lang.aqara.com/
-sec-ch-ua: "Google Chrome";v="107", "Chromium";v="107", "Not=A?Brand";v="24"
-sec-ch-ua-mobile: ?0
-sec-ch-ua-platform: "macOS"
-sec-fetch-dest: empty
-sec-fetch-mode: cors
-sec-fetch-site: same-origin
-time: 1668061116811
-timestamp: 1668061116811
-user-agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Safari/537.36
+  HeaderString = %Q{User-Agent: volc-sdk-python/v1.0.109
+Accept-Encoding: gzip, deflate
+Accept: application/json
+Host: iam.volcengineapi.com
+X-Date: 20231017T062815Z
+X-Content-Sha256: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+Authorization: HMAC-SHA256 Credential=AKLTZTFjNzFjYTczMzJjNGQyMjg0NTRkZjQ2ZTA4MTE1Mjc/20231017/cn-north-1/i18n_openapi/request, SignedHeaders=host;x-content-sha256;x-date, Signature=fb24f4211cf74f4e985cdd72f09156c288bd8e078d9867813327084204587b0a
+Connection: keep-alive
 }
+  
   def self.makeHeader
     headerArray = HeaderString.split("\n")
     header = {}
@@ -38,10 +27,9 @@ user-agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (
   def self.download
 
     # puts makeHeader
-
     #下载文件
 
-    params = {"projectIdList":[5],"langIds":[1,2,3,9,10,11,12,13,14,15,16],"fileTypeList":["excel"],"auditState":1,"valueState":0,"userId":"","value":"","tagIds":nil,"bizUseTagIds":nil,"pkeys":[]}
+    params = {"projectIdList":[5],"langIds":[1,2,3,9,10,11,12,13,14,15,16,17,18],"fileTypeList":["excel"],"auditState":1,"valueState":0,"userId":"","value":"","tagIds":nil,"bizUseTagIds":nil,"pkeys":[]}
     response = HTTParty.post('https://intl-lang.aqara.com/v1.0/lumi/language/file/export', body: JSON.generate(params), headers:LanguageDownloader.makeHeader)
     # puts response.body
     unless response.body["code"] == nil
@@ -80,4 +68,4 @@ user-agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (
 
 end
 
-
+#LanguageDownloader.download

data/lib/cocoapods-localzedLoader/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsLocalzedloader
-  VERSION = "0.1.1"
+  VERSION = "0.1.4"
 end

data/lib/cocoapods-localzedLoader/ios_bundle_generate.rb

@@ -3,18 +3,17 @@ require_relative './LanguageDownloader'
 require_relative  './File_util'
 require 'fileutils'
 require 'colored2'
-
 class BundleGenerater
 
   # INFO_PLIST_ARRAY = [NSAppleMusicUsageDescription","NSLocalNetworkUsageDescription"]
   INFO_PLIST_MAP = {:common_app_name=>["CFBundleDisplayName"],other_perm_camera_permission_description:["NSCameraUsageDescription"],other_perm_location_permission_description:["NSLocationAlwaysAndWhenInUseUsageDescription","NSLocationWhenInUseUsageDescription","NSLocationAlwaysUsageDescription"],other_perm_bluetooth_permission_description:["NSBluetoothPeripheralUsageDescription","NSBluetoothAlwaysUsageDescription"],access_content_permssion_storage:["NSPhotoLibraryUsageDescription"],other_perm_mic_permission_description:["NSMicrophoneUsageDescription"],other_set_permissions_homedata_desc:["NSHomeKitUsageDescription"],other_set_permissions_asr_text:["NSSpeechRecognitionUsageDescription"],device_add_device:["Add_Device_Title"],automation_add:["Add_Automation_Title"],device_create_scene:["Add_Scene_Title"]}
   def self.generate
     # 下载excel
-    f_path = LanguageDownloader.download
-    # unless f_path != nil
-    #   return
-    # end
-    # f_path = "./hit_all.xls"
+    puts __FILE__
+    system "cd #{File.dirname(__FILE__)};python3 DownloadNewLanguage.py"
+    f_path = "#{File.dirname(__FILE__)}/download.xlsx"
+    print(f_path)
+
     # 读取excel到内存
     file_til = File_util.new
     hash = file_til.read_excel f_path
@@ -52,7 +51,9 @@ class BundleGenerater
         end
 
         #如果是infoplist里的key，就写入指定的文件
-        if key === "NSAppleMusicUsageDescription" || key === "NSLocalNetworkUsageDescription"
+        if key === nil
+          puts "key值为空,#{stringElement.ios_list}"
+        elsif key === "NSAppleMusicUsageDescription" || key === "NSLocalNetworkUsageDescription"
           file = "./#{lang}.lproj/InfoPlist.strings"
           File.open(file, "a") do |io|
             io.write str
@@ -81,7 +82,9 @@ class BundleGenerater
       if File.exist?(file)
         system("plutil #{file}")
       end
-      system("plutil #{localized_file}")
+      if File.exist?(localized_file)
+        system("plutil #{localized_file}")
+      end
     end
 
     #拷贝到代码仓库里
@@ -121,9 +124,8 @@ class BundleGenerater
     if copy_info_plist
       puts "InfoPlist多语言拷贝到目录:#{info_plist_path}"
     end
-  end
 
-  private
+  end
   #对多语言的value进行处理
   def self.handleValue(value='',stringElement = nil)
     #替换{=}
@@ -144,6 +146,8 @@ class BundleGenerater
 
 end
 
+
+# BundleGenerater.generate
 # map = {:common_app_name=>["CFBundleDisplayName"]}
 # if map.has_key?("common_app_name".to_sym)
 #   puts map[:common_app_name]
@@ -158,4 +162,4 @@ end
 # end
 #
 # p str
-# puts "111".green
+# puts "111".green

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-localzedLoader
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.4
 platform: ruby
 authors:
 - jeremylu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-18 00:00:00.000000000 Z
+date: 2023-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -45,6 +45,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/cocoapods-localzedLoader/DownloadNewLanguage.py
 - lib/cocoapods-localzedLoader/File_util.rb
 - lib/cocoapods-localzedLoader/LanguageDownloader.rb
 - lib/cocoapods-localzedLoader/StringElement.rb