takenoko 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39ca231501ec0feba93d7146fc736cbd4f907635
-  data.tar.gz: 504e85423e7f106b30a319031af27dbb74a3dadb
+  metadata.gz: f220dcc9791b09c92522d4e1d39e5bd4310761d5
+  data.tar.gz: 77ba082e4d9f2f4a5a5f3ee5485e272b033e4068
 SHA512:
-  metadata.gz: 9e5a4736e99b58b0c715768aba5e0f08e7478d6cf86b23173457496a54a0d90aa0461ca5384a055599fa890a9ded8ad71963e406c4ace05232c3c48f3c06f049
-  data.tar.gz: 55538bd7f9260ce5da22304b3cca49721db312d677f93fdb688f30acf59a95647021724b2e061cae60cbf3e0aad4bd4cf19200ce922d25a8fe3359702da32ebf
+  metadata.gz: 88cee4436b2d04ecb36c4773d165a76b998ff6af1a7081446d632472cdc62228eb9fd1c9fc26dd0277b95f6a0cc237a911f0cd3ac4962fa6fd3afe6cd6507c95
+  data.tar.gz: bc883341f1d73fe9e6336d8d984060a2cccb64b240094bf5f1055cb6c7657852a73ab435c4ab4d8d776352cac5311934b9d69816cc59402976e7e79a989e23a9

data/lib/takenoko/attach_helper.rb

@@ -2,11 +2,24 @@ module Takenoko
   module AttachHelper
     extend self
     def download(table_data)
+      errors = []
+      table_name = table_data[:table_name]
+      takelog = "#{Takenoko.log_folder}/#{table_name}_log.yml"
+      log_data = (File.exist?(takelog) && YAML.load_file(takelog)) || {}
+
       table_data[:attach_files].each do |col|
-        raise "Folder ID should be set" unless (folder_id = col[:folder_id] || table[:folder_id]).present?
+        unless (folder_id = col[:folder_id] || table[:folder_id]).present?
+          errors << "Folder ID should be set"
+          next
+        end
+
         column_name = col[:column_name]
-        raise "Column #{column_name} not found" unless table_data[:header].include?(column_name)
-        Rails.logger.info "Downloading file form table #{table_data[:table_name]}"
+        unless table_data[:header].include?(column_name)
+          errors << "Column #{column_name} not found"
+          next
+        end
+
+        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]
@@ -14,12 +27,22 @@ module Takenoko
         table_data[:rows].each do |row|
           next if row[column_name].blank?
           file_name = File.basename(row[column_name])
-          raise "File: '#{file_name}' not found" unless file = folder.file_by_title(file_name)
+          unless file = folder.file_by_title(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]
+
           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 
         end
       end
+      File.open(takelog, 'w') {|f| f.write log_data.to_yaml }
+      raise errors.join("\n") unless errors.empty?
       return true
     end
   end

data/lib/takenoko/version.rb

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

data/lib/takenoko.rb

@@ -45,6 +45,10 @@ module Takenoko
   mattr_accessor :download_location
   @@download_location = "tmp/attach_files"
 
+
+  mattr_writer :log_folder
+  @@log_folder = "tmp/takenoko"
+
   mattr_accessor :folder_id
   @@folder_id = nil
 
@@ -57,6 +61,10 @@ module Takenoko
     yield self
   end
 
+  def log_folder
+    FileUtils.mkdir_p(@@log_folder) unless File.directory?(@@log_folder)
+    @@log_folder
+  end
   def google_client
     @@google_client ||= GoogleClient.new(google_cridential_file)
     return @@google_client
@@ -84,10 +92,17 @@ module Takenoko
   end
 
   def download_all_files
+    errors = []
     mapping_config[:tables].each do |table,conf|
       next if conf[:attach_files].blank?
-      download_table_files table
+      begin
+        download_table_files table
+      rescue Exception => e
+        errors << e.to_s
+      end
     end
+    raise errors.join("\n") unless errors.empty?
+    
     return true
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: takenoko
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - KhiemNS
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-15 00:00:00.000000000 Z
+date: 2016-10-18 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.4
+homepage: https://github.com/khiemns54/takenoko/tree/release/0.2.5
 licenses: []
 metadata: {}
 post_install_message: