kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-19 10:53:37 +00:00
Code Issues Projects Releases Wiki Activity

Code clean up.

Browse Source
This commit is contained in:
James Cole
2017-11-15 12:25:49 +01:00
parent 57dcdfa0c4
commit ffca858b8d
476 changed files with 2055 additions and 4181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,10 +18,8 @@
* You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
declare(strict_types=1);
namespace FireflyIII\Http\Controllers;
use Carbon\Carbon;
@@ -39,9 +37,7 @@ use Response;
use View;
/**
* Class ExportController
*
* @package FireflyIII\Http\Controllers
* Class ExportController.
*/
class ExportController extends Controller
{
@@ -52,7 +48,6 @@ class ExportController extends Controller
{
parent::__construct();
$this->middleware(
function ($request, $next) {
View::share('mainTitleIcon', 'fa-file-archive-o');
@@ -68,6 +63,7 @@ class ExportController extends Controller
* @param ExportJob $job
*
* @return \Illuminate\Contracts\Routing\ResponseFactory|\Symfony\Component\HttpFoundation\Response
*
* @throws FireflyException
*/
public function download(ExportJobRepositoryInterface $repository, ExportJob $job)
@@ -82,7 +78,6 @@ class ExportController extends Controller
}
$content = $repository->getContent($job);
$job->change('export_downloaded');
/** @var LaravelResponse $response */
$response = response($content, 200);
@@ -162,48 +157,35 @@ class ExportController extends Controller
$processor = app(ProcessorInterface::class);
$processor->setSettings($settings);
/*
* Collect journals:
*/
// Collect journals:
$jobs->changeStatus($job, 'export_status_collecting_journals');
$processor->collectJournals();
$jobs->changeStatus($job, 'export_status_collected_journals');
/*
* Transform to exportable entries:
*/
// Transform to exportable entries:
$jobs->changeStatus($job, 'export_status_converting_to_export_format');
$processor->convertJournals();
$jobs->changeStatus($job, 'export_status_converted_to_export_format');
/*
* Transform to (temporary) file:
*/
// Transform to (temporary) file:
$jobs->changeStatus($job, 'export_status_creating_journal_file');
$processor->exportJournals();
$jobs->changeStatus($job, 'export_status_created_journal_file');
/*
* Collect attachments, if applicable.
*/
// Collect attachments, if applicable.
if ($settings['includeAttachments']) {
$jobs->changeStatus($job, 'export_status_collecting_attachments');
$processor->collectAttachments();
$jobs->changeStatus($job, 'export_status_collected_attachments');
}
/*
* Collect old uploads
*/
// Collect old uploads
if ($settings['includeOldUploads']) {
$jobs->changeStatus($job, 'export_status_collecting_old_uploads');
$processor->collectOldUploads();
$jobs->changeStatus($job, 'export_status_collected_old_uploads');
}
/*
* Create ZIP file:
*/
// Create ZIP file:
$jobs->changeStatus($job, 'export_status_creating_zip_file');
$processor->createZipFile();
$jobs->changeStatus($job, 'export_status_created_zip_file');