Aqara_localizable 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81a6dcb2ae02b0dd0a6770219c2b504066dbaf18230d3de3c1774ecf3d1bd09a
-  data.tar.gz: c34677b5b73c122f71bb588ea32bff28f3750163ced5b095b640f79b29ae79c8
+  metadata.gz: bbf09c7da40f156a14ad3a0dbfdc5305ebac729efea9f0bdc8f2b6001661263e
+  data.tar.gz: b03412d3bd6aeb77abcfd6e9aec48fbbca7995198c2feb7e1841747a752b3fd0
 SHA512:
-  metadata.gz: 8fbb8cc1a89bf10fea55eff789b141bc776a35e4a4807c4be7df1d5fb0561469481dd31a903126a209efdf2a5eb8b63dbc9647ea21f918d93e582c926da5309b
-  data.tar.gz: fec24ebc5ad4806b65fdcfaf1bec1cc98a5034e5abc74362bd5066bf99bf813a39581dde9ea7562e0df2faf63c3b80d4bb8969b727001b1bbc6a989f80848b66
+  metadata.gz: 34f0034ad3d38935d4b98914e5285c518d1216c22e78b7a6f8d1675de844c820f8b2cae98278ece624115ba65f368edcfc5202b5c1aba1523f9d927048ad9a79
+  data.tar.gz: 57371e5c944b00fdb18e7579eade2d2cececf20a9281f53d5cf9b20a4f906f7f30b08dc63bb9a6003344a04ded75a124cdfe14dff681b96c57dc0ac026e9317e

data/lib/Aqara_localizable/command/command_gen.rb

@@ -4,7 +4,6 @@ module AqaraLocalizable
   class Command
     class Gen < Command
       self.summary = '开始下载多语言平台的代码并替换项目多语言文件'
-
       def initialize(argv)
         super
         project_directory = argv.option('project-directory')
@@ -28,7 +27,8 @@ module AqaraLocalizable
       def run
         puts '如果多语言脚本插件有问题可以找zxf看看'.green
         target_path = Pathname.new(File.dirname(__FILE__)).realpath.parent.parent
-
+        puts target_path
+        # system "pip3 install requests;pip3 install openpyxl"
         system "cd #{target_path}/script/ios_py_code;python3 ios_sp_str_generator.py #{@project_directory}"
         # system 'cd /lib/script/ios_py_code;python3 ios_sp_str_generator.py'
       end

data/lib/Aqara_localizable/gem_version.rb

@@ -1,3 +1,3 @@
 module AqaraLocalizable
-  VERSION = '0.0.3'.freeze unless defined? AqaraLocalizable::VERSION
+  VERSION = '0.0.5'.freeze unless defined? AqaraLocalizable::VERSION
 end

data/lib/script/ios_py_code/DownloadNewLanguage.py

@@ -34,26 +34,24 @@ def MakeHeader(headerText):
     s = {x.split(':', 1)[0].strip() :x.split(':', 1)[1].strip() for x in s}
     return s
 
-def DownLatestLocalizableSource():
+def DownLatestLocalizableSource(targetPath):
     session = requests.Session()
     headers = MakeHeader(myheader)
     params = '{"projectIdList":[5],"langIds":[1,2,3,9,10,11,12,13,14,15],"fileTypeList":["excel"],"auditState":1,"valueState":0,"userId":"","value":"","tagIds":null,"bizUseTagIds":null,"pkeys":[]}'
     response = session.post("https://intl-lang.aqara.com/v1.0/lumi/language/file/export", headers = headers, data=params, timeout=3)
-    with open("localizable" + ".zip","wb") as code:
+    with open(f'{targetPath}/localizable' + ".zip","wb") as code:
         # 将 response 保存成本地文件
         code.write(response.content)
         code.close()
 
-def Unzip():
-    f = zipfile.ZipFile("./localizable.zip", 'r')  # 压缩文件位置
+def Unzip(targetPath):
+    f = zipfile.ZipFile(f'{targetPath}/localizable.zip', 'r')  # 压缩文件位置
     for file in f.namelist():
-        f.extract(file, "../")  # 解压位置
+        f.extract(file, targetPath)  # 解压位置
     f.close()
-    os.remove('./localizable.zip')
+    os.remove(f'{targetPath}/localizable.zip')
 
-def UpdateSource_language():
-    DownLatestLocalizableSource()
-    Unzip()
-    os.rename('../excel.xls', '../hit_all_str.xlsx')
-    shutil.copy('../hit_all_str.xlsx', '../source_language/hit_all_str.xlsx')
-    os.remove('../hit_all_str.xlsx')
+def UpdateSource_language(targetPath):
+    DownLatestLocalizableSource(targetPath)
+    Unzip(targetPath)
+    os.rename(f'{targetPath}/excel.xls', f'{targetPath}/hit_all_str.xlsx')

data/lib/script/ios_py_code/ios_sp_str_generator.py

@@ -86,17 +86,17 @@ def getfilter():
 if __name__ == '__main__':
 
     localizable_path = sys.argv[1]
-
-    DownloadNewLanguage.UpdateSource_language()
-    filepath = '../source_language/hit_all_str.xlsx'
+    target_path = f'{localizable_path}/AqaraHome'
+    DownloadNewLanguage.UpdateSource_language(target_path)
+    filepath = f'{target_path}/hit_all_str.xlsx'
 
     platformUniteStrDict = file_util.readXlsxFileToDict(filepath)
-    print(len(platformUniteStrDict))
+    print(f'\033[4;36m多语言Key总数:{len(platformUniteStrDict)}\033[0m')
     isIndexLan = False
     if isIndexLan:
         addIndex(platformUniteStrDict)
 
-    dirname = '../output_file/ios'
+    dirname = f'{target_path}/output_file/ios'
     iosStringListPath = string_repeat_filter.generateIOSStringPathList(dirname)
 
 
@@ -138,10 +138,16 @@ if __name__ == '__main__':
         ifs.close()
 
     codePath = f'{localizable_path}/AqaraHome/Common/Frameworks/LMFramework.bundle'
-    print(f'校对下替换的位置是否正确====={codePath}')
+    print(f'\033[1;35m校对下替换的位置是否正确:{codePath}\033[0m')
     if os.path.exists(codePath):
         copyLocalizedToDestPath(iosStringListPath,codePath)
 
+    os.remove(f'{target_path}/hit_all_str.xlsx')
+    if os.path.exists(os.path.dirname(f'{target_path}/output_file')):
+        shutil.rmtree(f'{target_path}/output_file')
+
+
+
 
 
 

data/lib/script/util_code/file_util.py

@@ -164,7 +164,6 @@ def readXlsxFileToDict(filepath):
         for cell in ws.rows:
 
             key = cell[1].value
-            print(key)
             if key == None or key == 'key':
               continue
             chinese_simp = cell[Language.CHI_SIMPLE.value].value

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Aqara_localizable
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - zhaoxifan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-22 00:00:00.000000000 Z
+date: 2022-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler