From d65fcdc312f92d384f215d9664b0d472e5790142 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Zrim=C5=A1ek?= Date: Wed, 7 Nov 2018 06:56:05 +0100 Subject: [PATCH] Change datetime to human friendly format for ZIP exports [SCI-2817] --- app/models/team_zip_export.rb | 5 +++-- app/models/zip_export.rb | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/models/team_zip_export.rb b/app/models/team_zip_export.rb index a825da57e..ab3c0fa6b 100644 --- a/app/models/team_zip_export.rb +++ b/app/models/team_zip_export.rb @@ -19,11 +19,12 @@ class TeamZipExport < ZipExport def generate_exportable_zip(user, data, type, options = {}) @user = user zip_input_dir = FileUtils.mkdir_p( - File.join(Rails.root, "tmp/temp-zip-#{Time.now.to_i}") + File.join(Rails.root, "tmp/temp_zip_#{Time.now.to_i}") ).first zip_dir = FileUtils.mkdir_p(File.join(Rails.root, 'tmp/zip-ready')).first zip_file = File.new( - File.join(zip_dir, "projects-export-#{Time.now.to_i}.zip"), + File.join(zip_dir, + "projects_export_#{Time.now.strftime('%F_%H-%M-%S')}.zip"), 'w+' ) fill_content(zip_input_dir, data, type, options) diff --git a/app/models/zip_export.rb b/app/models/zip_export.rb index b59dc7eab..dfcee2d77 100644 --- a/app/models/zip_export.rb +++ b/app/models/zip_export.rb @@ -50,11 +50,11 @@ class ZipExport < ApplicationRecord def generate_exportable_zip(user, data, type, options = {}) zip_input_dir = FileUtils.mkdir_p( - File.join(Rails.root, "tmp/temp-zip-#{Time.now.to_i}") + File.join(Rails.root, "tmp/temp_zip_#{Time.now.to_i}") ).first zip_dir = FileUtils.mkdir_p(File.join(Rails.root, 'tmp/zip-ready')).first zip_file = File.new( - File.join(zip_dir, "export-#{Time.now.to_i}.zip"), + File.join(zip_dir, "export_#{Time.now.strftime('%F %H-%M-%S')}.zip"), 'w+' ) fill_content(zip_input_dir, data, type, options)