Skip to content

Commit 36feb17

Browse files
committed
removed hardcoded values, used manifest file values
1 parent 88d04be commit 36feb17

File tree

3 files changed

+17
-4
lines changed

3 files changed

+17
-4
lines changed

src/lib/installPlugin.js

+15-2
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,22 @@ export default async function installPlugin(id, name, purchaseToken) {
6565
await zip.files["plugin.json"].async("text"),
6666
);
6767

68-
if (!zip.files[pluginJson.main] && zip.files["main.js"]) {
68+
/** patch main in manifest */
69+
if (!zip.files[pluginJson.main]) {
6970
pluginJson.main = "main.js";
70-
} else if (!zip.files[pluginJson.main] && !zip.files["main.js"]) {
71+
}
72+
73+
/** patch icon in manifest */
74+
if (!zip.files[pluginJson.icon]) {
75+
pluginJson.icon = "icon.png";
76+
}
77+
78+
/** patch readme in manifest */
79+
if (!zip.files[pluginJson.readme]) {
80+
pluginJson.readme = "readme.md";
81+
}
82+
83+
if (!zip.files[pluginJson.main]) {
7184
throw new Error(strings["invalid plugin"]);
7285
}
7386

src/pages/plugins/plugins.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ export default function PluginsInclude(updates) {
299299
if (!((updates && updates.includes(id)) || !updates)) return;
300300
const url = Url.join(item.url, "plugin.json");
301301
const plugin = await fsOperation(url).readFile("json");
302-
const iconUrl = getLocalRes(id, "icon.png");
302+
const iconUrl = getLocalRes(id, plugin.icon);
303303
plugin.icon = await helpers.toInternalUri(iconUrl);
304304
plugin.installed = true;
305305
plugins.installed.push(plugin);

src/sidebarApps/extensions/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ async function listInstalledPlugins() {
214214
const id = Url.basename(item.url);
215215
const url = Url.join(item.url, "plugin.json");
216216
const plugin = await fsOperation(url).readFile("json");
217-
const iconUrl = getLocalRes(id, "icon.png");
217+
const iconUrl = getLocalRes(id, plugin.icon);
218218
plugin.icon = await helpers.toInternalUri(iconUrl);
219219
plugin.installed = true;
220220
return plugin;

0 commit comments

Comments
 (0)