Merge pull request #1 from aryehraber/master

Download CSV file directly without temporarily saving in storage
goellner · Apr 22, 2018 · 6af364e · 6af364e
2 parents b40d450 + a457397
commit 6af364e
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 48 deletions.
diff --git a/Exportit/ExportitController.php b/Exportit/ExportitController.php
@@ -2,14 +2,14 @@
 
 namespace Statamic\Addons\Exportit;
 
-use Statamic\Extend\Controller;
-use Statamic\API\Collection;
-use Statamic\API\Fieldset;
-use Statamic\API\Entry;
-use SplTempFileObject;
+use Carbon\Carbon;
 use League\Csv\Writer;
-use Statamic\API\File;
+use SplTempFileObject;
+use Statamic\API\Entry;
+use Statamic\API\Fieldset;
+use Statamic\API\Collection;
 use Illuminate\Http\Response;
+use Statamic\Extend\Controller;
 
 class ExportitController extends Controller
 {
@@ -20,36 +20,25 @@ class ExportitController extends Controller
      *
      * @return mixed
      */
-    public function index() {
-
-
+    public function index()
+    {
         return $this->view('index');
     }
 
-    public function exportdata() {
-        $handle = $_POST['selectedcollection'];
+    public function exportdata()
+    {
+        $handle = request('selectedcollection');
+        $filename = slugify("{$handle}-".Carbon::now()->timestamp);
 
         $this->writer = Writer::createFromFileObject(new SplTempFileObject);
 
         $this->insertHeaders($handle);
         $this->insertData($handle);
 
-        // TODO: Don't save to storage, start immediate download instead.
-        $document = File::disk('storage');
-        $document->put('exportit.csv', $this->writer);
-
-        $data = [
-            'csv' => $this->writer
-        ];
-        return $this->view('exportdata');
-
-
-    }
-
-    public function download() {
-        $document = File::disk('storage');
-        $file = $document->get('exportit.csv');
-        return response($file)->header('Content-Type', 'text/csv')->header('Content-Disposition', 'attachment; filename="exportit.csv"');
+        return response((string) $this->writer, 200, [
+            'Content-type' => 'text/csv',
+            'Content-Disposition' => "attachment; filename={$filename}.csv",
+        ]);
     }
 
     // Creates and inserts CSV Header based on collection fieldset
@@ -63,7 +52,7 @@ private function insertHeaders($handle)
         $header_data = array_keys($fieldset_content);
 
         // Adding title field, since it is not defined in fieldset
-        array_unshift($header_data, 'title' );
+        array_unshift($header_data, 'title');
 
         $this->csv_header = $header_data;
 
@@ -78,30 +67,28 @@ private function insertData($handle)
         $collectiondata = Entry::whereCollection($handle);
 
         $data = collect($collectiondata)->map(function ($entry) use ($header_data) {
-
-            $ret = array();
+            $ret = [];
             $entry = $entry->toArray();
 
             foreach ($header_data as $key => $value) {
-                if(array_key_exists($value, $entry)) {
+                if (array_key_exists($value, $entry)) {
                     // convert entry array to pipe delimited string
                     $entry_value = '';
-                    if(is_array($entry[$value])) {
+                    if (is_array($entry[$value])) {
                         $entry_value = implode('|', $entry[$value]);
                     } else {
                         $entry_value = $entry[$value];
                     }
 
                     $ret[] = $entry_value;
-                }
-                else {
+                } else {
                     $ret[] = '';
                 }
             }
+
             return $ret;
         })->toArray();
 
         $this->writer->insertAll($data);
-
     }
 }
diff --git a/Exportit/meta.yaml b/Exportit/meta.yaml
@@ -1,5 +1,5 @@
 name: exportit
-version: "1.0"
+version: 1.1
 description: Exports Data from a Collection to CSV
 developer: Stefan Göllner
 developer_url: https://www.goellner.io/
diff --git a/Exportit/resources/views/exportdata.blade.php b/Exportit/resources/views/exportdata.blade.php
diff --git a/Exportit/resources/views/index.blade.php b/Exportit/resources/views/index.blade.php
@@ -1,7 +1,7 @@
 @extends('layout')
 
 @section('content')
-    <form action="{{ route('exportit.exportdata') }}" method="post">
+    <form method="POST">
         {{ csrf_field() }}
 
         <div class="card flush flat-bottom">

diff --git a/Exportit/routes.yaml b/Exportit/routes.yaml
@@ -2,9 +2,6 @@ routes:
   /:
     as: addons.exportit
     uses: index
-  post@exportdata:
+  post@/:
     uses: exportdata
     as: exportit.exportdata
-  download:
-    uses: download
-    as: exportit.download