Wire admin studio SSR and search infrastructure
This commit is contained in:
@@ -166,7 +166,7 @@ final class UploadPipelineService
|
||||
|
||||
$archiveOriginal = null;
|
||||
if ($archiveSession && is_string($archiveHash) && trim($archiveHash) !== '') {
|
||||
$archiveOriginal = $this->derivatives->storeOriginal($archiveSession->tempPath, trim($archiveHash), $archiveOriginalFileName);
|
||||
$archiveOriginal = $this->derivatives->storeDownloadOriginal($archiveSession->tempPath, trim($archiveHash), $archiveOriginalFileName);
|
||||
$localCleanup[] = $archiveOriginal['local_path'];
|
||||
$objectCleanup[] = $archiveOriginal['object_path'];
|
||||
}
|
||||
@@ -301,24 +301,24 @@ final class UploadPipelineService
|
||||
|
||||
private function resolveDownloadFileName(string $storedFilename, string $ext, ?string $preferredFileName): string
|
||||
{
|
||||
$downloadFileName = $storedFilename;
|
||||
$name = is_string($preferredFileName) && trim($preferredFileName) !== ''
|
||||
? basename(str_replace('\\', '/', $preferredFileName))
|
||||
: $storedFilename;
|
||||
|
||||
if (is_string($preferredFileName) && trim($preferredFileName) !== '') {
|
||||
$candidate = basename(str_replace('\\', '/', $preferredFileName));
|
||||
$candidate = preg_replace('/[\x00-\x1F\x7F]/', '', (string) $candidate) ?? '';
|
||||
$candidate = trim((string) $candidate);
|
||||
$name = preg_replace('/[\x00-\x1F\x7F]/', '', (string) $name) ?? '';
|
||||
$name = preg_replace('/\s+/', ' ', $name) ?? '';
|
||||
$name = trim((string) $name, ". \t\n\r\0\x0B");
|
||||
|
||||
if ($candidate !== '') {
|
||||
$candidateExt = strtolower((string) pathinfo($candidate, PATHINFO_EXTENSION));
|
||||
if ($candidateExt === '' && $ext !== '') {
|
||||
$candidate .= '.' . $ext;
|
||||
}
|
||||
|
||||
$downloadFileName = $candidate;
|
||||
}
|
||||
$baseName = trim((string) pathinfo($name, PATHINFO_FILENAME), ". \t\n\r\0\x0B");
|
||||
if ($baseName === '') {
|
||||
$baseName = 'artwork';
|
||||
}
|
||||
|
||||
return $downloadFileName;
|
||||
$normalizedExt = strtolower(ltrim(trim($ext), '.'));
|
||||
|
||||
return $normalizedExt !== ''
|
||||
? $baseName . '.' . $normalizedExt
|
||||
: $baseName;
|
||||
}
|
||||
|
||||
private function screenshotVariantName(int $position): string
|
||||
|
||||
Reference in New Issue
Block a user