Skip to content

Fix file usages not working for s3 files. #65

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

Open
nmdaz wants to merge 2 commits into
base: 8.1.x
Choose a base branch
from
Open

Fix file usages not working for s3 files. #65

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2300b13
Fix file usages not working for s3 files.
Apr 16, 2026
1fb4e7c
Fix file usage on scenario where all files are remove on a page.
Apr 17, 2026
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
25 changes: 20 additions & 5 deletions src/Plugin/Usage/FileUsage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public function __construct(

// This regex now handles spaces in filenames.
$this->uriRegex = '/(?<!"preview_image":{"id":")((' . implode('|', array_keys($this->wrappers)) . '):\/\/(.*?)\.(.*?))([\s|:"*?<>|\\\\]|$)/m';
$this->mediaReferenceRegex = '/\[media-reference:file:(.*?)\]/m';
$this->mediaReferenceRegex = '#(?:<img[^>]*data-entity-uuid=\\\"([^"]+)\\\"[^>]*src=\\\"([^"]+)\\\"|\[media-reference:file:([^\]]+)\])#i';
$this->fileRepository = $fileRepository;
}

Expand Down Expand Up @@ -187,6 +187,16 @@ private function getFileEntityByUuid($uuid) {
private function registerCoreFileUsage($files, EntityInterface $entity) {

if ($entity->id() && strlen($entity->id()) < 32) {

// Load previously referenced file IDs so we can invalidate their cache.
$existingFids = $this->connection->select('file_usage', 'fu')
->fields('fu', ['fid'])
->condition('module', 'cohesion')
->condition('type', $entity->getEntityTypeId())
->condition('id', $entity->id())
->execute()
->fetchCol();

// Remove 'cohesion' registered usage of all files for scanned entity.
try {
$this->connection->delete('file_usage')
Expand All @@ -199,6 +209,14 @@ private function registerCoreFileUsage($files, EntityInterface $entity) {
return;
}

// Invalidate cache for files that were previously referenced.
if (!empty($existingFids)) {
$existingFiles = $this->storage->loadMultiple($existingFids);
foreach ($existingFiles as $existingFile) {
$this->refreshFileListCache($existingFile);
}
}

// Add file usages back in one by one, so we end up with the correct count
// for duplicates.
foreach ($files as $file) {
Expand Down Expand Up @@ -319,10 +337,7 @@ public function scanForInstancesOfThisType($data, EntityInterface $entity) {
}
}

// Register file usages with core 'file.usage'.
if (!empty($files)) {
$this->registerCoreFileUsage($files, $entity);
}
$this->registerCoreFileUsage($files, $entity);

return $entities;
}
Expand Down