codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-28 01:56:01 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3096 from techAPJ/patch-1

Browse source 
gzip csv export files
This commit is contained in:
Régis Hanol 2015-01-14 09:23:15 +01:00
commit b34ef26f90
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/jobs/regular/export_csv_file.rb
View file

@ -288,12 +288,14 @@ module Jobs
csv << value csv << value
end end
end end
# compress CSV file
`gzip --best #{File.expand_path("#{UserExport.base_directory}/#{@file_name}", __FILE__)}`
end end
def notify_user def notify_user
if @current_user if @current_user
if @file_name != "" && File.exists?("#{UserExport.base_directory}/#{@file_name}") if @file_name != "" && File.exists?("#{UserExport.base_directory}/#{@file_name}.gz")
SystemMessage.create_from_system_user(@current_user, :csv_export_succeeded, download_link: "#{Discourse.base_url}/export_csv/#{@file_name}", file_name: @file_name) SystemMessage.create_from_system_user(@current_user, :csv_export_succeeded, download_link: "#{Discourse.base_url}/export_csv/#{@file_name}.gz", file_name: "#{@file_name}.gz")
else else
SystemMessage.create_from_system_user(@current_user, :csv_export_failed) SystemMessage.create_from_system_user(@current_user, :csv_export_failed)
end end

6
spec/controllers/export_csv_controller_spec.rb
View file

@ -1,7 +1,7 @@
require "spec_helper" require "spec_helper"
describe ExportCsvController do describe ExportCsvController do
let(:export_filename) { "user-archive-999.csv" } let(:export_filename) { "user-archive-999.csv.gz" }
context "while logged in as normal user" do context "while logged in as normal user" do
@ -30,7 +30,7 @@ describe ExportCsvController do
describe ".download" do describe ".download" do
it "uses send_file to transmit the export file" do it "uses send_file to transmit the export file" do
file = UserExport.create(export_type: "user", user_id: @user.id) file = UserExport.create(export_type: "user", user_id: @user.id)
file_name = "user-archive-#{file.id}.csv" file_name = "user-archive-#{file.id}.csv.gz"
controller.stubs(:render) controller.stubs(:render)
export = UserExport.new() export = UserExport.new()
UserExport.expects(:get_download_path).with(file_name).returns(export) UserExport.expects(:get_download_path).with(file_name).returns(export)
@ -74,7 +74,7 @@ describe ExportCsvController do
describe ".download" do describe ".download" do
it "uses send_file to transmit the export file" do it "uses send_file to transmit the export file" do
file = UserExport.create(export_type: "admin", user_id: @admin.id) file = UserExport.create(export_type: "admin", user_id: @admin.id)
file_name = "screened-email-#{file.id}.csv" file_name = "screened-email-#{file.id}.csv.gz"
controller.stubs(:render) controller.stubs(:render)
export = UserExport.new() export = UserExport.new()
UserExport.expects(:get_download_path).with(file_name).returns(export) UserExport.expects(:get_download_path).with(file_name).returns(export)