self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-11-24 08:12:24 +02:00
Code Issues Releases Activity

Mobile: Plugin API: Fix error when calling plugins.dataDir (#10262)

Browse Source
This commit is contained in:
Henry Heino 2024-04-04 04:10:59 -07:00 committed by GitHub
parent 500c8facdb
commit 384b17738a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/app-mobile/root.tsx
View File

@ -116,7 +116,7 @@ import ProfileSwitcher from './components/ProfileSwitcher/ProfileSwitcher';
import ProfileEditor from './components/ProfileSwitcher/ProfileEditor'; import ProfileEditor from './components/ProfileSwitcher/ProfileEditor';
import sensorInfo, { SensorInfo } from './components/biometrics/sensorInfo'; import sensorInfo, { SensorInfo } from './components/biometrics/sensorInfo';
import { getCurrentProfile } from '@joplin/lib/services/profileConfig'; import { getCurrentProfile } from '@joplin/lib/services/profileConfig';
import { getDatabaseName, getProfilesRootDir, getResourceDir, setDispatch } from './services/profiles'; import { getDatabaseName, getPluginDataDir, getProfilesRootDir, getResourceDir, setDispatch } from './services/profiles';
import userFetcher, { initializeUserFetcher } from '@joplin/lib/utils/userFetcher'; import userFetcher, { initializeUserFetcher } from '@joplin/lib/utils/userFetcher';
import { ReactNode } from 'react'; import { ReactNode } from 'react';
import { parseShareCache } from '@joplin/lib/services/share/reducer'; import { parseShareCache } from '@joplin/lib/services/share/reducer';
@ -495,6 +495,7 @@ async function initialize(dispatch: Function) {
const resourceDir = getResourceDir(currentProfile, isSubProfile); const resourceDir = getResourceDir(currentProfile, isSubProfile);
Setting.setConstant('resourceDir', resourceDir); Setting.setConstant('resourceDir', resourceDir);
Setting.setConstant('pluginDir', `${getProfilesRootDir()}/plugins`); Setting.setConstant('pluginDir', `${getProfilesRootDir()}/plugins`);
Setting.setConstant('pluginDataDir', getPluginDataDir(currentProfile, isSubProfile));
await shim.fsDriver().mkdir(resourceDir); await shim.fsDriver().mkdir(resourceDir);

5
packages/app-mobile/services/profiles/index.ts
View File

@ -26,6 +26,11 @@ export const getResourceDir = (profile: Profile, isSubProfile: boolean) => {
return `${getProfilesRootDir()}/resources-${profile.id}`; return `${getProfilesRootDir()}/resources-${profile.id}`;
}; };
export const getPluginDataDir = (profile: Profile, isSubProfile: boolean) => {
const suffix = isSubProfile ? `-${profile.id}` : '';
return `${getProfilesRootDir()}/plugin-data${suffix}`;
};
// The suffix is for debugging only // The suffix is for debugging only
export const getDatabaseName = (profile: Profile, isSubProfile: boolean, suffix = '') => { export const getDatabaseName = (profile: Profile, isSubProfile: boolean, suffix = '') => {
if (!isSubProfile) return `joplin${suffix}.sqlite`; if (!isSubProfile) return `joplin${suffix}.sqlite`;