feat: rewrite icon urls

aspirepress · Jan 18, 2025 · f6bd762 · f6bd762
1 parent 99be478
commit f6bd762
Show file tree

Hide file tree

Showing 7 changed files with 551 additions and 5 deletions.
diff --git a/app/Enums/AssetType.php b/app/Enums/AssetType.php
@@ -9,6 +9,7 @@ enum AssetType: string
     case THEME = 'theme';
     case PLUGIN_SCREENSHOT = 'plugin-screenshot';
     case PLUGIN_BANNER = 'plugin-banner';
+    case PLUGIN_GP_ICON = 'plugin-gp-icon'; // geopattern-icon only -- other icons are treated as screenshots
     case THEME_SCREENSHOT = 'theme-screenshot';
 
     public function isZip(): bool
@@ -18,6 +19,9 @@ public function isZip(): bool
 
     public function isAsset(): bool
     {
-        return in_array($this, [self::PLUGIN_SCREENSHOT, self::PLUGIN_BANNER, self::THEME_SCREENSHOT]);
+        return in_array(
+            $this,
+            [self::PLUGIN_SCREENSHOT, self::PLUGIN_BANNER, self::PLUGIN_GP_ICON, self::THEME_SCREENSHOT],
+        );
     }
 }
diff --git a/app/Http/Controllers/API/WpOrg/Downloads/DownloadPluginIconController.php b/app/Http/Controllers/API/WpOrg/Downloads/DownloadPluginIconController.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Http\Controllers\API\WpOrg\Downloads;
+
+use App\Enums\AssetType;
+use App\Services\Downloads\DownloadService;
+use Symfony\Component\HttpFoundation\Response;
+
+class DownloadPluginIconController
+{
+    public function __construct(private readonly DownloadService $downloadService) {}
+
+    public function __invoke(string $slug, string $revision, string $file): Response
+    {
+        $type = AssetType::PLUGIN_GP_ICON;
+        return $this->downloadService->download(type: $type, slug: $slug, file: $file, revision: $revision);
+    }
+}
diff --git a/app/Jobs/DownloadAssetJob.php b/app/Jobs/DownloadAssetJob.php
@@ -71,7 +71,8 @@ public function generateLocalPath(): string
             AssetType::PLUGIN => "plugins/{$this->slug}",
             AssetType::THEME => "themes/{$this->slug}",
             AssetType::PLUGIN_SCREENSHOT,
-            AssetType::PLUGIN_BANNER => "assets/{$this->slug}",
+            AssetType::PLUGIN_BANNER => "assets/plugin/{$this->slug}",
+            AssetType::PLUGIN_GP_ICON => "gp-icon/plugin/{$this->slug}",
             AssetType::THEME_SCREENSHOT => "assets/theme/{$this->slug}/{$this->revision}",
         };
 

diff --git a/app/Models/WpOrg/Plugin.php b/app/Models/WpOrg/Plugin.php
diff --git a/app/Services/Downloads/DownloadService.php b/app/Services/Downloads/DownloadService.php
@@ -58,6 +58,7 @@ public static function buildUpstreamUrl(AssetType $type, string $slug, string $f
             AssetType::THEME => 'https://downloads.wordpress.org/theme/',
             AssetType::PLUGIN_SCREENSHOT,
             AssetType::PLUGIN_BANNER => "https://ps.w.org/$slug/assets/",
+            AssetType::PLUGIN_GP_ICON => "https://s.w.org/plugins/geopattern-icon/",
             AssetType::THEME_SCREENSHOT => "https://ts.w.org/wp-content/themes/$slug/",
         };
 

diff --git a/routes/inc/download.php b/routes/inc/download.php
@@ -3,6 +3,7 @@
 use App\Http\Controllers\API\WpOrg\Downloads\DownloadCoreController;
 use App\Http\Controllers\API\WpOrg\Downloads\DownloadPluginAssetController;
 use App\Http\Controllers\API\WpOrg\Downloads\DownloadPluginController;
+use App\Http\Controllers\API\WpOrg\Downloads\DownloadPluginIconController;
 use App\Http\Controllers\API\WpOrg\Downloads\DownloadThemeController;
 use App\Http\Controllers\API\WpOrg\Downloads\DownloadThemeScreenshotController;
 use Illuminate\Routing\Router;
@@ -37,6 +38,11 @@
             ->where(['slug' => '[a-zA-Z0-9-]+', 'file' => '.+'])
             ->name('download.plugin.asset');
 
+        $router
+            ->get('/download/gp-icon/plugin/{slug}/{revision}/{file}', DownloadPluginIconController::class)
+            ->where(['slug' => '[a-zA-Z0-9-]+', 'file' => '.+'])
+            ->name('download.plugin.gp-icon');
+
         $router
             ->get('/download/assets/theme/{slug}/{revision}/{file}', DownloadThemeScreenshotController::class)
             ->where(['slug' => '[a-zA-Z0-9-]+', 'file' => '.+'])

diff --git a/tests/Feature/Sync/SyncPluginTest.php b/tests/Feature/Sync/SyncPluginTest.php
@@ -142,12 +142,14 @@
             ->and($plugin->commercial_support_url)->toBeEmpty()
             ->and($plugin->donate_link)->toBeEmpty()
             ->and($plugin->banners)->toBeEmpty()
-            ->and($plugin->icons)->toBe(['default' => 'https://s.w.org/plugins/geopattern-icon/0-errors.svg'])
             ->and($plugin->preview_link)->toBeEmpty();
 
         // test URL rewrites
         expect($plugin->download_link)
             ->toBe('https://api.aspiredev.org/download/plugin/0-errors.0.2.zip')
+            ->and($plugin->icons)->toBe(
+                ['default' => 'https://api.aspiredev.org/download/gp-icon/plugin/0-errors/head/0-errors.svg'],
+            )
             ->and($plugin->versions)->toBe([
                 '0.1' => 'https://api.aspiredev.org/download/plugin/0-errors.0.1.zip',
                 '0.2' => 'https://api.aspiredev.org/download/plugin/0-errors.0.2.zip',