Refactor file download command

dvlpp · Oct 21, 2015 · 37e8cb8 · 37e8cb8
1 parent 88516af
commit 37e8cb8
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 48 deletions.
diff --git a/resources/assets/js/sharp.commands.js b/resources/assets/js/sharp.commands.js
@@ -149,7 +149,6 @@ function handleCommandReturn_RELOAD() {
 function handleCommandReturn_DOWNLOAD(data) {
     var $dllink = $("#sharp_command_download_link");
 
-    $dllink.prop("href", data.file_path)
-        .prop("download", data.file_name);
+    $dllink.prop("href", $dllink.data("base") + "/" + data.file_path);
     $dllink[0].click();
 }
diff --git a/resources/assets/sharp.form.min.js b/resources/assets/sharp.form.min.js
diff --git a/resources/assets/sharp.ui.js b/resources/assets/sharp.ui.js
@@ -12714,8 +12714,7 @@ function handleCommandReturn_RELOAD() {
 function handleCommandReturn_DOWNLOAD(data) {
     var $dllink = $("#sharp_command_download_link");
 
-    $dllink.prop("href", data.file_path)
-        .prop("download", data.file_name);
+    $dllink.prop("href", $dllink.data("base") + "/" + data.file_path);
     $dllink[0].click();
 };$(window).load(function() {
 

diff --git a/resources/assets/sharp.ui.min.js b/resources/assets/sharp.ui.min.js
diff --git a/resources/views/cms/entitiesList.blade.php b/resources/views/cms/entitiesList.blade.php
@@ -39,7 +39,7 @@
 @section('content')
 
     {{-- Link with HTML5's donwload property used by Download commands --}}
-    <a href="" download="" class="hidden" id="sharp_command_download_link"></a>
+    <a data-base="{{ route("download") }}" download class="hidden" id="sharp_command_download_link"></a>
 
     <table class="table table-responsive table-striped" id="entity-list">
         <thead>

diff --git a/src/Dvlpp/Sharp/Commands/CommandReturnTrait.php b/src/Dvlpp/Sharp/Commands/CommandReturnTrait.php
@@ -41,13 +41,12 @@ public function reload()
     /**
      * Download a file.
      *
-     * @param $fileName
-     * @param $filePath
+     * @param $relativeFilePath
      * @return SharpCommandReturnDownload
      */
-    public function download($fileName, $filePath)
+    public function download($relativeFilePath)
     {
-        return new SharpCommandReturnDownload($fileName, $filePath);
+        return new SharpCommandReturnDownload($relativeFilePath);
     }
 
     /**

diff --git a/src/Dvlpp/Sharp/Commands/ReturnTypes/SharpCommandReturnDownload.php b/src/Dvlpp/Sharp/Commands/ReturnTypes/SharpCommandReturnDownload.php
@@ -4,18 +4,18 @@
 
 class SharpCommandReturnDownload implements SharpCommandReturn
 {
-    private $fileName;
-    private $filePath;
+    /**
+     * @var string
+     */
+    private $relativeFilePath;
 
     /**
      * SharpCommandReturnDownload constructor.
-     * @param $fileName
-     * @param $filePath
+     * @param $relativeFilePath
      */
-    public function __construct($fileName, $filePath)
+    public function __construct($relativeFilePath)
     {
-        $this->fileName = $fileName;
-        $this->filePath = $filePath;
+        $this->relativeFilePath = $relativeFilePath;
     }
 
     /**
@@ -27,8 +27,7 @@ public function get()
     {
         return [
             "type" => "DOWNLOAD",
-            "file_name" => $this->fileName,
-            "file_path" => $this->filePath
+            "file_path" => $this->relativeFilePath
         ];
     }
 }
diff --git a/src/Dvlpp/Sharp/Http/UploadController.php b/src/Dvlpp/Sharp/Http/UploadController.php
@@ -2,12 +2,17 @@
 
 namespace Dvlpp\Sharp\Http;
 
+use Illuminate\Filesystem\FilesystemManager;
 use Illuminate\Http\Request;
 use Illuminate\Contracts\Filesystem\FileNotFoundException;
 
 class UploadController extends Controller
 {
 
+    /**
+     * @param Request $request
+     * @return \Illuminate\Http\JsonResponse
+     */
     public function upload(Request $request)
     {
         try {
@@ -20,32 +25,23 @@ public function upload(Request $request)
         }
     }
 
-    public function uploadWithThumbnail(Request $request)
-    {
-        return $this->upload($request);
-//        try {
-//            $tab = $this->uploadFile($request);
-//
-//            // Manage thumbnail creation
-//            $tab["thumbnail"] = sharp_thumbnail(
-//                $tab["path"],
-//                $request->get("thumbnail_height"),
-//                $request->get("thumbnail_width")
-//            );
-//
-//            return response()->json(["file" => $tab]);
-//
-//        } catch (\Exception $e) {
-//            return response()->json(["err" => $e->getMessage()]);
-//        }
-
-    }
-
+    /**
+     * @param $fileShortPath
+     * @return \Symfony\Component\HttpFoundation\BinaryFileResponse
+     */
     public function download($fileShortPath)
     {
-        $relativeFilePath = config("sharp.upload_storage_base_path") . '/' . $fileShortPath;
+        if(strstr($fileShortPath, ":")) {
+            list($disk, $path) = explode(":", $fileShortPath);
+        } else {
+            $disk = config("sharp.upload_storage_disk");
+            $path = $fileShortPath;
+        }
 
-        return response()->download(get_file_path($relativeFilePath), basename($relativeFilePath));
+        return response()->download(
+            get_file_path($path, $disk),
+            basename($path)
+        );
     }
 
     private function uploadFile(Request $request)

diff --git a/src/routes.php b/src/routes.php
@@ -81,10 +81,6 @@
         "as" => "upload",
         "uses" => '\Dvlpp\Sharp\Http\UploadController@upload'
     ]);
-    Route::post('/admin/uploadWithThumbnail', [
-        "as" => "uploadWithThumbnail",
-        "uses" => '\Dvlpp\Sharp\Http\UploadController@uploadWithThumbnail'
-    ]);
     Route::get('/admin/download/{file?}', [
         "as" => "download",
         "uses" => '\Dvlpp\Sharp\Http\UploadController@download'