Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix uploads in dynamic folder mode #18

Closed
wants to merge 4 commits into from
Closed

Fix uploads in dynamic folder mode #18

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f7fb0d9
fix: get the asset_folder when dynamic folders are enabled
jorisnoo Nov 9, 2024
ec42c9e
fix: get the asset_folder in rename hook when dynamic folders are ena…
jorisnoo Nov 9, 2024
4ec60f2
refactor: use match since php 8 is a requirement
jorisnoo Nov 9, 2024
7ffc415
fix: get asset_folder in delete hook
jorisnoo Nov 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 24 additions & 17 deletions src/controllers/NotificationsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,18 +61,19 @@ public function actionProcess(): Response
// Process notification
$notificationType = $this->request->getRequiredBodyParam('notification_type');
$baseFolder = App::parseEnv($fs->baseFolder);
$hasDynamicFolders = $fs->hasDynamicFolders;

switch ($notificationType) {
case 'create_folder':
return $this->_processCreateFolder($volumeId, $baseFolder);
case 'delete_folder':
return $this->_processDeleteFolder($volumeId, $baseFolder);
case 'upload':
return $this->_processUpload($volumeId, $baseFolder);
return $this->_processUpload($volumeId, $baseFolder, $hasDynamicFolders);
case 'delete':
return $this->_processDelete($volumeId, $baseFolder);
case 'rename':
return $this->_processRename($volumeId, $baseFolder);
return $this->_processRename($volumeId, $baseFolder, $hasDynamicFolders);
default:
return $this->asSuccess();
}
Expand All @@ -98,11 +99,11 @@ private function _processCreateFolder($volumeId, $baseFolder): Response
'volumeId' => $volumeId,
'path' => $path . '/',
]);

if ($existingFolderQuery->exists()) {
return $this->asSuccess();
}

// Get parent folder ID
$parentId = (new Query())
->select('id')
Expand Down Expand Up @@ -146,11 +147,14 @@ private function _processDeleteFolder($volumeId, $baseFolder): Response
return $this->asSuccess();
}

private function _processUpload($volumeId, $baseFolder): Response
private function _processUpload($volumeId, $baseFolder, bool $hasDynamicFolders = false): Response
{
$publicId = $this->request->getRequiredBodyParam('public_id');
$folder = $this->request->getRequiredBodyParam('folder');
$size = $this->request->getRequiredBodyParam('bytes');
$folder = match ($hasDynamicFolders) {
true => $this->request->getRequiredBodyParam('asset_folder'),
false => $this->request->getRequiredBodyParam('folder'),
};

if (!empty($baseFolder)) {
if ($folder !== $baseFolder && !str_starts_with($folder, $baseFolder . '/')) {
Expand All @@ -174,7 +178,7 @@ private function _processUpload($volumeId, $baseFolder): Response
$filename = basename($publicId);

$resourceType = $this->request->getRequiredBodyParam('resource_type');

if ($resourceType !== 'raw') {
$format = $this->request->getRequiredBodyParam('format');

Expand Down Expand Up @@ -210,27 +214,27 @@ private function _processUpload($volumeId, $baseFolder): Response
$asset->width = $this->request->getRequiredBodyParam('width');
$asset->height = $this->request->getRequiredBodyParam('height');
}

$asset->setScenario(Asset::SCENARIO_INDEX);
Craft::$app->getElements()->saveElement($asset);

return $this->asSuccess();
}

private function _processDelete($volumeId, $baseFolder): Response
private function _processDelete($volumeId, $baseFolder, bool $hasDynamicFolders): Response
{
$resources = $this->request->getRequiredBodyParam('resources');

foreach ($resources as $resource) {
$resourceType = $resource['resource_type'];
$publicId = $resource['public_id'];
$folder = $resource['folder'];
$folder = $hasDynamicFolders ? $resource['asset_folder'] : $resource['folder'];

if (!empty($baseFolder)) {
if ($folder !== $baseFolder && !str_starts_with($folder, $baseFolder . '/')) {
return $this->asSuccess();
}

$folder = substr($folder, strlen($baseFolder) + 1);
}

Expand All @@ -240,7 +244,7 @@ private function _processDelete($volumeId, $baseFolder): Response
$assetQuery = Asset::find()
->volumeId($volumeId)
->folderPath($folderPath);

if ($resourceType === 'raw') {
$assetQuery->filename($filename);
} else {
Expand All @@ -253,7 +257,7 @@ private function _processDelete($volumeId, $baseFolder): Response
}

$asset = $assetQuery->one();

if ($asset !== null) {
Craft::$app->getElements()->deleteElement($asset);
}
Expand All @@ -262,13 +266,16 @@ private function _processDelete($volumeId, $baseFolder): Response
return $this->asSuccess();
}

private function _processRename($volumeId, $baseFolder): Response
private function _processRename($volumeId, $baseFolder, bool $hasDynamicFolders = false): Response
{
$resourceType = $this->request->getRequiredBodyParam('resource_type');
$fromPublicId = $this->request->getRequiredBodyParam('from_public_id');
$toPublicId = $this->request->getRequiredBodyParam('to_public_id');
$folder = $this->request->getRequiredBodyParam('folder');

$folder = match ($hasDynamicFolders) {
true => $this->request->getRequiredBodyParam('asset_folder'),
false => $this->request->getRequiredBodyParam('folder'),
};

$fromFilename = basename($fromPublicId);
$fromFolder = dirname($fromPublicId);
$fromFolderPath = $fromFolder === '.' ? '' : $fromFolder . '/';
Expand All @@ -291,7 +298,7 @@ private function _processRename($volumeId, $baseFolder): Response
$assetQuery = Asset::find()
->volumeId($volumeId)
->folderPath($fromFolderPath);

if ($resourceType === 'raw') {
$assetQuery->filename($fromFilename);
} else {
Expand Down