Compare commits

..

1 Commits

Author SHA1 Message Date
Zamitto
c75a6ad439 fix: using achievement count data from api 2025-11-11 18:15:26 -03:00
9 changed files with 28 additions and 60 deletions

View File

@@ -4,7 +4,6 @@ import {
downloadsSublevel, downloadsSublevel,
gamesShopAssetsSublevel, gamesShopAssetsSublevel,
gamesSublevel, gamesSublevel,
gameAchievementsSublevel,
} from "@main/level"; } from "@main/level";
const getLibrary = async (): Promise<LibraryGame[]> => { const getLibrary = async (): Promise<LibraryGame[]> => {
@@ -19,33 +18,19 @@ const getLibrary = async (): Promise<LibraryGame[]> => {
const download = await downloadsSublevel.get(key); const download = await downloadsSublevel.get(key);
const gameAssets = await gamesShopAssetsSublevel.get(key); const gameAssets = await gamesShopAssetsSublevel.get(key);
let unlockedAchievementCount = 0;
let achievementCount = 0;
try {
const achievements = await gameAchievementsSublevel.get(key);
if (achievements) {
achievementCount = achievements.achievements.length;
unlockedAchievementCount =
achievements.unlockedAchievements.length;
}
} catch {
// No achievements data for this game
}
return { return {
id: key, id: key,
...game, ...game,
download: download ?? null, download: download ?? null,
unlockedAchievementCount, unlockedAchievementCount: game.unlockedAchievementCount ?? 0,
achievementCount, achievementCount: game.achievementCount ?? 0,
// Spread gameAssets last to ensure all image URLs are properly set // Spread gameAssets last to ensure all image URLs are properly set
...gameAssets, ...gameAssets,
// Preserve custom image URLs from game if they exist // Preserve custom image URLs from game if they exist
customIconUrl: game.customIconUrl, customIconUrl: game.customIconUrl,
customLogoImageUrl: game.customLogoImageUrl, customLogoImageUrl: game.customLogoImageUrl,
customHeroImageUrl: game.customHeroImageUrl, customHeroImageUrl: game.customHeroImageUrl,
} as LibraryGame; };
}) })
); );
}); });

View File

@@ -9,6 +9,8 @@ type ProfileGame = {
hasManuallyUpdatedPlaytime: boolean; hasManuallyUpdatedPlaytime: boolean;
isFavorite?: boolean; isFavorite?: boolean;
isPinned?: boolean; isPinned?: boolean;
achievementCount: number;
unlockedAchievementCount: number;
} & ShopAssets; } & ShopAssets;
export const mergeWithRemoteGames = async () => { export const mergeWithRemoteGames = async () => {
@@ -39,6 +41,8 @@ export const mergeWithRemoteGames = async () => {
playTimeInMilliseconds: updatedPlayTime, playTimeInMilliseconds: updatedPlayTime,
favorite: game.isFavorite ?? localGame.favorite, favorite: game.isFavorite ?? localGame.favorite,
isPinned: game.isPinned ?? localGame.isPinned, isPinned: game.isPinned ?? localGame.isPinned,
achievementCount: game.achievementCount,
unlockedAchievementCount: game.unlockedAchievementCount,
}); });
} else { } else {
await gamesSublevel.put(gameKey, { await gamesSublevel.put(gameKey, {
@@ -55,6 +59,8 @@ export const mergeWithRemoteGames = async () => {
isDeleted: false, isDeleted: false,
favorite: game.isFavorite ?? false, favorite: game.isFavorite ?? false,
isPinned: game.isPinned ?? false, isPinned: game.isPinned ?? false,
achievementCount: game.achievementCount,
unlockedAchievementCount: game.unlockedAchievementCount,
}); });
} }

View File

@@ -47,7 +47,7 @@ export function GameCard({ game, ...props }: GameCardProps) {
> >
<div className="game-card__backdrop"> <div className="game-card__backdrop">
<img <img
src={game.libraryImageUrl} src={game.libraryImageUrl ?? undefined}
alt={game.title} alt={game.title}
className="game-card__cover" className="game-card__cover"
loading="lazy" loading="lazy"

View File

@@ -50,14 +50,14 @@ export function Hero() {
> >
<div className="hero__backdrop"> <div className="hero__backdrop">
<img <img
src={game.libraryHeroImageUrl} src={game.libraryHeroImageUrl ?? undefined}
alt={game.description ?? ""} alt={game.description ?? ""}
className="hero__media" className="hero__media"
/> />
<div className="hero__content"> <div className="hero__content">
<img <img
src={game.logoImageUrl} src={game.logoImageUrl ?? undefined}
width="250px" width="250px"
alt={game.description ?? ""} alt={game.description ?? ""}
loading="eager" loading="eager"

View File

@@ -12,18 +12,12 @@ interface LibraryGameCardLargeProps {
) => void; ) => void;
} }
const normalizePathForCss = (url: string | null | undefined): string => {
if (!url) return "";
return url.replaceAll("\\", "/");
};
const getImageWithCustomPriority = ( const getImageWithCustomPriority = (
customUrl: string | null | undefined, customUrl: string | null | undefined,
originalUrl: string | null | undefined, originalUrl: string | null | undefined,
fallbackUrl?: string | null | undefined fallbackUrl?: string | null | undefined
) => { ) => {
const selectedUrl = customUrl || originalUrl || fallbackUrl || ""; return customUrl || originalUrl || fallbackUrl || "";
return normalizePathForCss(selectedUrl);
}; };
export const LibraryGameCardLarge = memo(function LibraryGameCardLarge({ export const LibraryGameCardLarge = memo(function LibraryGameCardLarge({
@@ -36,21 +30,15 @@ export const LibraryGameCardLarge = memo(function LibraryGameCardLarge({
const backgroundImage = useMemo( const backgroundImage = useMemo(
() => () =>
getImageWithCustomPriority( getImageWithCustomPriority(
game.customHeroImageUrl,
game.libraryHeroImageUrl, game.libraryHeroImageUrl,
game.libraryImageUrl ?? game.iconUrl game.libraryImageUrl,
game.iconUrl
), ),
[ [game.libraryHeroImageUrl, game.libraryImageUrl, game.iconUrl]
game.customHeroImageUrl,
game.libraryHeroImageUrl,
game.libraryImageUrl,
game.iconUrl,
]
); );
const backgroundStyle = useMemo( const backgroundStyle = useMemo(
() => () => ({ backgroundImage: `url(${backgroundImage})` }),
backgroundImage ? { backgroundImage: `url(${backgroundImage})` } : {},
[backgroundImage] [backgroundImage]
); );
@@ -61,7 +49,7 @@ export const LibraryGameCardLarge = memo(function LibraryGameCardLarge({
[game.unlockedAchievementCount, game.achievementCount] [game.unlockedAchievementCount, game.achievementCount]
); );
const logoImage = game.customLogoImageUrl ?? game.logoImageUrl; const logoImage = game.logoImageUrl;
return ( return (
<button <button

View File

@@ -25,14 +25,12 @@ export const LibraryGameCard = memo(function LibraryGameCard({
const { formatPlayTime, handleCardClick, handleContextMenuClick } = const { formatPlayTime, handleCardClick, handleContextMenuClick } =
useGameCard(game, onContextMenu); useGameCard(game, onContextMenu);
const coverImage = ( const coverImage =
game.customIconUrl ??
game.coverImageUrl ?? game.coverImageUrl ??
game.libraryImageUrl ?? game.libraryImageUrl ??
game.libraryHeroImageUrl ?? game.libraryHeroImageUrl ??
game.iconUrl ?? game.iconUrl ??
"" undefined;
).replaceAll("\\", "/");
return ( return (
<button <button

View File

@@ -19,10 +19,7 @@ export default function Library() {
onLibraryBatchComplete?: (cb: () => void) => () => void; onLibraryBatchComplete?: (cb: () => void) => () => void;
}; };
const [viewMode, setViewMode] = useState<ViewMode>(() => { const [viewMode, setViewMode] = useState<ViewMode>("compact");
const savedViewMode = localStorage.getItem("library-view-mode");
return (savedViewMode as ViewMode) || "compact";
});
const [filterBy, setFilterBy] = useState<FilterOption>("all"); const [filterBy, setFilterBy] = useState<FilterOption>("all");
const [contextMenu, setContextMenu] = useState<{ const [contextMenu, setContextMenu] = useState<{
game: LibraryGame | null; game: LibraryGame | null;
@@ -34,11 +31,6 @@ export default function Library() {
const dispatch = useAppDispatch(); const dispatch = useAppDispatch();
const { t } = useTranslation("library"); const { t } = useTranslation("library");
const handleViewModeChange = useCallback((mode: ViewMode) => {
setViewMode(mode);
localStorage.setItem("library-view-mode", mode);
}, []);
useEffect(() => { useEffect(() => {
dispatch(setHeaderTitle(t("library"))); dispatch(setHeaderTitle(t("library")));
const electron = (globalThis as unknown as { electron?: ElectronAPI }) const electron = (globalThis as unknown as { electron?: ElectronAPI })
@@ -79,7 +71,7 @@ export default function Library() {
); );
const handleCloseContextMenu = useCallback(() => { const handleCloseContextMenu = useCallback(() => {
setContextMenu((prev) => ({ ...prev, visible: false })); setContextMenu({ game: null, visible: false, position: { x: 0, y: 0 } });
}, []); }, []);
const filteredLibrary = useMemo(() => { const filteredLibrary = useMemo(() => {
@@ -155,10 +147,7 @@ export default function Library() {
</div> </div>
<div className="library__controls-right"> <div className="library__controls-right">
<ViewOptions <ViewOptions viewMode={viewMode} onViewModeChange={setViewMode} />
viewMode={viewMode}
onViewModeChange={handleViewModeChange}
/>
</div> </div>
</div> </div>
</div> </div>

View File

@@ -42,9 +42,9 @@ export interface ShopAssets {
shop: GameShop; shop: GameShop;
title: string; title: string;
iconUrl: string | null; iconUrl: string | null;
libraryHeroImageUrl: string; libraryHeroImageUrl: string | null;
libraryImageUrl: string; libraryImageUrl: string | null;
logoImageUrl: string; logoImageUrl: string | null;
logoPosition: string | null; logoPosition: string | null;
coverImageUrl: string | null; coverImageUrl: string | null;
downloadSources: string[]; downloadSources: string[];

View File

@@ -56,6 +56,8 @@ export interface Game {
launchOptions?: string | null; launchOptions?: string | null;
favorite?: boolean; favorite?: boolean;
isPinned?: boolean; isPinned?: boolean;
achievementCount?: number;
unlockedAchievementCount?: number;
pinnedDate?: Date | null; pinnedDate?: Date | null;
automaticCloudSync?: boolean; automaticCloudSync?: boolean;
hasManuallyUpdatedPlaytime?: boolean; hasManuallyUpdatedPlaytime?: boolean;