Skip to content

Prevent creating duplicate files if assets and public stream is in same path. #67

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 1 commit into
base: 8.1.x
Choose a base branch
from
Open

Prevent creating duplicate files if assets and public stream is in same path. #67

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions src/Plugin/Usage/FileUsage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,11 @@ public function __construct(
$this->wrappers[$key]['instance'] = $stream_wrapper_manager->getViaUri($key . '://');
}

// Ensure 'public' is processed before 'asset' in convertBasepathsToUris
// so base-path URIs resolve to public:// (the canonical form) and don't
// create duplicate file entities when both wrappers share the same path.
uksort($this->wrappers, fn($a, $b) => ($b === 'public') <=> ($a === 'public') ?: strcmp($a, $b));

// 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';
Expand Down