lib/s3_website/uploader.rb in s3_website-1.0.2 vs lib/s3_website/uploader.rb in s3_website-1.0.3
- old
+ new
@@ -40,11 +40,11 @@
end
def self.upload_files(s3, config, site_dir)
changed_files, new_files = DiffHelper.resolve_files_to_upload(
s3.buckets[config['s3_bucket']], site_dir)
- to_upload = changed_files + new_files
+ to_upload = (changed_files + new_files).reject { |f| Upload.is_blacklisted f }
if to_upload.empty?
puts "No new or changed files to upload"
else
pre_upload_report = []
pre_upload_report << "Uploading"
@@ -58,10 +58,10 @@
[new_files.length, changed_files.length, changed_files]
end
def self.upload_in_parallel_or_sequentially(files_to_upload, s3, config, site_dir)
Parallelism.each_in_parallel_or_sequentially(files_to_upload) { |f|
- upload_file(f, s3, config, site_dir) unless Upload.is_blacklisted f
+ upload_file(f, s3, config, site_dir)
}
end
def self.upload_file(file, s3, config, site_dir)
Retry.run_with_retry do