applocale 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90d475e1b157e47cb575c5443db8d9ea89c446e2
-  data.tar.gz: 612fc5ae3867aa0faa3296bc2b5930660bac8813
+  metadata.gz: d0b2379061e419ebd39b78bcff31a60598ef063f
+  data.tar.gz: 83523c243bfba37160fd902940a89338ff3318ce
 SHA512:
-  metadata.gz: a7ad7d4a77d846df74f9573364fa3dcb60745e23f8aeb754248f5caf5c611a2bc0655f622ec27539f12afb7c07f12ced29c8a940698352ac911f5bd057fa806a
-  data.tar.gz: a04e3d8e3d7134092f3f998691b38e9bfacb4f554bf43aacffa70fe874680ed8b12332519f7655afaae7d7187821021290c45b61635efe40c9f445fa67712d00
+  metadata.gz: bf7f2cac8b836a140ec030d7c701c92de0b66f313ccbb3d563524901cf41710f5856954a7477788f4b112f5d48f842f7ffeb44304920a58b93e9be91c6b393b9
+  data.tar.gz: 3f0d2b1f7879d12082c787a204e9b65fa8f5cfdc990641f686a4afb65b4e90849ee512802d3526e25393e1fab2bf11c46f46c3775dc64efd2ebcd10b78d50d32

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

@@ -1,4 +1,5 @@
 require 'google/apis/drive_v3'
+require 'google/apis/sheets_v4'
 require 'googleauth'
 require 'googleauth/stores/file_token_store'
 require 'fileutils'
@@ -46,13 +47,45 @@ module Applocale
       authorization = authorize
       begin
         case export_format
-        when 'csv'
-          sheet_obj_list.each do |sheet_obj|
+          when 'csv'
+            service = Google::Apis::SheetsV4::SheetsService.new
+            service.client_options.application_name = APPLICATION_NAME
+            service.authorization = authorization
+            sheets = service.get_spreadsheet(self.spreadsheet_id).sheets
+            sheetMap = {}
+            sheets.each do |sheet|
+              sheetMap[sheet.properties.title.to_s] = sheet.properties.sheet_id
+            end
+
+            index = 0
+            sheet_obj_list.each do |sheet_obj|
             sheet_name = sheet_obj.sheetname
             file_path = File.expand_path("#{sheet_name}.csv", export_to)
-            csv = open("https://docs.google.com/spreadsheets/d/#{self.spreadsheet_id}/gviz/tq?tqx=out:csv&sheet=#{sheet_name}&access_token=#{authorization.access_token}")
-            IO.copy_stream(csv, file_path)
-          end
+            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/1kapxktmMI605BhStCNd6F4Hst1A3HuNEfA4945_Mqa0/gviz/tq?tqx=out:csv&sheet=#{sheet_name}&access_token=#{authorization.access_token}"
+              puts "https://docs.google.com/spreadsheets/d/1kapxktmMI605BhStCNd6F4Hst1A3HuNEfA4945_Mqa0/gviz/tq?tqx=out:csv&sheet=#{sheet_name}&access_token=xxxxx"
+              csv = open(link)
+              IO.copy_stream(csv, file_path)
+            else
+              if index % 3 == 0
+                puts "please wait ... "
+                sleep(5)
+              else
+                puts "please wait .. "
+                sleep(2)
+              end
+              link =  "https://docs.google.com/spreadsheets/d/1kapxktmMI605BhStCNd6F4Hst1A3HuNEfA4945_Mqa0/export?format=csv&gid=#{sheetMap[sheet_name]}&access_token=#{authorization.access_token}"
+              puts "https://docs.google.com/spreadsheets/d/1kapxktmMI605BhStCNd6F4Hst1A3HuNEfA4945_Mqa0/export?format=csv&gid=#{sheetMap[sheet_name]}&access_token=xxxxx"
+              File.open(file_path, "wb") do |file|
+                file.write open(link).read
+              end
+              index = index + 1
+            end
+            end
         when 'xlsx'
           service = Google::Apis::DriveV3::DriveService.new
           service.client_options.application_name = APPLICATION_NAME

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

@@ -47,6 +47,7 @@ module Applocale
           next
         end
         rows = CSV.read(csv_path)
+
         header = find_header(sheet_obj, rows)
         sheet_content.header_rowno = header[:header_row_index]
         sheet_content.keyStr_with_colno = header[:key_header_info]
@@ -84,19 +85,30 @@ module Applocale
         sheet_language_list = sheet_info_obj.lang_headers
         sheet_key_header = sheet_info_obj.key_header
 
-        header_row_index = rows.index do |row|
-          row.include?(sheet_key_header)
-        end
+        header_row_index = nil
+
+        rows.each_with_index {|row,index |
+          row.each do |rowValue|
+            if rowValue.to_s.strip == sheet_key_header.to_s
+              header_row_index = index
+              break
+            end
+            break if !header_row_index.nil?
+          end
+        }
 
         header_row_info = rows[header_row_index] unless header_row_index.nil?
-        header_column_index = header_row_info.index { |cell| cell == sheet_key_header }
+        if header_row_info.nil?
+          raise "ParseCSVError: Header not found in sheet: #{sheet_name}"
+        end
+        header_column_index = header_row_info.index { |cell| cell.to_s.strip == sheet_key_header }
         if header_row_index.nil? || header_column_index.nil?
           raise "ParseCSVError: Header not found in sheet #{sheet_name}"
         end
         key_header_info = ParseModelModule::KeyStrWithColNo.new(sheet_key_header, header_column_index)
 
         language_header_list = sheet_language_list.map do |key, value|
-          cell_index = header_row_info.index { |cell| cell == value }
+          cell_index = header_row_info.index { |cell| cell.to_s.strip == value }
           cell_index.nil? ? nil : ParseModelModule::LangWithColNo.new(value, key, cell_index)
         end.compact
         unless language_header_list.length == sheet_language_list.length

data/lib/applocale/Core/setting.rb

@@ -97,29 +97,31 @@ module Applocale
     end
 
     class SheetInfoByHeader
-      attr_accessor :key_header, :lang_headers
+      attr_accessor :key_header, :lang_headers, :use_export
 
-      def initialize(key_header, lang_headers)
+      def initialize(key_header, lang_headers, use_export)
         self.key_header = key_header
         self.lang_headers = lang_headers
+        self.use_export = use_export
       end
 
       def to_s
-        return "key_header: #{self.key_header} | headers: #{self.lang_headers.to_s}"
+        return "key_header: #{self.key_header} | headers: #{self.lang_headers.to_s} | use_export: #{self.use_export}"
       end
     end
 
     class SheetInfoByRow
-      attr_accessor  :row, :key_col, :lang_cols
+      attr_accessor  :row, :key_col, :lang_cols, :use_export
 
-      def initialize(row, key_col, lang_cols)
+      def initialize(row, key_col, lang_cols, use_export)
         self.row = row
         self.key_col = key_col
         self.lang_cols = lang_cols
+        self.use_export = use_export
       end
 
       def to_s
-        return "row: #{self.row} | key_col: #{self.key_col} | lang_cols: #{self.lang_cols.to_s}"
+        return "row: #{self.row} | key_col: #{self.key_col} | lang_cols: #{self.lang_cols.to_s} | use_export: #{self.use_export}"
       end
     end
 

data/lib/applocale/Util/config_util.rb

@@ -201,12 +201,17 @@ module Applocale
               info_row = infos['row'].to_s.strip
               info_key = infos['key'].to_s.strip
               info_key_str = infos['key_str'].to_s.strip
+              info_use_export = infos["use_export"]
+              if info_use_export.nil?
+                info_use_export = "false"
+              end
+              info_use_export_bool = info_use_export.to_s.downcase == "true"
               if info_row.length > 0 && info_key.length > 0
-                obj = SheetInfoByRow.new(info_row.to_i, info_key, lang_header_key_dict)
+                obj = SheetInfoByRow.new(info_row.to_i, info_key, lang_header_key_dict, info_use_export_bool)
                 sheet = Sheet.new(sheetname,obj)
                 setting.sheet_obj_list.push(sheet)
               elsif info_key_str.length > 0
-                obj = SheetInfoByHeader.new(info_key_str, lang_header_key_dict)
+                obj = SheetInfoByHeader.new(info_key_str, lang_header_key_dict, info_use_export_bool)
                 sheet = Sheet.new(sheetname,obj)
                 setting.sheet_obj_list.push(sheet)
               else

data/lib/applocale/Util/error_util.rb

@@ -41,6 +41,16 @@ module Applocale
       end
     end
 
+    class SheetNotExist < CommonError
+      attr_accessor :sheetname
+      def initialize(sheetname)
+        @sheetname = sheetname
+      end
+      def message
+        "Can't find sheet: #{self.sheetname}"
+      end
+    end
+
     class CannotOpenXlsxFile < CommonError
       attr_accessor :path
       def initialize(path)

data/lib/applocale/version.rb

@@ -1,3 +1,3 @@
 module Applocale
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: applocale
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Kennix
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-27 00:00:00.000000000 Z
+date: 2019-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler