Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 31 additions & 9 deletions src/sidebarApps/extensions/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ async function searchPlugin() {
$searchResult.onscroll = null;

$searchResult.content = "";
const status = helpers.checkAPIStatus();
const status = await helpers.checkAPIStatus();
if (!status) {
$searchResult.content = (
<span className="error">{strings.api_error}</span>
Expand Down Expand Up @@ -409,7 +409,7 @@ async function loadInstalled() {
async function loadExplore() {
if (this.collapsed) return;

const status = helpers.checkAPIStatus();
const status = await helpers.checkAPIStatus();
if (!status) {
$explore.$ul.content = <span className="error">{strings.api_error}</span>;
return;
Expand All @@ -436,6 +436,7 @@ async function loadExplore() {
currentPage++;
updateHeight($explore);
} catch (error) {
console.error("Failed to load plugins in sidebar explore:", error);
$explore.$ul.content = <span className="error">{strings.error}</span>;
} finally {
stopLoading($explore);
Expand All @@ -446,15 +447,36 @@ async function listInstalledPlugins() {
const plugins = await Promise.all(
(await fsOperation(PLUGIN_DIR).lsDir()).map(async (item) => {
const id = Url.basename(item.url);
Comment thread
bajrangCoder marked this conversation as resolved.
const url = Url.join(item.url, "plugin.json");
const plugin = await fsOperation(url).readFile("json");
const iconUrl = getLocalRes(id, plugin.icon);
plugin.icon = await helpers.toInternalUri(iconUrl);
plugin.installed = true;
return plugin;

try {
const url = Url.join(item.url, "plugin.json");
const plugin = await fsOperation(url).readFile("json");

if (plugin.icon) {
const iconUrl = getLocalRes(id, plugin.icon);
try {
plugin.icon = await helpers.toInternalUri(iconUrl);
} catch (error) {
console.warn(
`Failed to resolve plugin icon for "${id}" in sidebar.`,
error,
);
}
}

plugin.installed = true;
return plugin;
} catch (error) {
console.warn(
`Skipping unreadable installed plugin "${id}" in sidebar.`,
error,
);
return null;
}
}),
);
return plugins;

return plugins.filter(Boolean);
}

async function getFilteredPlugins(filterState) {
Expand Down