spark-store-project/spark-store
15
0
Fork 0
mirror of https://gitee.com/spark-store-project/spark-store synced 2026-09-21 06:00:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(favorites): honor source priority and installed state

Browse Source
This commit is contained in:
momen
2026-05-18 23:40:28 +08:00
parent e116dcee63
commit 58789ecd1f
4 changed files with 148 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/favoriteAvailability.ts
+7 -9
View File
@@ -1,7 +1,4 @@
import {
HYBRID_DEFAULT_PRIORITY,
getHybridDefaultOrigin,
} from "@/global/storeConfig";
import { getHybridDefaultOrigin } from "@/global/storeConfig";
import type {
App,
FavoriteItem,
@@ -20,6 +17,10 @@ const normalizeArch = (arch: string): string =>
const appMatchesFavorite = (app: App, item: FavoriteItem): boolean =>
app.pkgname === item.pkgname && app.category === item.category;
const installedAppMatchesFavorite = (app: App, item: FavoriteItem): boolean =>
app.pkgname === item.pkgname &&
(app.category === item.category || app.category === "unknown");
const appMatchesClientArch = (app: App, clientArch: string): boolean => {
if (!app.arch) return true;
return normalizeArch(app.arch) === normalizeArch(clientArch);
@@ -39,10 +40,7 @@ const choosePreferredApp = (apps: App[]): App => {
if (apps.length === 1) return apps[0];
const referenceApp = apps.find((app) => app.origin === "spark") ?? apps[0];
const preferredOrigin =
getHybridDefaultOrigin(referenceApp) === "spark"
? HYBRID_DEFAULT_PRIORITY
: getHybridDefaultOrigin(referenceApp);
const preferredOrigin = getHybridDefaultOrigin(referenceApp);
return apps.find((app) => app.origin === preferredOrigin) ?? apps[0];
};
@@ -69,7 +67,7 @@ export const resolveFavoriteItems = (
}
const installedMatch = installedApps.find((app) =>
appMatchesFavorite(app, item),
installedAppMatchesFavorite(app, item),
);
if (installedMatch) {
return {