refactor: app manage

fresns · Mar 23, 2024 · adde06b · adde06b
1 parent a190ca1
commit adde06b
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 291 deletions.
diff --git a/src/Commands/MarketActivateCommand.php b/src/Commands/MarketActivateCommand.php
diff --git a/src/Commands/MarketDeactivateCommand.php b/src/Commands/MarketDeactivateCommand.php
diff --git a/src/Commands/MarketRemovePluginCommand.php b/src/Commands/MarketRemovePluginCommand.php
diff --git a/src/Commands/MarketRequireCommand.php b/src/Commands/MarketRequireCommand.php
@@ -45,16 +45,16 @@ public function getPluginPath($fskey)
             return $fskey;
         }
 
-        $pluginsPath = config('markets.paths.base');
+        $pluginsPath = config('markets.paths.plugins', base_path());
 
         return sprintf('%s/%s', rtrim($pluginsPath), ltrim($fskey, '/'));
     }
 
     public function getThemePath($fskey)
     {
-        $themesPath = config('markets.paths.base');
+        $themesPath = config('markets.paths.themes', base_path());
 
-        return sprintf('%s/themes/%s', rtrim($themesPath), ltrim($fskey, '/'));
+        return sprintf('%s/%s', rtrim($themesPath), ltrim($fskey, '/'));
     }
 
     public function getPluginDirectory($fskey)
@@ -146,7 +146,9 @@ public function handle()
 
         if ($type == 'local') {
             if ($this->isLocalPath($fskey) == false) {
-                $type = null;
+                $this->error("Not the correct plugin. pluginFsKey: $fskey");
+
+                return Command::FAILURE;
             }
         }
 

diff --git a/src/Listeners/PluginActivatedListener.php b/src/Listeners/PluginActivatedListener.php
diff --git a/src/Listeners/PluginDeactivatedListener.php b/src/Listeners/PluginDeactivatedListener.php
diff --git a/src/Listeners/PluginInstalledListener.php b/src/Listeners/PluginInstalledListener.php
@@ -45,6 +45,7 @@ public function handle($event): void
 
             return;
         }
+        $pluginJson['type'] = 'plugin';
 
         App::handleAppData($pluginJson);
     }

diff --git a/src/Listeners/PluginUninstalledListener.php b/src/Listeners/PluginUninstalledListener.php
diff --git a/src/Listeners/ThemeInstalledListener.php b/src/Listeners/ThemeInstalledListener.php
@@ -45,8 +45,10 @@ public function handle($event): void
 
             return;
         }
+        $themeJson['type'] = 'theme';
 
-        if ($themeJson['functions'] ?? null) {
+        $functions = $themeJson['functions'] ?? false;
+        if ($functions) {
             $themeJson['settingsPath'] = $fskey;
         }
 

diff --git a/src/Listeners/ThemeUninstalledListener.php b/src/Listeners/ThemeUninstalledListener.php
-Original file line number
+Diff line change
@@ Expand Up / @@ -45,6 +45,7 @@ public function handle($event): void @@
                 return;
             }
+            $pluginJson['type'] = 'plugin';
             App::handleAppData($pluginJson);
         }
@@ Expand Down @@