mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-12 14:35:35 +00:00
Code Issues Projects Releases Wiki Activity

PluginManager::loadPlugins() now accepts files as well as directories

Browse Source 
loadPlugins() is now a superior option to loadPlugin(), since it enforces dependency checks and also supports automatic loading of plugins when new loaders are installed.
This commit is contained in:
Dylan K. Taylor 2021-10-20 21:36:14 +01:00
parent fecc13f362
commit 03fcd844eb
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugin/PluginManager.php
View File

@ -269,11 +269,7 @@ class PluginManager{
* @param string[]|null $newLoaders * @param string[]|null $newLoaders
* @phpstan-param list<class-string<PluginLoader>> $newLoaders * @phpstan-param list<class-string<PluginLoader>> $newLoaders
*/ */
private function triagePlugins(string $directory, PluginLoadTriage $triage, ?array $newLoaders = null) : void{ private function triagePlugins(string $path, PluginLoadTriage $triage, ?array $newLoaders = null) : void{
if(!is_dir($directory)){
return;
}
if(is_array($newLoaders)){ if(is_array($newLoaders)){
$loaders = []; $loaders = [];
foreach($newLoaders as $key){ foreach($newLoaders as $key){
@ -285,8 +281,16 @@ class PluginManager{
$loaders = $this->fileAssociations; $loaders = $this->fileAssociations;
} }
$files = iterator_to_array(new \FilesystemIterator($directory, \FilesystemIterator::CURRENT_AS_PATHNAME | \FilesystemIterator::SKIP_DOTS)); if(is_dir($path)){
shuffle($files); //this prevents plugins implicitly relying on the filesystem name order when they should be using dependency properties $files = iterator_to_array(new \FilesystemIterator($path, \FilesystemIterator::CURRENT_AS_PATHNAME | \FilesystemIterator::SKIP_DOTS));
shuffle($files); //this prevents plugins implicitly relying on the filesystem name order when they should be using dependency properties
}elseif(is_file($path)){
$realPath = realpath($path);
if($realPath === false) throw new AssumptionFailedError("realpath() should not return false on an accessible, existing file");
$files = [$realPath];
}else{
return;
}
foreach($loaders as $loader){ foreach($loaders as $loader){
foreach($files as $file){ foreach($files as $file){
if(!is_string($file)) throw new AssumptionFailedError("FilesystemIterator current should be string when using CURRENT_AS_PATHNAME"); if(!is_string($file)) throw new AssumptionFailedError("FilesystemIterator current should be string when using CURRENT_AS_PATHNAME");
@ -374,9 +378,9 @@ class PluginManager{
/** /**
* @return Plugin[] * @return Plugin[]
*/ */
public function loadPlugins(string $directory) : array{ public function loadPlugins(string $path) : array{
$triage = new PluginLoadTriage(); $triage = new PluginLoadTriage();
$this->triagePlugins($directory, $triage); $this->triagePlugins($path, $triage);
$loadedPlugins = []; $loadedPlugins = [];
@ -402,7 +406,7 @@ class PluginManager{
if(count($diffLoaders) !== 0){ if(count($diffLoaders) !== 0){
$this->server->getLogger()->debug("Plugin $name registered a new plugin loader during load, scanning for new plugins"); $this->server->getLogger()->debug("Plugin $name registered a new plugin loader during load, scanning for new plugins");
$plugins = $triage->plugins; $plugins = $triage->plugins;
$this->triagePlugins($directory, $triage, $diffLoaders); $this->triagePlugins($path, $triage, $diffLoaders);
$diffPlugins = array_diff_assoc($triage->plugins, $plugins); $diffPlugins = array_diff_assoc($triage->plugins, $plugins);
$this->server->getLogger()->debug("Re-triage found plugins: " . implode(", ", array_keys($diffPlugins))); $this->server->getLogger()->debug("Re-triage found plugins: " . implode(", ", array_keys($diffPlugins)));
} }