applocale 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: f95ade74b4e2369217664efb0025c0f52644ebc06827febed2a6db64cf02c5a1
-  data.tar.gz: 824da18da0ec106873135501d91bdc3ac56c7c7689fa766ba302cb20187a17d5
+SHA1:
+  metadata.gz: 2a97e66f54bd439a61cf20ed5f4437b25f2ff105
+  data.tar.gz: d407f1d876105f666af854f3e8f276edc7c3ff47
 SHA512:
-  metadata.gz: 97f11063db3d637f52c79aa60e4af2900e604e2adc2c2eb3d21b4526f97d27f04eb68cd97c8c9db66bae10f7f0689f7f22883c73d0ca6eed38db21839329b302
-  data.tar.gz: 54810e8306223226e46bb89028fadbf97bec7b72c4f410f4d604bb75a90b74a9fa8f93fdff64b15131f9e5092e25d5f9ff619a9d61f38cc6b5b15bbe23865966
+  metadata.gz: dcfb679486adde4bd7a8b494f43cc562b7dcb5c516e52d821916f5afbfc3728eec7809e11a582b7d35986fb713c797a6f57f3528d12a4d88acf5d6201ef1da98
+  data.tar.gz: 78bc79fe9ed3f26817c4940a70b8c88d60f9413b5dba5c518c45eb62ff266f2e6e1c4ba66d8b32fde91d03aeb0d2152579d2a2844232f4f9a3374ed4437255d1

data/lib/applocale/AppLocaleFile

@@ -1,5 +1,6 @@
 link: "https://docs.google.com/spreadsheets/d/1Wy2gN_DSw-TCU2gPCzqvYxLfFG5fyK5rodXs5MLUy8w"
 platform: "#{platform}"
+resource_folder: "#{resource_folder}"
 xlsxpath: "#{xlsxpath}"
 export_format: "#{export_format}"
 ＃google_credentials_path: "#{google_credentials_path}"
@@ -25,33 +26,4 @@ sheetname:
     zh_TW: "C"
     zh_CN: "D"
 isSkipEmptyKey: true
-
-
-# def convent_to_locale(lang, key, value)
-#     return value
-# end
-
-# def before_convent_to_locale(lang, key, value)
-#     return value
-# end
-
-# def after_convent_to_locale(lang, key, value)
-#     return value
-# end
-
-# def parse_from_locale(lang, key, value)
-#     return value
-# end
-
-# def before_parse_from_locale(lang, key, value)
-#     return value
-# end
-
-# def after_parse_from_locale(lang, key, value)
-#     return value
-# end
-
-# def is_skip_by_key(sheetname, key)
-#     return true
-# end
-
+# convertFile: "convert.rb"

data/lib/applocale/Command/init.rb

@@ -14,28 +14,32 @@ module Applocale
     class Init < Thor
       desc "init [platform]", "Create Config File, platform: ios | android | json"
       option :path, :desc => "Project dir path"
+      option :config_file, :desc => "the filename of config, default AppLocaleFile"
       def init(platform = nil)
-        Applocale.create_config_file(platform, options[:path])
+        Applocale.create_config_file(platform, options[:path], options[:config_file])
       end
 
       desc "update", "Download xlsx and convert to localization string file"
       option :path, :desc => "Project dir path"
+      option :config_file, :desc => "the filename of config, default AppLocaleFile"
       def update()
-        Applocale.start_update(options[:path])
+        Applocale.start_update(options[:path],options[:config_file])
       end
 
       desc "update_local", "Convert local xlsx file to localization string file"
       option :path, :desc => "Project dir path"
+      option :config_file, :desc => "the filename of config, default AppLocaleFile"
       def update_local()
-        Applocale.start_local_update(nil,options[:path])
+        Applocale.start_local_update(nil,options[:path], options[:config_file])
       end
 
       desc "reverse", "Convert localization string file to xlsx"
       option :skip, :desc => "Skip Error"
       option :path, :desc => "Project dir path"
+      option :config_file, :desc => "the filename of config, default AppLocaleFile"
       def reverse()
         is_skip = !options[:skip].nil?
-        Applocale::start_reverse(is_skip, options[:path])
+        Applocale::start_reverse(is_skip, options[:path],options[:config_file])
       end
 
       desc "version", "show the AppLocale verions"
@@ -50,9 +54,19 @@ module Applocale
 
       desc "findkey [key]", "findkey for ios and convert to xlsx"
       option :path, :desc => "Project dir path"
+      option :config_file, :desc => "the filename of config, default AppLocaleFile"
       def findkey(key)
-        Applocale::findkey(key, options[:path])
+        Applocale::findkey(key, options[:path], options[:config_file])
       end
+
+
+      desc "compare two string file", "compare two string file"
+      option :file2, :desc => "second file path"
+      def compare(file1, file2)
+        Applocale::compare(file1, file2)
+      end
+
     end
   end
 end
+

data/lib/applocale/Core/CompareStringFile/compare_string_file.rb

@@ -0,0 +1,223 @@
+require File.expand_path('../../../Util/platform.rb', __FILE__)
+
+module Applocale
+  class CompareStringFile
+
+    attr_reader  :in_multiline_comments, :platform, :file1, :file2, :errorlist
+
+    def initialize(platform, file1, file2)
+      @platform = platform
+      @file1 = file1
+      @file12 = file2
+
+
+      @errorlist = Array.new()
+      @platform = platform
+
+      obj1 = {}
+      obj2 = {}
+      if platform == Platform::IOS
+        obj1 = parse_ios_file(file1)
+        obj2 = parse_ios_file(file2)
+      elsif platform == Platform::ANDROID
+        obj1 = parse_aos_file(file1)
+        obj2 = parse_aos_file(file2)
+      end
+      compare(obj1,obj2)
+    end
+
+
+    def compare(obj1, obj2)
+      missingkeyInObj2 = Array.new
+      mismatch = Array.new
+      duplicateKey = Array.new
+      notSame = {}
+      nobj2 = obj2
+      obj1.each do |key, value|
+        if nobj2[key].nil?
+          missingkeyInObj2.push(key)
+        else
+          obj1Value = value
+          obj2Value = obj2[key]
+          if obj1Value.length != obj2Value.length
+            mismatch.push(key)
+          elsif obj1Value.length != 1
+            duplicateKey.push(key)
+          elsif obj1Value[0] != obj2Value[0]
+            notSame[key] = {obj1: obj1Value[0],obj2: obj2Value[0]}
+          end
+        end
+        nobj2.delete(key)
+      end
+      puts "==> not Same value:"
+      notSame.each do |key, value|
+        puts "key = #{key}"
+        puts "#{value[:obj1]}<"
+        puts "#{value[:obj2]}<"
+      end
+      puts "==> duplicateKey"
+      puts duplicateKey
+      puts "==> mismatch"
+      puts mismatch
+      puts "==> missingkeyInObj2"
+      puts missingkeyInObj2
+      puts "==> missingKeyInObj1"
+      puts nobj2
+    end
+
+
+
+    def parse_aos_file(strings_path)
+      strings_keys = {}
+
+      return if !File.exist? strings_path
+      puts "Start to Parse xml file: \"#{strings_path}\" ...".green
+
+      xml_doc = Nokogiri::XML(File.open(strings_path))
+      string_nodes = xml_doc.xpath("//string")
+      string_nodes.each do |node|
+        key = node["name"]
+        value = node.content
+        if !key.nil? && key.strip.length > 0
+          if strings_keys[key].nil?
+            strings_keys[key] = Array.new
+          end
+          strings_keys[key].push(value)
+
+          # if @strings_keys[key].nil?
+          #   @strings_keys[key] = Hash.new
+          #   @keys_list.push(key)
+          # end
+          # if @strings_keys[key][lang.to_s].nil?
+          #   @strings_keys[key][lang.to_s] = Hash.new
+          #   @strings_keys[key][lang.to_s][:value] = self.remove_escape(lang, key, value)
+          # else
+          #   error = ErrorUtil::ParseLocalizedError::DuplicateKey.new(key, -1, strings_path, lang, -1).raise
+          # end
+        end
+      end
+      return strings_keys
+
+    end
+
+    def parse_ios_file(path)
+      strings_keys = {}
+      @in_multiline_comments = false
+      linenum = 0
+      begin
+      IO.foreach(path, mode: 'r:bom|utf-8') {|line|
+        linenum += 1
+        line.strip!
+        if !@in_multiline_comments
+          next if line.start_with?('#')
+          next if line.start_with?('//')
+        end
+        if line.length <= 0
+          next
+        end
+
+        while true
+          key, line = parse_token(linenum, line, "=", path)
+          line.strip!
+
+          if not line.start_with?("=")
+            if !@in_multiline_comments && line.length > 0
+              error = ErrorUtil::ParseLocalizedError::WrongFormat.new(path, "", linenum).raise
+            end
+            break
+          end
+          line.slice!(0)
+
+          value, line = parse_token(linenum, line, ";", path)
+          line.strip!
+
+          if line.start_with?(";")
+            line.slice!(0)
+          else
+            error = ErrorUtil::ParseLocalizedError::WrongFormat.new(path, "", linenum).raise
+            key = nil
+            value = nil
+            break
+          end
+          if strings_keys[key].nil?
+            strings_keys[key] = Array.new
+          end
+          strings_keys[key].push(value)
+        end
+      }
+      rescue Exception => e
+        puts e.message
+        ErrorUtil::ParseLocalizedError::InvalidFile.new(file1).raise
+      end
+
+      return strings_keys
+    end
+
+
+    def parse_token(linenum, line, sep, file)
+      n = 0
+      in_value = false
+      in_quote = false
+      in_escape = false
+      value = ""
+
+      for ch in line.chars
+        prech = ""
+        prech = line.chars[n-1] if n > 0
+        n += 1
+        if @in_multiline_comments
+          if "#{prech}#{ch}" == "*/"
+            @in_multiline_comments = false
+            in_value = false
+            value = ""
+          end
+          next
+        end
+
+        if not in_value
+          if ch == "\""
+            in_quote = true
+            in_value = true
+          elsif ch != " " and ch != "\t" and ch != sep
+            in_value = true
+            value << ch
+          end
+          next
+        end
+
+        if in_escape
+          value << prech
+          value << ch
+          in_escape = false
+        elsif ch == "\\"
+          in_escape = true
+        elsif in_quote
+          if ch == "\""
+            break
+          else
+            value << ch
+          end
+        else
+          if ch == " " or ch == "\t" or ch == sep
+            n -= 1
+            break
+          elsif "#{prech}#{ch}" == "/*"
+            @in_multiline_comments = true
+          elsif "#{prech}#{ch}" == "//"
+            return value, ""
+          elsif ch == "#"
+            return value, ""
+          elsif "#{prech}#{ch}".length > 1
+            error = ErrorUtil::ParseLocalizedError::WrongFormat.new(file, "", linenum)
+            @errorlist.push(error)
+            return value, ""
+          else
+            value << ch
+          end
+        end
+      end
+      return value, line[n..-1]
+    end
+
+  end
+end

data/lib/applocale/Core/ParseCSV/parse_csv.rb

@@ -2,6 +2,7 @@ require File.expand_path('../../setting.rb', __FILE__)
 require File.expand_path('../../../Util/error_util.rb', __FILE__)
 require File.expand_path('../../../Util/regex_util.rb', __FILE__)
 require File.expand_path('../../ParseModel/parse_model_module.rb', __FILE__)
+require File.expand_path('../../../Util/convert_util.rb', __FILE__)
 
 require 'colorize'
 require 'csv'
@@ -18,7 +19,7 @@ module Applocale
     @langlist
     @sheetobj_list
     @is_skip_empty_key
-    @injectobj
+    @convertFile
 
 
     def initialize(setting)
@@ -30,7 +31,7 @@ module Applocale
       @allkey_dict = {}
       @all_error = Array.new
       @is_skip_empty_key = setting.is_skip_empty_key
-      @injectobj = setting.injection
+      @convertFile = setting.convert_file
       # puts "Start to Parse CSV: \"#{csv_directory}\" ...".green
       parse
     end
@@ -56,8 +57,8 @@ module Applocale
           row_content = parse_row(sheet_name, index, row, sheet_content.keyStr_with_colno, sheet_content.lang_with_colno_list)
           next if row_content.nil?
           toskip = false
-          if @injectobj.has_is_skip_by_key
-            is_skip_by_key = @injectobj.load_is_skip_by_key(sheet_name, row_content.key_str)
+          if @convertFile.has_is_skip_by_key
+            is_skip_by_key = @convertFile.load_is_skip_by_key(sheet_name, row_content.key_str)
             if is_skip_by_key.to_s.downcase == "true"
               toskip = true
             end
@@ -137,7 +138,19 @@ module Applocale
         end
       end
       rowinfo = ParseModelModule::RowInfo.new(sheet_name, index, key_str)
-      rowinfo.content_dict = Hash[language_header_list.map { |language_header| [language_header.lang, ContentUtil.from_excel(row[language_header.colno] || '')] }]
+
+      arr = Array.new
+      language_header_list.each do |language_header|
+        value = row[language_header.colno] || ''
+        after_value = ContentUtil.from_excel(value)
+        if @convertFile.has_parse_from_excel_or_csv
+          value =  @convertFile.load_parse_from_excel_or_csv(sheet_name, key_str, value, after_value)
+        else
+          value = after_value
+        end
+        arr.push([language_header.lang, value])
+      end
+      rowinfo.content_dict = Hash[arr]
       rowinfo
     end
 

data/lib/applocale/Core/ParseXLSX/parse_xlsx.rb

@@ -3,6 +3,7 @@ require File.expand_path('../parse_xlsx_module.rb', __FILE__)
 require File.expand_path('../../../Util/error_util.rb', __FILE__)
 require File.expand_path('../../../Util/regex_util.rb', __FILE__)
 require File.expand_path('../../ParseModel/parse_model_module.rb', __FILE__)
+require File.expand_path('../../../Util/convert_util.rb', __FILE__)
 
 require 'rubyXL'
 require 'colorize'
@@ -24,7 +25,7 @@ module Applocale
     @langlist
     @sheetobj_list
     @is_skip_empty_key
-    @injectobj
+    @convert_file
 
     def initialize(setting)
       @platform = setting.platform
@@ -36,7 +37,7 @@ module Applocale
       @allkey_dict = {}
       @all_error = Array.new
       @is_skip_empty_key = setting.is_skip_empty_key
-      @injectobj = setting.injection
+      @convert_file = setting.convert_file
       self.parse
     end
 
@@ -135,8 +136,8 @@ module Applocale
       end
 
       unless keystr.nil?
-        if @injectobj.has_is_skip_by_key
-          is_skip_by_key = @injectobj.load_is_skip_by_key(sheetname, keystr)
+        if @convert_file.has_is_skip_by_key
+          is_skip_by_key = @convert_file.load_is_skip_by_key(sheetname, keystr)
           if is_skip_by_key.to_s.downcase == "true"
             return nil
           end
@@ -147,7 +148,7 @@ module Applocale
           val = cell && cell.value
           cell_value = val.to_s
           lang_name = lang_with_colno.lang
-          rowinfo.content_dict[lang_name] = convert_contect(cell_value)
+          rowinfo.content_dict[lang_name] = convert_contect(sheetname,keystr, cell_value)
         end
         return rowinfo
       end
@@ -165,11 +166,16 @@ module Applocale
       end
     end
 
-    def convert_contect(cell_value)
+    def convert_contect(sheetname, key, cell_value)
       if cell_value.nil?
         return ''
       else
-        return ContentUtil.from_excel(cell_value)
+        value = ContentUtil.from_excel(cell_value)
+        if @convert_file.has_parse_from_excel_or_csv
+          return @convert_file.load_parse_from_excel_or_csv(sheetname, key, cell_value, value)
+        else
+          return value
+        end
       end
     end