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

remove duplicity and simplify AppUpdaterEvent

Browse Source
This commit is contained in:
Zamitto 2024-06-02 02:21:03 -03:00
parent b742a464c9
commit 7ebd91a652
4 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/events/autoupdater/check-for-updates.ts
View File

@ -1,4 +1,4 @@
import { AppUpdaterEvents } from "@types"; import { AppUpdaterEvent } from "@types";
import { registerEvent } from "../register-event"; import { registerEvent } from "../register-event";
import updater, { UpdateInfo } from "electron-updater"; import updater, { UpdateInfo } from "electron-updater";
import { WindowManager } from "@main/services"; import { WindowManager } from "@main/services";
@ -6,7 +6,7 @@ import { app } from "electron";
const { autoUpdater } = updater; const { autoUpdater } = updater;
const sendEvent = (event: AppUpdaterEvents) => { const sendEvent = (event: AppUpdaterEvent) => {
WindowManager.mainWindow?.webContents.send("autoUpdaterEvent", event); WindowManager.mainWindow?.webContents.send("autoUpdaterEvent", event);
}; };

10
src/renderer/src/components/header/auto-update-sub-header.tsx
View File

@ -3,7 +3,7 @@ import { useEffect, useState } from "react";
import { SyncIcon } from "@primer/octicons-react"; import { SyncIcon } from "@primer/octicons-react";
import { Link } from "../link/link"; import { Link } from "../link/link";
import * as styles from "./header.css"; import * as styles from "./header.css";
import { AppUpdaterEvents } from "@types"; import { AppUpdaterEvent } from "@types";
export const releasesPageUrl = export const releasesPageUrl =
"https://github.com/hydralauncher/hydra/releases"; "https://github.com/hydralauncher/hydra/releases";
@ -16,15 +16,15 @@ export function AutoUpdateSubHeader() {
const { t } = useTranslation("header"); const { t } = useTranslation("header");
const handleClickNewUpdate = () => { const handleClickInstallUpdate = () => {
window.electron.restartAndInstallUpdate(); window.electron.restartAndInstallUpdate();
}; };
useEffect(() => { useEffect(() => {
const unsubscribe = window.electron.onAutoUpdaterEvent( const unsubscribe = window.electron.onAutoUpdaterEvent(
(event: AppUpdaterEvents) => { (event: AppUpdaterEvent) => {
if (event.type == "update-available") { if (event.type == "update-available") {
setNewVersion(event.info.version || ""); setNewVersion(event.info.version);
if (isMac) { if (isMac) {
setShowUpdateSubheader(true); setShowUpdateSubheader(true);
@ -59,7 +59,7 @@ export function AutoUpdateSubHeader() {
<button <button
type="button" type="button"
className={styles.newVersionButton} className={styles.newVersionButton}
onClick={handleClickNewUpdate} onClick={handleClickInstallUpdate}
> >
<SyncIcon size={12} /> <SyncIcon size={12} />
<small> <small>

4
src/renderer/src/declaration.d.ts vendored
View File

@ -1,5 +1,5 @@
import type { import type {
AppUpdaterEvents, AppUpdaterEvent,
CatalogueCategory, CatalogueCategory,
CatalogueEntry, CatalogueEntry,
Game, Game,
@ -92,7 +92,7 @@ declare global {
/* Auto update */ /* Auto update */
onAutoUpdaterEvent: ( onAutoUpdaterEvent: (
cb: (event: AppUpdaterEvents) => void cb: (event: AppUpdaterEvent) => void
) => () => Electron.IpcRenderer; ) => () => Electron.IpcRenderer;
checkForUpdates: () => Promise<void>; checkForUpdates: () => Promise<void>;
restartAndInstallUpdate: () => Promise<void>; restartAndInstallUpdate: () => Promise<void>;

13
src/types/index.ts
View File

@ -1,6 +1,5 @@
import type { Aria2Status } from "aria2"; import type { Aria2Status } from "aria2";
import type { Downloader } from "@shared"; import type { Downloader } from "@shared";
import { ProgressInfo, UpdateInfo } from "electron-updater";
export type GameShop = "steam" | "epic"; export type GameShop = "steam" | "epic";
export type CatalogueCategory = "recently_added" | "trending"; export type CatalogueCategory = "recently_added" | "trending";
@ -146,13 +145,8 @@ export interface SteamGame {
} }
export type AppUpdaterEvent = export type AppUpdaterEvent =
| { type: "error" } | { type: "update-available"; info: { version: string } }
| { type: "checking-for-updates" } | { type: "update-downloaded" };
| { type: "update-not-available" }
| { type: "update-available"; info: UpdateInfo }
| { type: "update-downloaded" }
| { type: "download-progress"; info: ProgressInfo }
| { type: "update-cancelled" };
/* Events */ /* Events */
export interface StartGameDownloadPayload { export interface StartGameDownloadPayload {
@ -230,6 +224,3 @@ export interface RealDebridUser {
premium: number; premium: number;
expiration: string; expiration: string;
} }
export type AppUpdaterEvents =
| { type: "update-available"; info: Partial<UpdateInfo> }
| { type: "update-downloaded" };