Added support for installing from arbitary paths

wintercms · Jan 3, 2025 · 312e6bd · 312e6bd
1 parent a1b7c3a
commit 312e6bd
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/modules/system/classes/extensions/source/ExtensionSource.php b/modules/system/classes/extensions/source/ExtensionSource.php
@@ -160,6 +160,11 @@ public function createFiles(): ?static
 
                 break;
             case static::SOURCE_LOCAL:
+                $extensionPath = $this->guessPathFromCode($this->code);
+                if ($this->path !== $extensionPath) {
+                    File::moveDirectory($this->path, $extensionPath);
+                    $this->path = $extensionPath;
+                }
                 break;
         }
 
@@ -223,8 +228,8 @@ protected function checkStatus(): string
                 break;
             case static::SOURCE_MARKET:
             case static::SOURCE_LOCAL:
-                $path = $this->path ?? $this->guessPathFromCode($this->code);
-                if (!File::exists($path)) {
+                // Check the path the extension "should" be installed to
+                if (!File::exists($this->guessPathFromCode($this->code))) {
                     return static::STATUS_UNINSTALLED;
                 }
                 break;
@@ -247,6 +252,10 @@ protected function guessPathFromCode(string $code): ?string
         };
     }
 
+    /**
+     * @throws \ReflectionException
+     * @throws ApplicationException
+     */
     protected function guessCodeFromPath(string $path): ?string
     {
         return match ($this->type) {