[FEATURE] move screenshots to correct locations as preparation for v12

Signed-off-by: Kay Strobach <info@kay-strobach.de>
typo3-themes · May 11, 2023 · bc1241d · bc1241d
1 parent 6a321b4
commit bc1241d
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 7 deletions.
diff --git a/Classes/Domain/Model/Theme.php b/Classes/Domain/Model/Theme.php
@@ -27,6 +27,7 @@
  * This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
 
+use KayStrobach\Sitemgr\Utilities\FileSystemUtility;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\PathUtility;
@@ -70,13 +71,30 @@ public function __construct($extensionName)
                 $this->pathTsConfig = $path . 'Configuration/PageTS/tsconfig.txt';
             }
 
-            //
             $this->importExtEmConf();
+
+            $screenshotsFolder = ExtensionManagementUtility::extPath($this->getExtensionName()) . 'Resources/Public/Screenshots/';
+            GeneralUtility::mkdir($screenshotsFolder);
+
             if (is_file(ExtensionManagementUtility::extPath($this->getExtensionName()) . 'Meta/Screenshots/screenshot.png')) {
-                $this->previewImage = PathUtility::stripPathSitePrefix(ExtensionManagementUtility::extPath($this->getExtensionName())) . 'Meta/Screenshots/screenshot.png';
-            } else {
-                $this->previewImage = PathUtility::stripPathSitePrefix(ExtensionManagementUtility::extPath('themes')) . 'Resources/Public/Images/screenshot.gif';
+                rename(
+                    ExtensionManagementUtility::extPath($this->getExtensionName() ). 'Meta/Screenshots/screenshot.png',
+                    $screenshotsFolder . 'screenshot.png'
+                );
+            } elseif (is_file(ExtensionManagementUtility::extPath('themes'). 'Resources/Public/Images/screenshot.gif')) {
+                rename(
+                    ExtensionManagementUtility::extPath('themes') . '/Resources/Public/Images/screenshot.gif',
+                    $screenshotsFolder . 'screenshot.gif'
+                );
             }
+
+            if (is_file(GeneralUtility::getFileAbsFileName('EXT:' . $this->getExtensionName() . '/Resources/Public/Screenshots/screenshot.gif'))) {
+                $this->previewImage = 'EXT:' . $this->getExtensionName() . '/Resources/Public/Screenshots/screenshot.gif';
+            }
+            if (is_file(GeneralUtility::getFileAbsFileName('EXT:' . $this->getExtensionName() . '/Resources/Public/Screenshots/screenshot.png'))) {
+                $this->previewImage = 'EXT:' . $this->getExtensionName() . '/Resources/Public/Screenshots/screenshot.png';
+            }
+
             $yamlFile = ExtensionManagementUtility::extPath($this->getExtensionName()) . 'Meta/theme.yaml';
             if (file_exists($yamlFile)) {
                 try {
@@ -128,6 +146,12 @@ public function getAllPreviewImages()
                 $buffer[$key]['file'] = $previewImage;
             }
         }
+
+        if (is_file(GeneralUtility::getFileAbsFileName($this->previewImage))) {
+            $buffer[] = [
+                'file' => $this->previewImage
+            ];
+        }
         return $buffer;
     }
 

diff --git a/Resources/Private/Partials/Meta/Screenshots.html b/Resources/Private/Partials/Meta/Screenshots.html
@@ -11,7 +11,7 @@
 				<div class="carousel-inner">
 					<f:for each="{screenshots}" as="screenshot" iteration="iteration">
 						<div class="item {f:if(condition:iteration.isFirst, then:'active')}" data-interval="3000" data-pause="hover" title="{screenshot.caption}">
-							<img src="{screenshot.file}"  alt="{screenshot.caption}" width="600" />
+							<f:image src="{screenshot.file}"  alt="{screenshot.caption}" width="600" />
 						</div>
 					</f:for>
 				</div>
@@ -24,4 +24,4 @@
 			</div>
 		</div>
 	</div>
-</f:if>
+</f:if>
diff --git a/Resources/Private/Partials/Themes/ThemeSelected.html b/Resources/Private/Partials/Themes/ThemeSelected.html
@@ -147,4 +147,4 @@ <h2><f:translate key="{category.title}" default="{category.title}" /></h2>
 			</f:form>
 		</div>
 	</div>
-</html>
+</html>