valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pluginhost: load plugin data automatically (also marks load_data method as private)

This commit is contained in:
Andrew Dolgov 2021-01-15 08:32:06 +03:00
parent f67f0f864b
commit 40f38fc87f
7 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/article.php
View File

@ -29,7 +29,7 @@ class Article extends Handler_Protected {
if (!$content) { if (!$content) {
$pluginhost = new PluginHost(); $pluginhost = new PluginHost();
$pluginhost->load_all(PluginHost::KIND_ALL, $owner_uid); $pluginhost->load_all(PluginHost::KIND_ALL, $owner_uid);
$pluginhost->load_data(); //$pluginhost->load_data();
foreach ($pluginhost->get_hooks(PluginHost::HOOK_GET_FULL_TEXT) as $p) { foreach ($pluginhost->get_hooks(PluginHost::HOOK_GET_FULL_TEXT) as $p) {
$extracted_content = $p->hook_get_full_text($url); $extracted_content = $p->hook_get_full_text($url);

2
classes/diskcache.php
View File

@ -395,7 +395,7 @@ class DiskCache {
$tmppluginhost = new PluginHost(); $tmppluginhost = new PluginHost();
$tmppluginhost->load(PLUGINS, PluginHost::KIND_SYSTEM); $tmppluginhost->load(PLUGINS, PluginHost::KIND_SYSTEM);
$tmppluginhost->load_data(); //$tmppluginhost->load_data();
foreach ($tmppluginhost->get_hooks(PluginHost::HOOK_SEND_LOCAL_FILE) as $plugin) { foreach ($tmppluginhost->get_hooks(PluginHost::HOOK_SEND_LOCAL_FILE) as $plugin) {
if ($plugin->hook_send_local_file($filename)) return true; if ($plugin->hook_send_local_file($filename)) return true;

4
classes/handler/public.php
View File

@ -45,7 +45,7 @@ class Handler_Public extends Handler {
$tmppluginhost = new PluginHost(); $tmppluginhost = new PluginHost();
$tmppluginhost->load(PLUGINS, PluginHost::KIND_ALL); $tmppluginhost->load(PLUGINS, PluginHost::KIND_ALL);
$tmppluginhost->load($user_plugins, PluginHost::KIND_USER, $owner_uid); $tmppluginhost->load($user_plugins, PluginHost::KIND_USER, $owner_uid);
$tmppluginhost->load_data(); //$tmppluginhost->load_data();
$handler = $tmppluginhost->get_feed_handler( $handler = $tmppluginhost->get_feed_handler(
PluginHost::feed_to_pfeed_id($feed)); PluginHost::feed_to_pfeed_id($feed));
@ -1246,7 +1246,7 @@ class Handler_Public extends Handler {
$method = clean($_REQUEST["pmethod"]); $method = clean($_REQUEST["pmethod"]);
$host->load($plugin_name, PluginHost::KIND_USER, 0); $host->load($plugin_name, PluginHost::KIND_USER, 0);
$host->load_data(); //$host->load_data();
$plugin = $host->get_plugin($plugin_name); $plugin = $host->get_plugin($plugin_name);

11
classes/pluginhost.php
View File

@ -14,6 +14,7 @@ class PluginHost {
private $plugin_actions = array(); private $plugin_actions = array();
private $owner_uid; private $owner_uid;
private $last_registered; private $last_registered;
private $data_loaded;
private static $instance; private static $instance;
const API_VERSION = 2; const API_VERSION = 2;
@ -268,6 +269,8 @@ class PluginHost {
} }
} }
} }
$this->load_data();
} }
function is_system($plugin) { function is_system($plugin) {
@ -352,8 +355,8 @@ class PluginHost {
} }
} }
function load_data() { private function load_data() {
if ($this->owner_uid) { if (get_schema_version() > 100 && $this->owner_uid && !$this->data_loaded) {
$sth = $this->pdo->prepare("SELECT name, content FROM ttrss_plugin_storage $sth = $this->pdo->prepare("SELECT name, content FROM ttrss_plugin_storage
WHERE owner_uid = ?"); WHERE owner_uid = ?");
$sth->execute([$this->owner_uid]); $sth->execute([$this->owner_uid]);
@ -361,6 +364,8 @@ class PluginHost {
while ($line = $sth->fetch()) { while ($line = $sth->fetch()) {
$this->storage[$line["name"]] = unserialize($line["content"]); $this->storage[$line["name"]] = unserialize($line["content"]);
} }
$this->data_loaded = true;
} }
} }
@ -411,6 +416,8 @@ class PluginHost {
function get($sender, $name, $default_value = false) { function get($sender, $name, $default_value = false) {
$idx = get_class($sender); $idx = get_class($sender);
$this->load_data();
if (isset($this->storage[$idx][$name])) { if (isset($this->storage[$idx][$name])) {
return $this->storage[$idx][$name]; return $this->storage[$idx][$name];
} else { } else {

2
classes/pref/prefs.php
View File

@ -911,7 +911,7 @@ class Pref_Prefs extends Handler_Protected {
$tmppluginhost = new PluginHost(); $tmppluginhost = new PluginHost();
$tmppluginhost->load_all($tmppluginhost::KIND_ALL, $_SESSION["uid"], true); $tmppluginhost->load_all($tmppluginhost::KIND_ALL, $_SESSION["uid"], true);
$tmppluginhost->load_data(true); //$tmppluginhost->load_data(true);
foreach ($tmppluginhost->get_plugins() as $name => $plugin) { foreach ($tmppluginhost->get_plugins() as $name => $plugin) {
$about = $plugin->about(); $about = $plugin->about();

4
classes/rssutils.php
View File

@ -276,7 +276,7 @@ class RSSUtils {
$pluginhost->load(PLUGINS, PluginHost::KIND_ALL); $pluginhost->load(PLUGINS, PluginHost::KIND_ALL);
$pluginhost->load($user_plugins, PluginHost::KIND_USER, $owner_uid); $pluginhost->load($user_plugins, PluginHost::KIND_USER, $owner_uid);
$pluginhost->load_data(); //$pluginhost->load_data();
$basic_info = array(); $basic_info = array();
foreach ($pluginhost->get_hooks(PluginHost::HOOK_FEED_BASIC_INFO) as $plugin) { foreach ($pluginhost->get_hooks(PluginHost::HOOK_FEED_BASIC_INFO) as $plugin) {
@ -403,7 +403,7 @@ class RSSUtils {
$pluginhost->load(PLUGINS, PluginHost::KIND_ALL); $pluginhost->load(PLUGINS, PluginHost::KIND_ALL);
$pluginhost->load($user_plugins, PluginHost::KIND_USER, $owner_uid); $pluginhost->load($user_plugins, PluginHost::KIND_USER, $owner_uid);
$pluginhost->load_data(); //$pluginhost->load_data();
$rss_hash = false; $rss_hash = false;

4
classes/userhelper.php
View File

@ -80,9 +80,9 @@ class UserHelper {
$pluginhost->load($plugins, PluginHost::KIND_USER, $owner_uid); $pluginhost->load($plugins, PluginHost::KIND_USER, $owner_uid);
if (get_schema_version() > 100) { /*if (get_schema_version() > 100) {
$pluginhost->load_data(); $pluginhost->load_data();
} }*/
} }
} }