Joplin
/
joplin
mirror of https://github.com/laurent22/joplin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Desktop: Fixes #5253: Fixed plugin state when it has been deleted outside the app

release-2.2
Laurent Cozic 2021-08-05 12:48:39 +01:00
parent 5d176b5bc8
commit 3348b4f6f8
2 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
packages/app-desktop/app.ts
View File

@ -1,7 +1,7 @@
import ResourceEditWatcher from '@joplin/lib/services/ResourceEditWatcher/index'; import ResourceEditWatcher from '@joplin/lib/services/ResourceEditWatcher/index';
import CommandService from '@joplin/lib/services/CommandService'; import CommandService from '@joplin/lib/services/CommandService';
import KeymapService from '@joplin/lib/services/KeymapService'; import KeymapService from '@joplin/lib/services/KeymapService';
import PluginService from '@joplin/lib/services/plugins/PluginService'; import PluginService, { PluginSettings } from '@joplin/lib/services/plugins/PluginService';
import resourceEditWatcherReducer, { defaultState as resourceEditWatcherDefaultState } from '@joplin/lib/services/ResourceEditWatcher/reducer'; import resourceEditWatcherReducer, { defaultState as resourceEditWatcherDefaultState } from '@joplin/lib/services/ResourceEditWatcher/reducer';
import { defaultState, State } from '@joplin/lib/reducer'; import { defaultState, State } from '@joplin/lib/reducer';
import PluginRunner from './services/plugins/PluginRunner'; import PluginRunner from './services/plugins/PluginRunner';
@ -547,12 +547,14 @@ class Application extends BaseApplication {
const pluginSettings = service.unserializePluginSettings(Setting.value('plugins.states')); const pluginSettings = service.unserializePluginSettings(Setting.value('plugins.states'));
// Users can add and remove plugins from the config screen at any {
// time, however we only effectively uninstall the plugin the next // Users can add and remove plugins from the config screen at any
// time the app is started. What plugin should be uninstalled is // time, however we only effectively uninstall the plugin the next
// stored in the settings. // time the app is started. What plugin should be uninstalled is
const newSettings = service.clearUpdateState(await service.uninstallPlugins(pluginSettings)); // stored in the settings.
Setting.setValue('plugins.states', newSettings); const newSettings = service.clearUpdateState(await service.uninstallPlugins(pluginSettings));
Setting.setValue('plugins.states', newSettings);
}
try { try {
if (await shim.fsDriver().exists(Setting.value('pluginDir'))) { if (await shim.fsDriver().exists(Setting.value('pluginDir'))) {
@ -576,6 +578,25 @@ class Application extends BaseApplication {
this.logger().error(`There was an error loading plugins from ${Setting.value('plugins.devPluginPaths')}:`, error); this.logger().error(`There was an error loading plugins from ${Setting.value('plugins.devPluginPaths')}:`, error);
} }
{
// Users can potentially delete files from /plugins or even delete
// the complete folder. When that happens, we still have the plugin
// info in the state, which can cause various issues, so to sort it
// out we remove from the state any plugin that has *not* been loaded
// above (meaning the file was missing).
// https://github.com/laurent22/joplin/issues/5253
const oldSettings = service.unserializePluginSettings(Setting.value('plugins.states'));
const newSettings: PluginSettings = {};
for (const pluginId of Object.keys(oldSettings)) {
if (!service.pluginIds.includes(pluginId)) {
this.logger().warn('Found a plugin in the state that has not been loaded, which means the plugin might have been deleted outside Joplin - removing it from the state:', pluginId);
continue;
}
newSettings[pluginId] = oldSettings[pluginId];
}
Setting.setValue('plugins.states', newSettings);
}
this.checkAllPluginStartedIID_ = setInterval(() => { this.checkAllPluginStartedIID_ = setInterval(() => {
if (service.allPluginsStarted) { if (service.allPluginsStarted) {
clearInterval(this.checkAllPluginStartedIID_); clearInterval(this.checkAllPluginStartedIID_);

4
packages/lib/services/plugins/PluginService.ts
View File

@ -87,6 +87,10 @@ export default class PluginService extends BaseService {
return this.plugins_; return this.plugins_;
} }
public get pluginIds(): string[] {
return Object.keys(this.plugins_);
}
public get isSafeMode(): boolean { public get isSafeMode(): boolean {
return this.isSafeMode_; return this.isSafeMode_;
} }