Assets updates! (#1903)

* Return asset url as well * Fix param check in asset retrieval * Add cache-control header
directus · May 18, 2020 · 0f07bd6 · 0f07bd6
1 parent 22cf2e2
commit 0f07bd6
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 11 deletions.
diff --git a/src/core/Directus/Services/AssetService.php b/src/core/Directus/Services/AssetService.php
@@ -98,8 +98,25 @@ public function getAsset($fileHashId, array $params = [], $asStream = false)
 
         $file = $result->current()->toArray();
 
-        // Get original image
-        if (count($params) == 0) {
+        // Get thumbnail
+        if (
+            isset($params['key']) ||
+            isset($params['w']) ||
+            isset($params['h']) ||
+            isset($params['f']) ||
+            isset($params['q'])
+        ) {
+            $this->fileName = $file['filename_disk'];
+            $this->fileNameDownload = $file['filename_download'];
+
+            try {
+                return $this->getThumbnail($params, $asStream);
+            } catch (Exception $e) {
+                throw new UnprocessableEntityException(sprintf($e->getMessage()));
+            }
+        }
+        // Get original file
+        else {
             $lastModified = $this->filesystem->getAdapter()->getTimestamp($file['filename_disk']);
             $lastModified = new DateTimeUtils(date('c', $lastModified));
 
@@ -116,15 +133,6 @@ public function getAsset($fileHashId, array $params = [], $asStream = false)
             $result['filename_download'] = $file['filename_download'];
 
             return $result;
-        } else {
-
-            $this->fileName = $file['filename_disk'];
-            $this->fileNameDownload = $file['filename_download'];
-            try {
-                return $this->getThumbnail($params, $asStream);
-            } catch (Exception $e) {
-                throw new UnprocessableEntityException(sprintf($e->getMessage()));
-            }
         }
     }
 

diff --git a/src/endpoints/Assets.php b/src/endpoints/Assets.php
@@ -7,6 +7,7 @@
 use Directus\Application\Http\Response;
 use Directus\Services\AssetService;
 use Slim\Http\Stream;
+use function Directus\get_directus_setting;
 
 class Assets extends Route
 {
@@ -26,6 +27,12 @@ public function __invoke(Request $request, Response $response)
             $response->setHeader('Content-Disposition', 'filename="' . $asset['filename_download'] . '"');
             $response->setHeader('Last-Modified', $asset['last_modified']);
 
+            $ttl = get_directus_setting('thumbnail_cache_ttl');
+
+            if ($ttl) {
+                $response->setHeader('Cache-Control', 'max-age=' . $ttl . ', public');
+            }
+
             return $response->withBody(new Stream($asset['file']));
         } else {
             return $response->withStatus(404);

diff --git a/src/helpers/file.php b/src/helpers/file.php
@@ -127,16 +127,24 @@ function append_storage_information(array $rows)
             $rows = [$rows];
         }
 
+        $assetURLNaming = get_directus_setting('asset_url_naming');
+        $projectName = get_api_project_from_request();
+        $basepath = get_base_path();
+
         foreach ($rows as &$row) {
             $data = [];
             $ext = pathinfo($row['filename_disk'], PATHINFO_EXTENSION);
 
+            $fileAlias = $assetURLNaming == "private_hash" ? $row['private_hash'] : $row['filename_download'];
+
             if ($proxyDownloads) {
                 $data['url'] = get_proxy_path($row['filename_disk']);
                 $data['full_url'] = get_url($data['url']);
             } else {
                 if (isset($row['private_hash'])) {
                     $data['url'] = $data['full_url'] = $fileRootUrl . '/' . $row['filename_disk'];
+                    $data['asset_url'] = $basepath . $projectName . '/assets/' . $fileAlias;
+
                     // Add Full url
                     if (!$hasFileRootUrlHost) {
                         $data['full_url'] = get_url($data['url']);