takenoko 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f220dcc9791b09c92522d4e1d39e5bd4310761d5
-  data.tar.gz: 77ba082e4d9f2f4a5a5f3ee5485e272b033e4068
+  metadata.gz: f9585a154baef8437a43f497bc18de665f1824fc
+  data.tar.gz: 8dab39802e20d59c6e97177d6916bb21af10a58a
 SHA512:
-  metadata.gz: 88cee4436b2d04ecb36c4773d165a76b998ff6af1a7081446d632472cdc62228eb9fd1c9fc26dd0277b95f6a0cc237a911f0cd3ac4962fa6fd3afe6cd6507c95
-  data.tar.gz: bc883341f1d73fe9e6336d8d984060a2cccb64b240094bf5f1055cb6c7657852a73ab435c4ab4d8d776352cac5311934b9d69816cc59402976e7e79a989e23a9
+  metadata.gz: 3987057c1ee11165f6e757ddedc808f9764cfb2c3281320406a34a203414048af4e32368f511d94985853300c12666e35ba513841089b50a78aeb88f1cea1c1a
+  data.tar.gz: 9cd9bb7943f4a9583229c8e8c8131c9c0917291cfa620c3217bf5b26613a0267749ae60b28519da8f2dbd92b613cc8b844c9da42408408d14c10ec71eb5a4cfd

data/lib/takenoko/attach_helper.rb

@@ -6,7 +6,7 @@ module Takenoko
       table_name = table_data[:table_name]
       takelog = "#{Takenoko.log_folder}/#{table_name}_log.yml"
       log_data = (File.exist?(takelog) && YAML.load_file(takelog)) || {}
-
+      folders = {}
       table_data[:attach_files].each do |col|
         unless (folder_id = col[:folder_id] || table[:folder_id]).present?
           errors << "Folder ID should be set"
@@ -22,28 +22,44 @@ module Takenoko
         Rails.logger.info "Downloading file form table #{table_name}"
         download_location = col[:download_location]
         FileUtils.mkdir_p(download_location) unless File.directory?(download_location)
-        folder = Takenoko.google_client.folder_by_id col[:folder_id]
+
+        unless ls_files = folders[col[:folder_id]]
+          ls_files = folders[col[:folder_id]] = get_drive_files_list Takenoko.google_client.folder_by_id col[:folder_id]
+        end
 
         table_data[:rows].each do |row|
           next if row[column_name].blank?
           file_name = File.basename(row[column_name])
-          unless file = folder.file_by_title(file_name)
+          unless file = ls_files[file_name]
             errors << "Table[#{table_name}] - File: '#{file_name}' not found"
             next
           end
           full_path_name = download_location+"/"+file_name
-          find_col = row[table_data[:find_column]]
-          next if File.exist?(full_path_name) && log_data[find_col].present? && file.modified_date.to_i <= log_data[find_col][:last_modified]
+          log_key = "#{col[:folder_id]}_#{file_name}"
+          next if File.exist?(full_path_name) && log_data[log_key].present? && file.modified_date.to_i <= log_data[log_key][:last_modified]
 
           file.download_to_file(full_path_name)
           Rails.logger.info "Downloaded file: #{full_path_name}"
-          log_data[find_col] ||= {}
-          log_data[find_col][:last_modified] = file.modified_date.to_i 
+          log_data[log_key] ||= {}
+          log_data[log_key][:last_modified] = file.modified_date.to_i 
         end
       end
       File.open(takelog, 'w') {|f| f.write log_data.to_yaml }
       raise errors.join("\n") unless errors.empty?
       return true
     end
+
+    #Get all file from drive folder
+    def get_drive_files_list(folder)
+      ls = Hash.new
+      page_token = nil
+      begin
+        (files, page_token) = folder.files("pageToken" => page_token)
+        files.each do |f|
+          ls[f.original_filename] = f
+        end
+      end while page_token
+      return ls
+    end
   end
 end

data/lib/takenoko/version.rb

@@ -1,3 +1,3 @@
 module Takenoko
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: takenoko
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - KhiemNS
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-18 00:00:00.000000000 Z
+date: 2016-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -89,7 +89,7 @@ files:
 - lib/tasks/takenoko.rake
 - test/takenoko_test.rb
 - test/test_helper.rb
-homepage: https://github.com/khiemns54/takenoko/tree/release/0.2.5
+homepage: https://github.com/khiemns54/takenoko/tree/release/0.2.6
 licenses: []
 metadata: {}
 post_install_message: