Skip to content

[BUGFIX] Remove assetcollector URLs collections #30

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
bmack merged 1 commit into from
Dec 7, 2022
Merged

[BUGFIX] Remove assetcollector URLs collections #30

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
30 changes: 1 addition & 29 deletions Classes/Hook/FrontendHook.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
use Psr\Log\LoggerAwareTrait;
use TYPO3\CMS\Core\Cache\CacheManager;
use TYPO3\CMS\Core\Cache\Exception\NoSuchCacheException;
use TYPO3\CMS\Core\Page\AssetCollector;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;

Expand Down Expand Up @@ -52,38 +51,11 @@ public function insertPageIncache(TypoScriptFrontendController $parentObject, $t

// cache the page URL that was called
$url = GeneralUtility::getIndpEnv('TYPO3_REQUEST_URL');
$cache->set(md5($url), $url, $parentObject->getPageCacheTags());
$cache->set(md5($url), $url, $parentObject->getPageCacheTags(), $timeOutTime);
$this->logger->info(
'Marking page "%s" (uid %s) as cached.',
[$url, $pageUid]
);

$imageUrls = GeneralUtility::makeInstance(AssetCollector::class)->getMedia();
$imageUrls = array_keys($imageUrls);

foreach ($imageUrls as $imageUrl) {
// Only cache local files
$hasSchema = parse_url($imageUrl, PHP_URL_SCHEME);
if (!empty($hasSchema)) {
continue;
}
// If it's not from an extension, clear the cache
// Extension files are not changed, only during deployment, where we expect that all caches
// Are flushed
if (strpos($imageUrl, 'typo3conf/ext/') !== false) {
continue;
}
// processed images are not cached either
if (strpos($imageUrl, '/_processed_') !== false) {
continue;
}
$url = GeneralUtility::getIndpEnv('TYPO3_SITE_URL') . $imageUrl;
$cache->set(md5($url), $url, $parentObject->getPageCacheTags());
$this->logger->info(
'Marking image "%s" (on page %s) as cached.',
[$url, $pageUid]
);
}
} catch (NoSuchCacheException $e) {
// No cache, nothing to do
}
Expand Down