Skip to content

[4.1] Add some events when fetching media data #35396

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

Merged
merged 22 commits into from
Dec 16, 2021
Merged

[4.1] Add some events when fetching media data #35396

Changes from 2 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
e5dc8dd
Add some events when fetching media data
laoneo Aug 27, 2021
40c3b81
Use dispatcher to trigger event
laoneo Sep 4, 2021
21be8a4
Use an event instance
laoneo Sep 6, 2021
ba56707
Class per event (#15)
Fedik Sep 6, 2021
f544fd5
Argument validations and getter (#16)
Fedik Sep 6, 2021
e0f5a2d
Use result from events
laoneo Sep 7, 2021
47dd968
Copy year
laoneo Sep 7, 2021
ec8b4c8
Use internal variable
laoneo Sep 29, 2021
1883728
Merge remote-tracking branch 'upstream/4.0-dev' into j4/mm/file/events
laoneo Sep 29, 2021
ccd02cb
void
laoneo Sep 29, 2021
9a2a119
adapt model
laoneo Sep 29, 2021
c3a4902
Validate events (#17)
HLeithner Oct 6, 2021
8d953b3
Merge remote-tracking branch 'upstream/4.0-dev' into j4/mm/file/events
laoneo Oct 18, 2021
8c336d4
Merge remote-tracking branch 'upstream/4.0-dev' into j4/mm/file/events
laoneo Oct 18, 2021
d9fc94e
Update administrator/components/com_media/src/Event/FetchMediaFileEve…
laoneo Nov 10, 2021
c738788
Update administrator/components/com_media/src/Event/FetchMediaFilesEv…
laoneo Nov 10, 2021
2c1064d
Rename the events
laoneo Nov 16, 2021
36971b4
Merge remote-tracking branch 'upstream/4.0-dev' into j4/mm/file/events
laoneo Dec 1, 2021
c42a582
Cleanup events
laoneo Dec 1, 2021
da28f96
Merge branch '4.1-dev' into j4/mm/file/events
laoneo Dec 11, 2021
f30359e
Merge branch '4.1-dev' into j4/mm/file/events
laoneo Dec 16, 2021
eba1745
Merge branch '4.1-dev' into j4/mm/file/events
laoneo Dec 16, 2021
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
28 changes: 26 additions & 2 deletions administrator/components/com_media/src/Model/ApiModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
use Joomla\Component\Media\Administrator\Exception\FileNotFoundException;
use Joomla\Component\Media\Administrator\Exception\InvalidPathException;
use Joomla\Component\Media\Administrator\Provider\ProviderManager;
use Joomla\Event\Event;

/**
* Api Model
Expand Down Expand Up @@ -116,6 +117,11 @@ public function getFile($adapter, $path = '/', $options = [])
$file->path = $adapter . ":" . $file->path;
$file->adapter = $adapter;

Factory::getApplication()->getDispatcher()->dispatch(
'onFetchMediaFile',
new Event('onFetchMediaFile', [$file])
);

return $file;
}

Expand Down Expand Up @@ -178,8 +184,15 @@ public function getFiles($adapter, $path = '/', $options = [])
$file->adapter = $adapter;
}

$files = array_values($files);

Factory::getApplication()->getDispatcher()->dispatch(
'onFetchMediaFiles',
new Event('onFetchMediaFiles', [$files])
);

// Return array with proper indexes
return array_values($files);
return $files;
}

/**
Expand Down Expand Up @@ -454,7 +467,18 @@ public function getUrl($adapter, $path)
throw new InvalidPathException;
}

return $this->getAdapter($adapter)->getUrl($path);
$url = $this->getAdapter($adapter)->getUrl($path);
$newUrl = Factory::getApplication()->getDispatcher()->dispatch(
'onFetchMediaFileUrl',
new Event('onFetchMediaFileUrl', [$url])
);

if ($newUrl && $newUrl !== false)
{
$url = $newUrl;
}

return $url;
}

/**
Expand Down