IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-11-30 12:43:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

#193

Browse Source
This commit is contained in:
James Cole 2016-02-25 15:04:17 +01:00
parent 9b23cbd2c2
commit 6858d67897
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/Http/Controllers/ExportController.php
View File

@ -13,6 +13,7 @@ namespace FireflyIII\Http\Controllers;
use Carbon\Carbon; use Carbon\Carbon;
use Config; use Config;
use ExpandedForm; use ExpandedForm;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Export\Processor; use FireflyIII\Export\Processor;
use FireflyIII\Http\Requests; use FireflyIII\Http\Requests;
use FireflyIII\Http\Requests\ExportFormRequest; use FireflyIII\Http\Requests\ExportFormRequest;
@ -22,6 +23,7 @@ use FireflyIII\Repositories\ExportJob\ExportJobRepositoryInterface as EJRI;
use Log; use Log;
use Preferences; use Preferences;
use Response; use Response;
use Storage;
use View; use View;
/** /**
@ -43,18 +45,27 @@ class ExportController extends Controller
/** /**
* @param ExportJob $job * @param ExportJob $job
*
* @return mixed
* @throws FireflyException
*/ */
public function download(ExportJob $job) public function download(ExportJob $job)
{ {
$file = storage_path('export') . DIRECTORY_SEPARATOR . $job->key . '.zip'; $disk = Storage::disk('export');
$file = $job->key . '.zip';
$date = date('Y-m-d \a\t H-i-s'); $date = date('Y-m-d \a\t H-i-s');
$name = 'Export job on ' . $date . '.zip'; $name = 'Export job on ' . $date . '.zip';
$quoted = sprintf('"%s"', addcslashes($name, '"\\')); $quoted = sprintf('"%s"', addcslashes($name, '"\\'));
if (!$disk->exists($file)) {
throw new FireflyException('Against all expectations, zip file "' . $file . '" does not exist.');
}
$job->change('export_downloaded'); $job->change('export_downloaded');
Log::debug('Will send user file "' . $file . '".'); Log::debug('Will send user file "' . $file . '".');
return response(file_get_contents($file), 200) return response($disk->get($file), 200)
->header('Content-Description', 'File Transfer') ->header('Content-Description', 'File Transfer')
->header('Content-Type', 'application/octet-stream') ->header('Content-Type', 'application/octet-stream')
->header('Content-Disposition', 'attachment; filename=' . $quoted) ->header('Content-Disposition', 'attachment; filename=' . $quoted)