applocale 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89d39118369c6a6ae9d1ddf7c95b2bc71ccd0b4f
-  data.tar.gz: d3c9d42a9b782b4712d94ede91c8f3d9a594b3b7
+  metadata.gz: '01887bf2b6b99b1f368a205cae7736aceec40f65'
+  data.tar.gz: a7fbb56a6f7f4db100a8bc67c74392d3474fe475
 SHA512:
-  metadata.gz: 7e723751430ee1020f97c321008af236172775a3ff7242586612e2a880993744d9f85793a073451c453efc7c1c45cb0fb443b89c53a56f4c3718fb3e206f48ce
-  data.tar.gz: e76a9e83435f159ff246429e9bf8fecd2061a2c68a333f79d7ad468c7e1697d0a102c6d61e787355af5cb53a0c71ca8d88c8911dca3c01518928088167c79043
+  metadata.gz: 1055690a659e1dcf3f7ed58d878efc15fbce3dd8dceb0dc714ae2b3f7e633ac13a835370cfc5a3b11dfde48f212dca5f0be76a8c9a468392eb72cf2354fe80bc
+  data.tar.gz: 7798338941273dcfe286a656bfa9d105fcdf88208b872f576c122aa936aea85ea680b0a8beacee9a26ca5c816c9616447fdf1568ab32ab9e5d447eb5f3c217e2

data/lib/applocale/Command/init.rb

@@ -66,6 +66,13 @@ module Applocale
         Applocale::compare(file1, file2)
       end
 
+      desc "compare the local results of two AppLocale files", "compare the local results of two AppLocale files"
+      option :path, :desc => "Project dir path"
+      option :result_file, :desc => "Comparison Result file path"
+      def compare_local(file1, file2)
+        Applocale::compare_local(file1, file2, options[:path], options[:result_file])
+      end
+
     end
   end
 end

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

@@ -3,31 +3,34 @@ require File.expand_path('../../../Util/platform.rb', __FILE__)
 module Applocale
   class CompareStringFile
 
-    attr_reader  :in_multiline_comments, :platform, :file1, :file2, :errorlist
+    attr_reader  :in_multiline_comments, :platform, :file1, :file2, :errorlist, :print_result, :lang
 
-    def initialize(platform, file1, file2)
+    def initialize(platform, file1, file2, lang = nil, print_result = true)
       @platform = platform
       @file1 = file1
-      @file12 = file2
-
-
+      @file2 = file2
       @errorlist = Array.new()
       @platform = platform
+      @print_result = print_result
+      @lang = lang
+    end
+
+    def self.compare(lang_path_obj)
+      Applocale::CompareStringFile.new(lang_path_obj.platform, lang_path_obj.filepath1, lang_path_obj.filepath2, lang_path_obj.lang, false).compare
+    end
 
+    def compare
       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)
+      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
@@ -49,20 +52,28 @@ module Applocale
         end
         nobj2.delete(key)
       end
-      puts "==> not Same value:"
-      notSame.each do |key, value|
-        puts "key = #{key}"
-        puts "#{value[:obj1]}<"
-        puts "#{value[:obj2]}<"
+      missingKeyInObj1 = nobj2.keys
+      notSameKeys = notSame.keys
+      comparison_result = Applocale::Config::LangPathComparisonResult.init(@platform, @lang, @file1, @file2, notSameKeys, duplicateKey, mismatch, missingKeyInObj1, missingkeyInObj2)
+
+      if @print_result
+        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 missingKeyInObj1
       end
-      puts "==> duplicateKey"
-      puts duplicateKey
-      puts "==> mismatch"
-      puts mismatch
-      puts "==> missingkeyInObj2"
-      puts missingkeyInObj2
-      puts "==> missingKeyInObj1"
-      puts nobj2
+
+      comparison_result
     end
 
 
@@ -102,43 +113,13 @@ module Applocale
 
     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
+        match = line.match(/"(.*?)" = "(.*)";/)
+        unless match.nil?
+          key = match.captures[0]
+          value = match.captures[1]
           if strings_keys[key].nil?
             strings_keys[key] = Array.new
           end

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

@@ -0,0 +1,71 @@
+require 'parallel'
+require 'csv'
+require File.expand_path('../../../Util/platform.rb', __FILE__)
+require File.expand_path('../../../Util/compare_util.rb', __FILE__)
+require File.expand_path('../compare_string_file.rb', __FILE__)
+
+module Applocale
+  class CompareStringFiles
+    attr_reader :platform, :applocale_file1, :applocale_file2, :setting1, :setting2, :langpath_comparison_list, :result_file
+    def compare_all
+      results = @langpath_comparison_list.map do |langpath_comparison|
+        lang = langpath_comparison.lang
+        file1 = langpath_comparison.filepath1
+        file2 = langpath_comparison.filepath2
+        if file1.nil? or file2.nil?
+          Applocale::Config::LangPathComparisonResult.new(langpath_comparison, "Warning: [#{lang}] missing files for comparison!!!!!")
+        else
+          Applocale::CompareStringFile.compare(langpath_comparison)
+        end
+      end
+      results.each {| result |
+        unless result.warning.nil?
+          puts result.warning.yellow
+        end
+      }
+      write_result_to_csv(results)
+      puts "Comparison Finished, output: #{result_file} !!!".green
+    end
+
+    def initialize(platform, applocale_file1, applocale_file2, setting1, setting2, result_file)
+      @platform = platform
+      @applocale_file1 = applocale_file1
+      @applocale_file2 = applocale_file2
+      @setting1 = setting1
+      @setting2 = setting2
+      @result_file = result_file
+      @langpath_comparison_list = @setting1.lang_path_list.map do |lang_path_obj|
+        file1 = lang_path_obj.filepath
+        file2 = @setting2.lang_path_list.detect { |e| e.lang == lang_path_obj.lang }&.filepath
+        Applocale::Config::LangPathComparison.new(platform, lang_path_obj.lang, file1,  file2)
+      end
+      compare_all
+    end
+
+    def write_result_to_csv(results)
+      filtered_results = results.select do | result |
+        result.warning.nil?
+      end
+      columns = filtered_results
+                  .map { |result| result.lang }
+                  .flat_map do | lang |
+        ["notSame", "duplicateKey", "mismatch", "missingKeyIn1st", "missingkeyIn2nd"].map { |column| "#{lang}: #{column}" }
+      end
+      values =  filtered_results.flat_map { |result|
+        [result.not_same,
+        result.duplicate_key,
+        result.mismatch,
+        result.missing_in_1,
+        result.missing_in_2]
+      }
+      values_max_length = values.max { |a,b| a.length <=> b.length }.length
+      _first_value, *other_values = values
+      first_value = values_max_length.times.collect { |i| _first_value[i] }
+      csv_values = first_value.zip(*other_values)
+      CSV.open(@result_file, "w") do | csv |
+        csv << columns
+        csv_values.each { | row |  csv << row }
+      end
+    end
+  end
+end

data/lib/applocale/Core/GoogleHepler/google_helper.rb

@@ -5,6 +5,7 @@ require 'googleauth/stores/file_token_store'
 require 'fileutils'
 require 'colorize'
 require 'open-uri'
+require 'parallel'
 require File.expand_path('../../../Util/file_util.rb', __FILE__)
 require File.expand_path('../../../Util/error_util.rb', __FILE__)
 
@@ -58,16 +59,15 @@ module Applocale
             end
 
             index = 0
-            sheet_obj_list.each do |sheet_obj|
+            Parallel.each(sheet_obj_list) do |sheet_obj|
             sheet_name = sheet_obj.sheetname
             file_path = File.expand_path("#{sheet_name}.csv", export_to)
             if sheetMap[sheet_name].nil?
               ErrorUtil::SheetNotExist.new(sheet_name).raise
             end
-            puts "to download sheet: #{sheet_name}"
             if !sheet_obj.obj.use_export
               link = "https://docs.google.com/spreadsheets/d/#{self.spreadsheet_id}/gviz/tq?tqx=out:csv&sheet=#{sheet_name}&access_token=#{authorization.access_token}"
-              puts "https://docs.google.com/spreadsheets/d/#{self.spreadsheet_id}/gviz/tq?tqx=out:csv&sheet=#{sheet_name}&access_token=xxxxx"
+              puts "\nto download sheet: #{sheet_name}\nhttps://docs.google.com/spreadsheets/d/#{self.spreadsheet_id}/gviz/tq?tqx=out:csv&sheet=#{sheet_name}&access_token=xxxxx"
               csv = open(link)
               IO.copy_stream(csv, file_path)
             else
@@ -79,7 +79,7 @@ module Applocale
                 sleep(2)
               end
               link =  "https://docs.google.com/spreadsheets/d/#{self.spreadsheet_id}/export?format=csv&gid=#{sheetMap[sheet_name]}&access_token=#{authorization.access_token}"
-              puts "https://docs.google.com/spreadsheets/d/#{self.spreadsheet_id}/export?format=csv&gid=#{sheetMap[sheet_name]}&access_token=xxxxx"
+              puts "\nto download sheet: #{sheet_name}\nhttps://docs.google.com/spreadsheets/d/#{self.spreadsheet_id}/export?format=csv&gid=#{sheetMap[sheet_name]}&access_token=xxxxx"
               File.open(file_path, "wb") do |file|
                 file.write open(link).read
               end

data/lib/applocale/Core/init.rb

@@ -9,6 +9,7 @@ require File.expand_path('../ParserStringFile/parse_localized_resource.rb', __FI
 require File.expand_path('../convert_to_localefile', __FILE__)
 require File.expand_path('../FindStrKey/find_str_key', __FILE__)
 require File.expand_path('../CompareStringFile/compare_string_file', __FILE__)
+require File.expand_path('../CompareStringFile/compare_string_files', __FILE__)
 
 require 'open-uri'
 
@@ -128,6 +129,30 @@ module Applocale
       platformsybom = Platform::ANDROID
     end
 
-    Applocale::CompareStringFile.new(platformsybom,file1_path,file2_path)
+    Applocale::CompareStringFile.new(platformsybom,file1_path,file2_path).compare
+  end
+
+  def self.compare_local(file1, file2, projpath = Dir.pwd, result_file)
+    puts 'Reminder: run `update` for both files before `compare`'.yellow
+    proj_path = projpath
+    proj_path = Dir.pwd if projpath.nil?
+    proj_apath = Applocale::FilePathUtil.get_proj_absoluat_path(proj_path)
+    obj1 = Applocale::Config::ConfigUtil.new(proj_apath, file1)
+    obj2 = Applocale::Config::ConfigUtil.new(proj_apath, file2)
+    setting1 = obj1.load_configfile_to_setting(false)
+    setting2 = obj2.load_configfile_to_setting(false)
+    platform1 = setting1.platform
+    platform2 = setting2.platform
+    if platform1 != platform2
+      ErrorUtil::FileMustSamePlatform.new.raise
+    end
+    if result_file.nil?
+      ErrorUtil::MissingComparisonResultFilePath.new.raise
+    end
+    if File.extname(result_file).strip.downcase[1..-1].downcase != 'csv'
+      ErrorUtil::NotSupportComparisonResultFileExtension.new.raise
+    end
+    result_file_path = File.join(proj_apath, FilePathUtil.default_mainfolder, result_file)
+    Applocale::CompareStringFiles.new(platform1, file1, file2, setting1, setting2, result_file_path)
   end
 end

data/lib/applocale/Util/compare_util.rb

@@ -0,0 +1,38 @@
+module Applocale
+  module Config
+    class LangPathComparison
+      attr_accessor :platform, :lang, :filepath1, :filepath2
+
+      def initialize(platform, lang, filepath1, filepath2)
+        self.platform = platform
+        self.lang = lang
+        self.filepath1 = filepath1
+        self.filepath2 = filepath2
+      end
+
+      def self.init(platform, lang, filepath1, filepath2)
+        LangPathComparison.new(platform, lang, filepath1, filepath2)
+      end
+    end
+
+    class LangPathComparisonResult < LangPathComparison
+      attr_accessor :platform, :lang, :filepath1, :filepath2, :warning, :not_same, :duplicate_key, :mismatch, :missing_in_1, :missing_in_2
+
+      def initialize(langpath_comparison, warning = nil)
+        super(langpath_comparison.platform, langpath_comparison.lang, langpath_comparison.filepath1, langpath_comparison.filepath2)
+        self.warning = warning
+      end
+
+      def self.init(platform, lang, filepath1, filepath2, not_same, duplicate_key, mismatch, missing_in_1, missing_in_2)
+        langpath_comparison = LangPathComparison.init(platform, lang, filepath1, filepath2)
+        result = LangPathComparisonResult.new(langpath_comparison)
+        result.not_same = not_same
+        result.duplicate_key = duplicate_key
+        result.mismatch = mismatch
+        result.missing_in_1 = missing_in_1
+        result.missing_in_2 = missing_in_2
+        result
+      end
+    end
+  end
+end

data/lib/applocale/Util/config_util.rb

@@ -75,7 +75,7 @@ module Applocale
       end
 
       public
-      def load_configfile_to_setting
+      def load_configfile_to_setting(printSetting = true)
         error_list = Array.new
         config_yaml = load_configfile
         link = config_yaml['link'].to_s.strip
@@ -230,7 +230,9 @@ module Applocale
           error = ErrorUtil::ConfigFileInValid.new("[isSkipEmptyKey] must be boolean ")
           error_list.push(error)
         end
-        setting.printlog
+        if printSetting
+          setting.printlog
+        end
         ErrorUtil::ConfigFileInValid.raiseArr(error_list)
         return setting
       end

data/lib/applocale/Util/error_util.rb

@@ -23,6 +23,18 @@ module Applocale
       end
     end
 
+    class MissingComparisonResultFilePath < CommonError
+      def message
+        'Missing Comparison Result File path'
+      end
+    end
+
+    class NotSupportComparisonResultFileExtension < CommonError
+      def message
+        'Only support .csv for Comparison Result File'
+      end
+    end
+
     class ConfigFileInValid < CommonError
       def self.raiseArr(list = nil)
         if !list.nil? && list.length > 0
@@ -73,6 +85,11 @@ module Applocale
       end
     end
 
+    class FileMustSamePlatform < CommandError
+      def message
+        'Two platforms not same'
+      end
+    end
   end
 end
 

data/lib/applocale/version.rb

@@ -1,3 +1,3 @@
 module Applocale
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: applocale
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Kennix
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-28 00:00:00.000000000 Z
+date: 2020-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,6 +114,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.3.23
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.11.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.11.2
 description: Applocale is a localization tool, It can convert file between string
   and xlsx ,csv, also support download xlsx or csv from google. You can also setup
   conversion logic for string value of each project. Support ios, android and json
@@ -132,6 +146,7 @@ files:
 - lib/applocale/Command/init.rb
 - lib/applocale/Core/Compare/compare_xlsx_str.rb
 - lib/applocale/Core/CompareStringFile/compare_string_file.rb
+- lib/applocale/Core/CompareStringFile/compare_string_files.rb
 - lib/applocale/Core/FindStrKey/find_str_key.rb
 - lib/applocale/Core/FindStrKey/find_str_key_ios.rb
 - lib/applocale/Core/FindStrKey/find_str_key_result.rb
@@ -147,6 +162,7 @@ files:
 - lib/applocale/Core/convert_to_localefile.rb
 - lib/applocale/Core/init.rb
 - lib/applocale/Core/setting.rb
+- lib/applocale/Util/compare_util.rb
 - lib/applocale/Util/config_util.rb
 - lib/applocale/Util/convert_util.rb
 - lib/applocale/Util/error_util.rb