diff --git a/lib/plugins/src/constants.ts b/lib/plugins/src/constants.ts index 7d9f9ce..3dd15a3 100644 --- a/lib/plugins/src/constants.ts +++ b/lib/plugins/src/constants.ts @@ -11,4 +11,5 @@ export const PluginStatus = { Stopping: 1 << 6, } -export const PluginsStorageDirectory = 'revenge/plugins/storage' +export const pluginStoragePathFor = (id: string) => + `revenge/plugins/storage/${id}/storage.json` diff --git a/src/plugins/preinit/api.storage/index.ts b/src/plugins/preinit/api.storage/index.ts index cf10df1..48c09f8 100644 --- a/src/plugins/preinit/api.storage/index.ts +++ b/src/plugins/preinit/api.storage/index.ts @@ -3,7 +3,7 @@ import { PluginFlags, registerPlugin, } from '@revenge-mod/plugins/_' -import { PluginsStorageDirectory } from '@revenge-mod/plugins/constants' +import { pluginStoragePathFor } from '@revenge-mod/plugins/constants' import * as storage from '@revenge-mod/storage' import { getStorage } from '@revenge-mod/storage' import { defineLazyProperty } from '@revenge-mod/utils/object' @@ -31,7 +31,7 @@ registerPlugin( }, init({ decorate }) { const makePluginStorage = (plugin: Plugin, opts?: StorageOptions) => - getStorage(getStoragePathForPlugin(plugin), { + getStorage(pluginStoragePathFor(plugin.manifest.id), { ...opts, directory: 'documents', }) @@ -55,13 +55,9 @@ registerPlugin( InternalPluginFlags.API, ) -function getStoragePathForPlugin(plugin: Plugin) { - return `${PluginsStorageDirectory}/${plugin.manifest.id}.json` -} - export async function deleteStorageForPlugin(plugin: Plugin) { const api = plugin.api as InitPluginApi<{ storage: AnyObject }> | undefined - const storage = api?.storage ?? getStorage(getStoragePathForPlugin(plugin)) - console.log(api?.storage, storage, getStoragePathForPlugin(plugin)) + const storage = + api?.storage ?? getStorage(pluginStoragePathFor(plugin.manifest.id)) if (await storage.exists()) await storage.delete() }