From c1cb4c3b4f8a023e8afbc6cac61aa2599c09fb95 Mon Sep 17 00:00:00 2001 From: Pawel Trauth Date: Wed, 12 Jun 2019 17:57:45 +0100 Subject: [PATCH 1/2] add support for folders --- src-php/Adapters/CloudinaryAdapter.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src-php/Adapters/CloudinaryAdapter.php b/src-php/Adapters/CloudinaryAdapter.php index 8530d01..63e9f00 100644 --- a/src-php/Adapters/CloudinaryAdapter.php +++ b/src-php/Adapters/CloudinaryAdapter.php @@ -19,11 +19,13 @@ class CloudinaryAdapter extends CloudinaryBaseAdapter */ public function writeStream($path, $resource, Config $config) { - $path = pathinfo($path)['filename']; + $pathinfo = pathinfo($path); + $folder = $pathinfo['dirname']; + $path = $pathinfo['filename']; $resource_metadata = stream_get_meta_data($resource); - $uploaded_metadata = Uploader::upload($resource_metadata['uri'], ['public_id' => $path, 'resource_type' => 'auto']); - + $uploaded_metadata = Uploader::upload($resource_metadata['uri'], ['folder' => $folder, 'public_id' => $path, 'resource_type' => 'auto']); + return $uploaded_metadata; } From 470a51dc184facc7ba82ed8df4ab6a2a59bdd258 Mon Sep 17 00:00:00 2001 From: eithed Date: Wed, 12 Jun 2019 18:49:48 +0100 Subject: [PATCH 2/2] cater for default folder being / (#1) --- src-php/Adapters/CloudinaryAdapter.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src-php/Adapters/CloudinaryAdapter.php b/src-php/Adapters/CloudinaryAdapter.php index 63e9f00..6212ff5 100644 --- a/src-php/Adapters/CloudinaryAdapter.php +++ b/src-php/Adapters/CloudinaryAdapter.php @@ -23,8 +23,14 @@ public function writeStream($path, $resource, Config $config) $folder = $pathinfo['dirname']; $path = $pathinfo['filename']; + $options = ['public_id' => $path, 'resource_type' => 'auto']; + + if ($folder != '.') { + $options['folder'] = $folder; + } + $resource_metadata = stream_get_meta_data($resource); - $uploaded_metadata = Uploader::upload($resource_metadata['uri'], ['folder' => $folder, 'public_id' => $path, 'resource_type' => 'auto']); + $uploaded_metadata = Uploader::upload($resource_metadata['uri'], $options); return $uploaded_metadata; }