external/hydra
1
0
Fork 0
mirror of https://github.com/hydralauncher/hydra.git synced 2025-02-13 03:32:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: adding sorting to download list

Browse source
This commit is contained in:
Chubby Granny Chaser 2024-06-04 16:59:47 +01:00
parent 73b4b2c13c
commit 588cb983c2
No known key found for this signature in database
2 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/renderer/src/pages/downloads/download-list.tsx
View file

@ -11,7 +11,7 @@ import {
import { Downloader, formatBytes } from "@shared"; import { Downloader, formatBytes } from "@shared";
import { DOWNLOADER_NAME } from "@renderer/constants"; import { DOWNLOADER_NAME } from "@renderer/constants";
import { useAppSelector, useDownload } from "@renderer/hooks"; import { useAppSelector, useDownload, useLibrary } from "@renderer/hooks";
import * as styles from "./download-list.css"; import * as styles from "./download-list.css";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
@ -25,6 +25,8 @@ export function DownloadList({ library }: DownloadListProps) {
const { t } = useTranslation("downloads"); const { t } = useTranslation("downloads");
const { updateLibrary } = useLibrary();
const userPreferences = useAppSelector( const userPreferences = useAppSelector(
(state) => state.userPreferences.value (state) => state.userPreferences.value
); );
@ -42,8 +44,8 @@ export function DownloadList({ library }: DownloadListProps) {
const openGameInstaller = (gameId: number) => const openGameInstaller = (gameId: number) =>
window.electron.openGameInstaller(gameId).then((isBinaryInPath) => { window.electron.openGameInstaller(gameId).then((isBinaryInPath) => {
// if (!isBinaryInPath) setShowBinaryNotFoundModal(true); if (!isBinaryInPath) setShowBinaryNotFoundModal(true);
// updateLibrary(); updateLibrary();
}); });
const getFinalDownloadSize = (game: LibraryGame) => { const getFinalDownloadSize = (game: LibraryGame) => {
@ -92,7 +94,7 @@ export function DownloadList({ library }: DownloadListProps) {
return ( return (
<> <>
<p>{formatDownloadProgress(game.progress)}</p> <p>{formatDownloadProgress(game.progress)}</p>
<p>{t(game.downloadQueue ? "queued" : "paused")}</p> <p>{t(game.downloadQueue && lastPacket ? "queued" : "paused")}</p>
</> </>
); );
} }

19
src/renderer/src/pages/downloads/downloads.tsx
View file

@ -11,7 +11,7 @@ import { LibraryGame } from "@types";
import { orderBy } from "lodash-es"; import { orderBy } from "lodash-es";
export function Downloads() { export function Downloads() {
const { library, updateLibrary } = useLibrary(); const { library } = useLibrary();
const { t } = useTranslation("downloads"); const { t } = useTranslation("downloads");
@ -41,18 +41,27 @@ export function Downloads() {
return { ...prev, downloading: [...prev.downloading, next] }; return { ...prev, downloading: [...prev.downloading, next] };
} }
if (next.downloadQueue) { if (next.downloadQueue || next.status === "paused") {
return { ...prev, queued: [...prev.queued, next] }; return { ...prev, queued: [...prev.queued, next] };
} }
return { ...prev, complete: [...prev.complete, next] }; return { ...prev, complete: [...prev.complete, next] };
}, initialValue); }, initialValue);
const queued = orderBy(
result.queued,
(game) => game.downloadQueue?.id ?? -1,
["desc"]
);
const complete = orderBy(result.complete, (game) =>
game.status === "complete" ? 0 : 1
);
return { return {
...result, ...result,
queued: orderBy(result.queued, (game) => game.downloadQueue?.id, [ queued,
"desc", complete,
]),
}; };
}, [library, lastPacket?.game.id]); }, [library, lastPacket?.game.id]);