Произведен рефакторинг

Список плагинов переделан с backbone на vue.js
KodiComponents · May 28, 2016 · ca51615 · ca51615
1 parent 844bf6c
commit ca51615
Show file tree

Hide file tree

Showing 9 changed files with 173 additions and 197 deletions.
diff --git a/src/Console/Commands/PluginsListCommand.php b/src/Console/Commands/PluginsListCommand.php
@@ -34,7 +34,7 @@ public function fire()
     {
         $modules = [];
 
-        foreach (PluginLoader::findPlugins() as $module) {
+        foreach (PluginLoader::getPlugins() as $module) {
             $modules[] = [
                 $module->getName().' ['.get_class($module).']',
                 '',

diff --git a/src/Http/Controllers/API/PluginController.php b/src/Http/Controllers/API/PluginController.php
@@ -2,10 +2,10 @@
 
 namespace KodiCMS\Plugins\Http\Controllers\API;
 
-use KodiCMS\Plugins\Exceptions\PluginContainerException;
-use PluginLoader;
 use KodiCMS\API\Exceptions\PermissionException;
 use KodiCMS\API\Http\Controllers\System\Controller;
+use KodiCMS\Plugins\Exceptions\PluginContainerException;
+use PluginLoader;
 
 class PluginController extends Controller
 {
@@ -15,9 +15,7 @@ public function getList()
             throw new PermissionException('backend.plugins.list');
         }
 
-        $this->setContent(
-            PluginLoader::findPlugins()->toArray()
-        );
+        $this->setContent(PluginLoader::getPlugins()->toArray());
     }
 
     /**

diff --git a/src/Http/Controllers/PluginController.php b/src/Http/Controllers/PluginController.php
@@ -2,16 +2,14 @@
 
 namespace KodiCMS\Plugins\Http\Controllers;
 
-use Meta;
-use PluginLoader;
-use KodiCMS\Plugins\Loader\BasePluginContainer;
 use KodiCMS\CMS\Http\Controllers\System\BackendController;
+use KodiCMS\Plugins\Loader\BasePluginContainer;
+use PluginLoader;
 
 class PluginController extends BackendController
 {
     public function getIndex()
     {
-        Meta::loadPackage('backbone');
         $this->setContent('list');
     }
 
@@ -23,11 +21,9 @@ public function getIndex()
     public function getSettings($pluginId)
     {
         $plugin = $this->getPlugin($pluginId);
-        $this->setTitle(
-            trans($this->wrapNamespace('core.plugin_settings_page'), [
-                'title' => $plugin->getTitle(),
-            ])
-        );
+        $this->setTitle(trans($this->wrapNamespace('core.plugin_settings_page'), [
+            'title' => $plugin->getTitle(),
+        ]));
 
         $settingsTemplate = $plugin->getSettingsTemplate();
 
@@ -47,10 +43,9 @@ public function postSettings($pluginId)
 
         $plugin->saveSettings($settings);
 
-        return $this->smartRedirect([], 'backend.plugins.list')
-            ->with('success', trans($this->wrapNamespace('core.messages.settings_saved'), [
-                'title' => $plugin->getTitle(),
-            ]));
+        return $this->smartRedirect([], 'backend.plugins.list')->with('success', trans($this->wrapNamespace('core.messages.settings_saved'), [
+            'title' => $plugin->getTitle(),
+        ]));
     }
 
     /**

diff --git a/src/Loader/BasePluginContainer.php b/src/Loader/BasePluginContainer.php
@@ -10,7 +10,6 @@
 use KodiCMS\Support\Traits\Settings;
 use KodiCMS\Support\Loader\ModuleContainer;
 use KodiCMS\Plugins\Exceptions\PluginContainerException;
-use KodiCMS\Support\Facades\PluginLoader as PluginLoaderFacade;
 
 abstract class BasePluginContainer extends ModuleContainer implements SettingsInterface
 {
@@ -60,7 +59,6 @@ public function __construct($moduleName, $modulePath = null, $namespace = null)
         }
 
         $this->isInstallable = $this->checkPluginVersion();
-        $this->isActivated = in_array($this, PluginLoaderFacade::getActivated());
 
         $this->setSettings($this->defaultSettings());
     }
@@ -73,6 +71,21 @@ public function defaultSettings()
         return [];
     }
 
+    /**
+     * @return string
+     */
+    public function getInfo()
+    {
+        return [
+            'version' => $this->getVersion(),
+            'description' => $this->getDescription(),
+            'authors' => [[
+                'name' => $this->getAuthor()
+            ]]
+        ];
+    }
+
+
     /**
      * @return string
      */
@@ -140,6 +153,7 @@ public function hasSettingsPage()
      */
     public function isActivated()
     {
+        $this->checkActivation();
         return $this->isActivated;
     }
 
@@ -180,7 +194,7 @@ public function getAssetsPublicPath()
      */
     public function checkActivation()
     {
-        return $this->isActivated = in_array($this, PluginLoaderFacade::getActivated());
+        return $this->isActivated = \PluginLoader::isActivated($this->getName());
     }
 
     /**
@@ -265,7 +279,7 @@ public function saveSettings(array $settings)
      */
     protected function checkPluginVersion()
     {
-        return version_compare(CMS::VERSION, $this->getRequiredVersion(), '>=');
+        return version_compare(CMS::getVersion(), $this->getRequiredVersion(), '>=');
     }
 
     /**

diff --git a/src/Loader/PluginLoader.php b/src/Loader/PluginLoader.php
@@ -72,27 +72,17 @@ public function init()
     /**
      * @return Collection|BasePluginContainer[]
      */
-    public function getActivated()
+    public function getPlugins()
     {
-        return $this->activated;
+        return $this->plugins;
     }
 
     /**
      * @return Collection|BasePluginContainer[]
      */
-    public function findPlugins()
+    public function getActivated()
     {
-        foreach ($this->files->directories($this->getPath()) as $directory) {
-            foreach ($this->files->directories($directory) as $plugin) {
-                if (is_null($class = $this->initPlugin($plugin))) {
-                    continue;
-                }
-
-                $this->plugins->push($class);
-            }
-        }
-
-        return $this->plugins;
+        return $this->activated;
     }
 
     /**
@@ -150,7 +140,9 @@ public function activatePlugin($name)
     public function deactivatePlugin($name, $removeTable = false)
     {
         $status = false;
+
         if ($this->isActivated($name) and ! is_null($plugin = $this->getPluginContainer($name))) {
+
             $status = $plugin->deactivate($removeTable);
 
             if (app()->routesAreCached()) {
@@ -177,6 +169,7 @@ protected function initPlugin($directory)
         $namespace = "Plugins\\{$vendorName}\\{$pluginName}";
         $class = "{$namespace}\\PluginContainer";
 
+
         if (! class_exists($class)) {
             return;
         }
@@ -211,7 +204,6 @@ protected function loadActivated()
 
         return $this->activated;
     }
-
     /**
      * @param string $key
      *
@@ -221,4 +213,22 @@ protected function pluginExists($key)
     {
         return $this->files->isDirectory($this->path.DIRECTORY_SEPARATOR.$key);
     }
+
+    /**
+     * @return Collection|BasePluginContainer[]
+     */
+    protected function findPlugins()
+    {
+        foreach ($this->files->directories($this->getPath()) as $directory) {
+            foreach ($this->files->directories($directory) as $plugin) {
+                if (is_null($class = $this->initPlugin($plugin))) {
+                    continue;
+                }
+
+                $this->plugins->push($class);
+            }
+        }
+
+        return $this->plugins;
+    }
 }
diff --git a/src/Providers/PluginServiceProvider.php b/src/Providers/PluginServiceProvider.php
@@ -6,10 +6,6 @@
 use KodiCMS\Support\ServiceProvider;
 use KodiCMS\Plugins\Loader\PluginLoader;
 use KodiCMS\Plugins\Loader\PluginInstaller;
-use KodiCMS\Plugins\Console\Commands\PluginsListCommand;
-use KodiCMS\Plugins\Console\Commands\PluginActivateCommand;
-use KodiCMS\Plugins\Console\Commands\PluginDeactivateCommand;
-use KodiCMS\Plugins\Facades\PluginLoader as PluginLoaderFacade;
 
 class PluginServiceProvider extends ServiceProvider
 {
@@ -28,7 +24,7 @@ public function __construct($app)
     public function register()
     {
         $this->registerAliases([
-            'PluginLoader' => PluginLoaderFacade::class,
+            'PluginLoader' => \KodiCMS\Plugins\Facades\PluginLoader::class,
         ]);
 
         $this->app->singleton('plugin.installer', function ($app) {
@@ -44,9 +40,9 @@ public function register()
         }
 
         $this->registerConsoleCommand([
-            PluginsListCommand::class,
-            PluginActivateCommand::class,
-            PluginDeactivateCommand::class,
+            \KodiCMS\Plugins\Console\Commands\PluginsListCommand::class,
+            \KodiCMS\Plugins\Console\Commands\PluginActivateCommand::class,
+            \KodiCMS\Plugins\Console\Commands\PluginDeactivateCommand::class,
         ]);
     }
 }