applocale 0.1.6 → 0.2.0

data/lib/applocale/Core/ParserStringFile/parse_strings_file.rb

@@ -1,35 +1,37 @@
 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('../../../Util/injection.rb', __FILE__)
 
 module Applocale
   class ParseStringsFile
 
-    attr_reader :strings_keys, :errorlist, :in_multiline_comments, :keys_list, :platform
+    attr_reader :strings_keys, :errorlist, :in_multiline_comments, :keys_list, :platform, :injectobj
 
-    def initialize()
+    def initialize(platform, langpathobj_list, injectobj)
       @strings_keys = {}
       @keys_list = Array.new
       @errorlist = Array.new()
-      @platform = Setting.platform
-      self.to_parse_files(Setting.langlist)
+      @platform = platform
+      @injectobj = injectobj
+      self.to_parse_files(langpathobj_list)
     end
 
-    def to_parse_files(lang_list)
-      lang_list.each do |key, langinfo|
-        self.to_parse_strings_file(key, langinfo[:path])
+    def to_parse_files(langpathobj_list)
+      langpathobj_list.each do |langpathobj|
+        self.to_parse_strings_file(langpathobj.lang, langpathobj.filepath)
       end
     end
 
-    def to_parse_strings_file(lang, strings_path)
-      puts "Start to Parse strings file: \"#{strings_path}\" ...".green
+    def to_parse_strings_file(lang, strings_filepath)
+      puts "Start to Parse strings file: \"#{strings_filepath}\" ...".green
 
       @in_multiline_comments = false
       keyrowno = {}
       linenum = 0
       begin
 
-      IO.foreach(strings_path, mode: 'r:bom|utf-8') {|line|
+      IO.foreach(strings_filepath, mode: 'r:bom|utf-8') {|line|
         linenum += 1
         line.strip!
         if !@in_multiline_comments
@@ -41,25 +43,25 @@ module Applocale
         end
         while true
 
-          key, line = parse_token(linenum, line, "=", lang, strings_path)
+          key, line = parse_token(linenum, line, "=", lang, strings_filepath)
           line.strip!
 
           if not line.start_with?("=")
             if !@in_multiline_comments && line.length > 0
-              error = ErrorUtil::ParseLocalizedError::WrongFormat.new(strings_path, lang, linenum)
+              error = ErrorUtil::ParseLocalizedError::WrongFormat.new(strings_filepath, lang, linenum)
               @errorlist.push(error)
             end
             break
           end
           line.slice!(0)
 
-          value, line = parse_token(linenum, line, ";", lang, strings_path)
+          value, line = parse_token(linenum, line, ";", lang, strings_filepath)
           line.strip!
 
           if line.start_with?(";")
             line.slice!(0)
           else
-            error = ErrorUtil::ParseLocalizedError::WrongFormat.new(strings_path, lang, linenum)
+            error = ErrorUtil::ParseLocalizedError::WrongFormat.new(strings_filepath, lang, linenum)
             @errorlist.push(error)
             key = nil
             value = nil
@@ -67,7 +69,7 @@ module Applocale
           end
 
           if !ValidKey.is_validkey(@platform, key)
-            error = ErrorUtil::ParseLocalizedError::InvalidKey.new(key, strings_path, lang, linenum)
+            error = ErrorUtil::ParseLocalizedError::InvalidKey.new(key, strings_filepath, lang, linenum)
             @errorlist.push(error)
             break
           end
@@ -78,10 +80,10 @@ module Applocale
           if @strings_keys[key][lang.to_s].nil?
             @strings_keys[key][lang.to_s] = Hash.new
             @strings_keys[key][lang.to_s][:rowno] = linenum
-            @strings_keys[key][lang.to_s][:value] = ContentUtil.remove_escape(@platform, value)
+            @strings_keys[key][lang.to_s][:value] = self.remove_escape(lang, key, value)
             keyrowno[key] = linenum
           else
-            error = ErrorUtil::ParseLocalizedError::DuplicateKey.new(key, keyrowno[key], strings_path, lang, linenum)
+            error = ErrorUtil::ParseLocalizedError::DuplicateKey.new(key, keyrowno[key], strings_filepath, lang, linenum)
             @errorlist.push(error)
           end
           if line.length <= 0
@@ -89,8 +91,9 @@ module Applocale
           end
         end
       }
-      rescue
-        ErrorUtil::ParseLocalizedError::InvalidFile.new(strings_path).raise
+      rescue Exception => e
+        puts e.message
+        ErrorUtil::ParseLocalizedError::InvalidFile.new(strings_filepath).raise
       end
     end
 
@@ -159,5 +162,21 @@ module Applocale
       return value, line[n..-1]
     end
 
+    def remove_escape(lang, key, content)
+      value = content
+      if @injectobj.has_before_parse_from_locale
+        value = @injectobj.load_before_parse_from_locale(lang.to_s, key,  value)
+      end
+      if @injectobj.has_parse_from_locale
+        value = @injectobj.load_parse_from_locale(lang.to_s, key,  value)
+      else
+        value = ContentUtil.remove_escape(@platform, value)
+      end
+      if @injectobj.has_after_parse_from_locale
+        value = @injectobj.load_after_parse_from_locale(lang.to_s, key,  value)
+      end
+      return value
+    end
+
   end
 end

data/lib/applocale/Core/ParserStringFile/parse_xml_file.rb

@@ -5,19 +5,20 @@ require File.expand_path('../../../Util/regex_util.rb', __FILE__)
 module Applocale
 
   class ParseXMLFile
-    attr_reader :strings_keys, :errorlist, :in_multiline_comments, :keys_list, :platform
+    attr_reader :strings_keys, :errorlist, :in_multiline_comments, :keys_list, :platform, :injectobj
 
-    def initialize()
+    def initialize(platform, langpathobj_list, injectobj)
       @strings_keys = {}
       @keys_list = Array.new
       @errorlist = Array.new()
-      @platform = Setting.platform
-      self.to_parse_files(Setting.langlist)
+      @platform = platform
+      @injectobj = injectobj
+      self.to_parse_files(langpathobj_list)
     end
 
-    def to_parse_files(lang_list)
-      lang_list.each do |key, langinfo|
-        self.to_parse_strings_file(key, langinfo[:path])
+    def to_parse_files(langpathobj_list)
+      langpathobj_list.each do |langpathobj|
+        self.to_parse_strings_file(langpathobj.lang, langpathobj.filepath)
       end
     end
 
@@ -37,7 +38,7 @@ module Applocale
           end
           if @strings_keys[key][lang.to_s].nil?
             @strings_keys[key][lang.to_s] = Hash.new
-            @strings_keys[key][lang.to_s][:value] = ContentUtil.remove_escape(@platform, value)
+            @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)
             @errorlist.push(error)
@@ -46,5 +47,21 @@ module Applocale
       end
     end
 
+    def remove_escape(lang, key, content)
+      value = content
+      if @injectobj.has_before_parse_from_locale
+        value = @injectobj.load_before_parse_from_locale(lang.to_s, key,  value)
+      end
+      if @injectobj.has_parse_from_locale
+        value = @injectobj.load_parse_from_locale(lang.to_s, key,  value)
+      else
+        value = ContentUtil.remove_escape(@platform, value)
+      end
+      if @injectobj.has_after_parse_from_locale
+        value = @injectobj.load_after_parse_from_locale(lang.to_s, key,  value)
+      end
+      return value
+    end
+
   end
 end

data/lib/applocale/Core/convert_to_localefile.rb

@@ -1,26 +1,32 @@
 require File.expand_path('../setting.rb', __FILE__)
 require File.expand_path('../../Util/platform.rb', __FILE__)
 require File.expand_path('../../Util/regex_util.rb', __FILE__)
+require File.expand_path('../../Util/injection.rb', __FILE__)
+
 require 'colorize'
 
+
 module Applocale
   class ConvertToStrFile
 
-    def self.convert(sheetcontent_list, setting = Setting)
-      setting.langlist.each do |lang, langinfo|
-        puts "Start to convert to string file for [\"#{lang}\"] #{langinfo[:path]}...".green
-        if setting.platform == Platform::IOS
-          self.convert_to_localefile(setting.platform, lang, langinfo[:path], sheetcontent_list)
-        elsif setting.platform == Platform::ANDROID
-          self.convert_to_xml(setting.platform, lang, langinfo[:path], sheetcontent_list)
+    def self.convert(platform, lang_path_list, sheetcontent_list, rubycode)
+
+      injectObj = Applocale::Injection.load(rubycode)
+
+      lang_path_list.each do |langpath_obj|
+        puts "Start to convert to string file for [\"#{langpath_obj.lang}\"] #{langpath_obj.filepath}...".green
+        if platform == Platform::IOS
+          self.convert_to_stringfile(platform, langpath_obj, sheetcontent_list, injectObj)
+        elsif platform == Platform::ANDROID
+          self.convert_to_xml(platform, langpath_obj, sheetcontent_list, injectObj)
         end
       end
       puts 'Convert Finished !!!'.green
     end
 
-    def self.convert_to_localefile(platform, lang, langfilepath, sheetcontent_list)
-      FileUtils.mkdir_p(File.dirname(langfilepath))
-      target = open(langfilepath, 'w')
+    def self.convert_to_stringfile(platform, langpath_obj, sheetcontent_list, injectObj)
+      FileUtils.mkdir_p(File.dirname(langpath_obj.filepath))
+      target = open(langpath_obj.filepath, 'w')
       sheetcontent_list.each do |sheetcontent|
         contentlist = sheetcontent.get_rowInfo_sortby_key
         next if contentlist.length <= 0
@@ -29,8 +35,8 @@ module Applocale
         target.puts(' *******************************/')
         target.puts('')
         contentlist.each do |rowinfo|
-          content = rowinfo.content_dict[lang]
-          value = ContentUtil.add_escape(platform, content)
+          content = rowinfo.content_dict[langpath_obj.lang]
+          value = self.add_escape(platform, langpath_obj.lang, rowinfo.key_str, content, injectObj)
           target.puts("\"#{rowinfo.key_str}\" = \"#{value}\";")
         end
         target.puts('')
@@ -38,17 +44,17 @@ module Applocale
       target.close
     end
 
-    def self.convert_to_xml(platform, lang, langfilepath, sheetcontent_list)
-      FileUtils.mkdir_p(File.dirname(langfilepath))
-      target = open(langfilepath, 'w')
+    def self.convert_to_xml(platform, langpath_obj, sheetcontent_list, injectObj)
+      FileUtils.mkdir_p(File.dirname(langpath_obj.filepath))
+      target = open(langpath_obj.filepath, 'w')
       target.puts('<resources>')
       sheetcontent_list.each do |sheetcontent|
         target.puts("   <!-- #{sheetcontent.comment} -->")
         contentlist = sheetcontent.get_rowInfo_sortby_key
         contentlist.each do |rowinfo|
-          content = rowinfo.content_dict[lang]
-          value = ContentUtil.add_escape(platform, content)
-          target.puts("   <string name=\"#{rowinfo.key_str.downcase}\">#{value}</string>")
+          content = rowinfo.content_dict[langpath_obj.lang]
+          value = self.add_escape(platform, langpath_obj.lang, rowinfo.key_str, content, injectObj)
+          target.puts("   <string name=\"#{rowinfo.key_str}\">#{value}</string>")
         end
         target.puts('')
       end
@@ -56,5 +62,21 @@ module Applocale
       target.close
     end
 
+    def self.add_escape(platform, lang, key, content, injectObj)
+      value = content
+      if injectObj.has_before_convent_to_locale
+        value = injectObj.load_before_convent_to_locale(lang.to_s, key,  value)
+      end
+      if injectObj.has_convent_to_locale
+        value = injectObj.load_convent_to_locale(lang.to_s, key,  value)
+      else
+        value = ContentUtil.add_escape(platform, value)
+      end
+      if injectObj.has_after_convent_to_locale
+        value = injectObj.load_after_convent_to_locale(lang.to_s, key,  value)
+      end
+      return value
+    end
+
   end
 end

data/lib/applocale/Core/init.rb

@@ -1,28 +1,90 @@
 require File.expand_path('../setting.rb', __FILE__)
+require File.expand_path('../../Util/file_util.rb', __FILE__)
+require File.expand_path('../../Util/error_util.rb', __FILE__)
+require File.expand_path('../../Util/config_util.rb', __FILE__)
 require File.expand_path('../GoogleHepler/google_helper.rb', __FILE__)
 require File.expand_path('../ParseXLSX/parse_xlsx', __FILE__)
+require File.expand_path('../ParserStringFile/parse_localized_resource.rb', __FILE__)
 require File.expand_path('../convert_to_localefile', __FILE__)
+require File.expand_path('../FindStrKey/find_str_key', __FILE__)
+
+require 'open-uri'
 
 module Applocale
 
-  def self.start_update(is_localupdate)
-    is_local = is_localupdate
-    ConfigUtil.load_and_validate_xlsx_to_localefile(is_local)
-    Setting.printlog
-    setting = Applocale::Setting
-    unless is_localupdate
-      google_file_id = GoogleHelper.is_googlelink(setting.link)
-      unless google_file_id.nil?
-        GoogleHelper.download_spreadsheet(google_file_id, setting.xlsxpath)
+  def self.create_config_file( platformStr = nil, projpath = Dir.pwd)
+    proj_path = projpath
+    proj_path = Dir.pwd if projpath.nil?
+    proj_apath = Applocale::FilePathUtil.get_proj_absoluat_path(proj_path)
+    if platformStr.nil?
+      if Dir.glob("#{proj_apath}/**/*.xcodeproj").length > 0 || Dir.glob("#{proj_apath}/*.xcworkspace").length > 0
+        platformsybom = Platform::IOS
+      elsif Dir.glob("#{proj_apath}/**/*.gradle").length > 0
+        platformsybom = Platform::ANDROID
+      else
+        Applocale::ErrorUtil::CommandError.new("Mssing [platform] : ios | android ").raise
+      end
+    else
+      platformsybom = Platform.init(platform.strip)
+    end
+    if platformsybom.nil?
+      ErrorUtil::CommandError.new("Invalid [platform] : ios | android ").raise
+    else
+      Applocale::Config::ConfigUtil.create_configfile_ifneed(platformsybom,proj_apath.to_s )
+    end
+  end
+
+  def self.start_update(projpath = Dir.pwd)
+    proj_path = projpath
+    proj_path = Dir.pwd if projpath.nil?
+    proj_apath = Applocale::FilePathUtil.get_proj_absoluat_path(proj_path)
+    obj = Applocale::Config::ConfigUtil.new(proj_apath)
+    setting = obj.load_configfile_to_setting
+    if setting.link.to_s.length <= 0
+      ErrorUtil::ConfigFileInValid.new('[link] is missing in config file ').raise
+    end
+    if Applocale::GoogleHelper.is_googlelink(setting.link)
+      if setting.google_credentials_path.to_s.length <= 0
+        setting.google_credentials_path = File.expand_path(FilePathUtil.default_google_credentials_filename, File.dirname(setting.configfile_pathstr))
       end
+      googleobj = Applocale::GoogleHelper.new(setting.link, setting.google_credentials_path, setting.xlsxpath)
+      googleobj.download
+    else
+      download = open(setting.link)
+      IO.copy_stream(download, setting.xlsxpath)
     end
+    Applocale.start_local_update( setting, proj_path)
+  end
 
-    parse_xlsx = ParseXLSX.new
-    ConvertToStrFile.convert(parse_xlsx.result)
+  def self.start_local_update(asetting = nil, projpath = Dir.pwd)
+    proj_path = projpath
+    proj_path = Dir.pwd if projpath.nil?
+    proj_apath = Applocale::FilePathUtil.get_proj_absoluat_path(proj_path)
+    setting = asetting
+    if setting.nil?
+      obj = Applocale::Config::ConfigUtil.new(proj_apath)
+      setting = obj.load_configfile_to_setting
+    end
+    parse_xlsx = Applocale::ParseXLSX.new(setting.platform, setting.xlsxpath, setting.lang_path_list, setting.sheet_obj_list)
+    ConvertToStrFile.convert(setting.platform, setting.lang_path_list,parse_xlsx.result, setting.rubycode)
   end
 
-  def self.start_reverse(is_skip)
-    Applocale::ParseLocalizedResource.new(is_skip)
+  def self.start_reverse( is_skip, projpath = Dir.pwd)
+    proj_path = projpath
+    proj_path = Dir.pwd if projpath.nil?
+    proj_apath = Applocale::FilePathUtil.get_proj_absoluat_path(proj_path)
+    obj = Applocale::Config::ConfigUtil.new(proj_apath)
+    setting = obj.load_configfile_to_setting
+    Applocale::ParseLocalizedResource.new(is_skip,setting.platform,setting.xlsxpath, setting.lang_path_list, setting.sheet_obj_list, setting.rubycode )
   end
 
-end
+  def self.findkey( key, projpath = Dir.pwd)
+    proj_path = projpath
+    proj_path = Dir.pwd if projpath.nil?
+    proj_apath = Applocale::FilePathUtil.get_proj_absoluat_path(proj_path)
+    obj = Applocale::Config::ConfigUtil.new(proj_apath)
+    report_folder = File.dirname(obj.configfile_pathstr)
+    findobj = FindStrKey::FindValue.new(Applocale::Platform::IOS, proj_apath, report_folder, key)
+    findobj.find
+  end
+end

data/lib/applocale/Core/setting.rb

@@ -1,18 +1,119 @@
 require 'colorize'
+# module Applocale
+#   class Setting
+#     class <<self
+#       attr_accessor :link, :platform, :keystr, :langlist, :xlsxpath
+#     end
+#
+#     def self.printlog
+#       puts ' In Setting'
+#       puts "  link = #{self.link}"
+#       puts "  platform = #{self.platform}"
+#       puts "  keystr = #{self.keystr}"
+#       puts "  langlist = #{self.langlist}"
+#       puts "  xlsxpath = #{self.xlsxpath}"
+#     end
+#
+#   end
+# end
+#
 
 module Applocale
-  class Setting
-    class <<self
-      attr_accessor :link, :platform, :keystr, :langlist, :xlsxpath
+  module Config
+    class Setting
+      attr_accessor :configfile_pathstr, :link, :platform, :xlsxpath, :google_credentials_path, :lang_path_list, :sheet_obj_list, :rubycode
+      def initialize(configfile_pathstr)
+        self.configfile_pathstr = configfile_pathstr
+        self.lang_path_list = Array.new
+        self.sheet_obj_list = Array.new
+      end
+
+      def printlog
+        puts ' In Setting'
+        puts "  link = #{self.link}"
+        puts "  platform = #{self.platform}"
+        puts "  xlsxpath = #{self.xlsxpath}"
+        puts "  google_credentials_path = #{self.google_credentials_path} "
+
+        puts "  lang_path_list = "
+        self.lang_path_list.each do |langpath_obj|
+          puts "    #{langpath_obj.to_s}"
+        end
+        puts "  sheet_obj_list = "
+        self.sheet_obj_list.each do |sheet_obj|
+          puts "    #{sheet_obj.to_s}"
+        end
+
+        # puts self.rubycode
+
+      end
     end
 
-    def self.printlog
-      puts ' In Setting'
-      puts "  link = #{self.link}"
-      puts "  platform = #{self.platform}"
-      puts "  keystr = #{self.keystr}"
-      puts "  langlist = #{self.langlist}"
-      puts "  xlsxpath = #{self.xlsxpath}"
+    class LangPath
+      attr_accessor :lang, :filepath
+
+      def initialize(lang, filepath)
+        self.lang = lang
+        self.filepath = filepath
+      end
+
+      def to_s
+        return "#{self.lang}:  #{self.filepath}"
+      end
+    end
+
+    class Sheet
+      attr_accessor :sheetname, :obj
+
+      def initialize(sheetname, obj)
+        self.sheetname = sheetname
+        self.obj = obj
+      end
+
+      def to_s
+        return "#{self.sheetname}   #{self.obj.to_s}"
+      end
+
+
+      def self.get_sheetlist(sheet_obj_list)
+        return sheet_obj_list.map{ |sheet_obj| sheet_obj.sheetname }
+      end
+
+      def self.get_sheetobj_by_sheetname(sheet_obj_list, sheetname)
+        sheet_obj_list.each do |sheet_obj|
+          if sheet_obj.sheetname == sheetname
+            return sheet_obj.obj
+          end
+        end
+        return nil
+      end
+    end
+
+    class SheetInfoByHeader
+      attr_accessor :key_header, :lang_headers
+
+      def initialize(key_header, lang_headers)
+        self.key_header = key_header
+        self.lang_headers = lang_headers
+      end
+
+      def to_s
+        return "key_header: #{self.key_header} | headers: #{self.lang_headers.to_s}"
+      end
+    end
+
+    class SheetInfoByRow
+      attr_accessor  :row, :key_col, :lang_cols
+
+      def initialize(row, key_col, lang_cols)
+        self.row = row
+        self.key_col = key_col
+        self.lang_cols = lang_cols
+      end
+
+      def to_s
+        return "row: #{self.row} | key_col: #{self.key_col} | lang_cols: #{self.lang_cols.to_s}"
+      end
     end
 
   end