diff --git a/README.md b/README.md index 6b7e8925..f5c12b41 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,112 @@ -# Hydra +
-![Discord](https://img.shields.io/discord/1220692017311645737?style=flat&logo=discord&label=Hydra&labelColor=%231c1c1c) -![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/hydralauncher/hydra/build.yml) -![GitHub package.json version](https://img.shields.io/github/package-json/v/hydralauncher/hydra) - -Hydra is a game launcher with its own embedded bittorrent client and a self-managed repack scraper. -The launcher is written in TypeScript (Electron) and Python, which handles the torrenting system by using [libtorrent](https://www.libtorrent.org/). +
+ + + +

Hydra Launcher

+

+ Hydra is a game launcher with its own embedded bittorrent client and a self-managed repack scraper. +

+

+ + + + + + + + + +

![Hydra Catalogue](./docs/screenshot.png) +
+ +
+ +## Table of Contents + +- [About](#about) +- [Features](#features) +- [Installation](#installation) +- [Contributing](#contributing) + - [Join our Discord](#join-our-discord) + - [Fork and clone your repository](#fork-and-clone-your-repository) + - [Ways you can contribute](#ways-you-can-contribute) + - [Project Structure](#project-structure) +- [Build from source](#build-from-source) + - [Install Node.js](#install-nodejs) + - [Install Yarn](#install-yarn) + - [Install Node Dependencies](#install-node-dependencies) + - [Install Python 3.9](#install-python-39) + - [Install Python Dependencies](#install-python-dependencies) +- [Environment variables](#environment-variables) +- [Running](#running) +- [Build](#build) + - [Build the bittorrent client](#build-the-bittorrent-client) + - [Build the Electron application](#build-the-electron-application) +- [Contributors](#contributors) + +## About + +**Hydra** is a **Game Launcher** with its own embedded **BitTorrent Client** and a **self-managed repack scraper**. +
+The launcher is written in TypeScript (Electron) and Python, which handles the torrenting system by using libtorrent. + +## Features + +- Self-Managed repack scraper among all the most reliable websites on the [Megathread]("https://www.reddit.com/r/Piracy/wiki/megathread/") +- Own embedded bittorrent client +- How Long To Beat (HLTB) integration on game page +- Downloads path customization +- Repack list update notifications +- Windows and Linux support +- Constantly updated +- And more ... + ## Installation +Follow the steps below to install: + +1. Download the latest version of Hydra from the [Releases](https://github.com/hydralauncher/hydra/releases/latest) page. + - Download only .exe if you want to install Hydra on Windows. + - Download .deb or .rpm or .zip if you want to install Hydra on Linux. (depends on your Linux distro) +2. Run the downloaded file. +3. Enjoy Hydra! + +## Contributing + +### Join our Discord + +We concentrate our discussions on our [Discord](https://discord.gg/hydralauncher) server. + +1. Join our server +2. Go to the roles channel and grab the Collaborator role +3. Go to the dev channel, talk to us and share your ideas. + +### Fork and clone your repository + +1. Fork the repository [(click here to fork now)](https://github.com/hydralauncher/hydra/fork) +2. Clone your forked code `git clone https://github.com/your_username/hydra` +3. Create a new branch +4. Push your commits +5. Submit a new Pull Request + +### Ways you can contribute + +- Translation: We want Hydra to be available to as many people as possible. Feel free to help translate to new languages or update and improve the ones that are already available on Hydra. +- Code: Hydra is built with Typescript, Electron and a little bit of Python. If you want to contribute, join our Discord server! + +### Project Structure + +- torrent-client: We use libtorrent, a Python library, to manage torrent downloads +- src/renderer: the UI of the application +- src/main: all the logic rests here. + +## Build from source + ### Install Node.js Ensure you have Node.js installed on your machine. If not, download and install it from [nodejs.org](https://nodejs.org/). @@ -19,12 +115,6 @@ Ensure you have Node.js installed on your machine. If not, download and install Yarn is a package manager for Node.js. If you haven't installed Yarn yet, you can do so by following the instructions on [yarnpkg.com](https://classic.yarnpkg.com/lang/en/docs/install/). -### Clone the Repository - -```bash -git clone https://github.com/hydralauncher/hydra.git -``` - ### Install Node Dependencies Navigate to the project directory and install the Node dependencies using Yarn: @@ -36,7 +126,7 @@ yarn ### Install Python 3.9 -Ensure you have Python installed on your machine. You can download and install it from [python.org](https://www.python.org/downloads/release/python-3919/). +Ensure you have Python 3.9 installed on your machine. You can download and install it from [python.org](https://www.python.org/downloads/release/python-3919/). ### Install Python Dependencies @@ -48,17 +138,17 @@ pip install -r requirements.txt ## Environment variables -You'll need a SteamGridDB API Key in order to fetch the game icons on installation. +You'll need an SteamGridDB API Key in order to fetch the game icons on installation. If you want to have onlinefix as a repacker you'll need to add your credentials to the .env -Once you have it, you can paste the `.env.example` file and put it on `STEAMGRIDDB_API_KEY`, `ONLINEFIX_USERNAME`, `ONLINEFIX_PASSWORD`. +Once you have it, you can copy or rename the `.env.example` file to `.env`and put it on`STEAMGRIDDB_API_KEY`, `ONLINEFIX_USERNAME`, `ONLINEFIX_PASSWORD`. ## Running Once you've got all things set up, you can run the following command to start both the Electron process and the bittorrent client: ```bash -yarn start +yarn dev ``` ## Build @@ -75,8 +165,16 @@ python torrent-client/setup.py build Build the Electron application by using this command: +On Windows: + ```bash -yarn make +yarn build:win +``` + +On Linux: + +```bash +yarn build:linux ``` ## Contributors @@ -141,6 +239,13 @@ yarn make Null + + + Hachi-R +
+ Hachi + + pmenta @@ -161,15 +266,15 @@ yarn make
Guilherme Viana - + + eltociear
Ikko Eltociear Ashimine - - + Netflixyapp @@ -177,19 +282,33 @@ yarn make Netflixy - - - Hachi-R -
- Hachi - - FerNikoMF
Firdavs + + + + Chr1s0Blood +
+ Cristian S. + + + + + userMacieG +
+ Maciej Ratyński + + + + + Tunchichi +
+ Ruslan + diff --git a/README.ru.md b/README.ru.md new file mode 100644 index 00000000..5cbeb48e --- /dev/null +++ b/README.ru.md @@ -0,0 +1,314 @@ +
+ +
+ + + +

Hydra Launcher

+

+ Hydra-это игровой лаунчер со своим собственным встроенным клиентом BitTorrent и самоуправляемым скребком репаков. +

+

+ + + + + + + + + +

+ +![Hydra Catalogue](./docs/screenshot.png) + +
+ +
+ +### Язык +[![ru](https://img.shields.io/badge/lang-ru-red)](https://github.com/hydralauncher/hydra/blob/main/README.ru.md) + +## Содержание + +- [О нас](#о-нас) +- [Функции](#функции) +- [Установка](#установка) +- [Сотрудничество](#сотрудничество) + - [Присоединяйтесь к нашему Discord](#присоединяйтесь-к-нашему-discord) + - [Ответвлить и клонировать свой репозиторий](#ответвлить-и-клонировать-свой-репозиторий) + - [Способы внести свой вклад](#способы-внести-свой-вклад) + - [Структура проекта](#структура-проекта) +- [Создать из источника](#создать-из-источника) + - [Установите Node.js](#установите-nodejs) + - [Установите Yarn](#установите-yarn) + - [Установите зависимости Node](#установите-зависимости-node) + - [Установите Python 3.9](#установите-python-39) + - [Установите зависимости Python](#установите-зависимости-python) +- [Переменные среды](#переменные-среды) +- [Запуск](#запуск) +- [Создание](#создание) + - [Создайте клиент BitTorrent](#создайте-клиент-bittorrent) + - [Создайте приложение Electron](#создайте-приложение-electron) +- [Участники](#участники) + +## О нас + +**Hydra**-это **Игровой Лаунчер** со своим собственным встроенным **BitTorrent Client** и **самоуправляемым скребком репаков**. +
+Лаунчер написан на TypeScript (Electron) и Python, который обрабатывает систему торрента с использованием LibTorrent. + +## Функции + +- Самоуправляемый скребок репаков среди всех самых надежных веб-сайтов на [Megathread]("https://www.reddit.com/r/Piracy/wiki/megathread/") +- Собственный встроенный клиент BitTorrent +- Как долго пробиться (HLTB) интеграция на странице игры +- Загрузка настройки пути +- Уведомления об обновлении списка репаков +- Поддержка Windows и Linux +- Постоянно обновляется +- И более ... + +## Установка + +Следуйте приведенным ниже шагам, чтобы установить: + +1. Загрузите последнюю версию Hydra из [Выпуски](https://github.com/hydralauncher/hydra/releases/latest). + - Загрузите только .exe, если вы хотите установить Hydra в Windows. + - Скачать .deb или .rpm или .zip, если вы хотите установить Hydra на Linux.(Зависит от вашего дистрибутива Linux) +2. Запустите загруженный файл. +3. Наслаждаться Hydra! + +## Сотрудничество + +### Присоединяйтесь к нашему Discord + +Мы концентрируем наши обсуждения на нашем [Discord](https://discord.gg/hydralauncher) сервере. + +1. Присоединяйтесь к нашему серверу +2. Перейдите на роли канала и возьмите роль сотрудничества +3. Зайдите на канал Dev, поговорите с нами и поделитесь своими идеями. + +### Ответвлить и клонировать свой репозиторий + +1. Ответвление репозитория [(Нажмите здесь, чтобы сейчас ответвлить)](https://github.com/hydralauncher/hydra/fork) +2. Клонировать свой ответвленный код `git clone https://github.com/your_username/hydra` +3. Создать новую ветку +4. Подтолкнуть свои коммиты +5. Отправить новый запрос на привлечение + +### Способы внести свой вклад + +- Перевод: Мы хотим, чтобы Hydra была доступна как можно большему количеству людей. Не стесняйтесь переводить на новые языки или обновить и улучшить те, которые уже доступны на Hydra. +- Код: Hydra построена на TypeScript, Electron и немного Python.Если вы хотите внести свой вклад, присоединяйтесь к нашему серверу Discord! + +### Структура проекта + +- torrent-client: Мы используем LibTorrent, библиотеку Python, чтобы управлять загрузками торрента +- src/renderer: пользовательский интерфейс приложения +- src/main: Вся логика отдыхает здесь. + +## Создать из источника + +### Установите Node.js + +Убедитесь, что у вас установлен Node.js на вашем компьютере.Если нет, загрузите и установите из [nodejs.org](https://nodejs.org/). + +### Установите Yarn + +Yarn является менеджером пакетов для node.js. Если вы еще не установили Yarn, вы можете сделать это, следуя инструкциям на [yarnpkg.com](https://classic.yarnpkg.com/lang/en/docs/install/). + +### Установите зависимости Node + +Перейдите к каталогу проекта и установите Node зависимости с использованием Yarn: + +```bash +cd hydra +yarn +``` + +### Установите Python 3.9 + +Убедитесь, что на вашем компьютере установлен Python 3.9. Вы можете скачать и установить его из [python.org](https://www.python.org/downloads/release/python-3919/). + +### Установите зависимости Python + +Установите необходимые зависимости Python, используя pip: + +```bash +pip install -r requirements.txt +``` + +## Переменные среды + +Вам понадобится ключ API SteamGridDB, чтобы принести значки игры при установке. +Если вы хотите получить онлайн -фикс в качестве репака, вам нужно добавить свои учетные данные в .env + +Как только он у вас есть, вы можете скопировать или переименовать `.env.example` файл в `.env`и заполнить это`STEAMGRIDDB_API_KEY`, `ONLINEFIX_USERNAME`, `ONLINEFIX_PASSWORD`. + +## Запуск + +После того, как у вас все настроено, вы можете запустить следующую команду, чтобы запустить приложение Electron и клиент BitTorrent: + +```bash +yarn dev +``` + +## Создание + +### Создайте клиент BitTorrent + +Создайте клиент BitTorrent, используя эту команду: + +```bash +python torrent-client/setup.py build +``` + +### Создайте приложение Electron + +Создайте приложение Electron с помощью этой команды: + +В Windows: + +```bash +yarn build:win +``` + +В Linux: + +```bash +yarn build:linux +``` + +## Участники + + + + + + + + + + + + + + + + + + + + + + + +
+ + hydralauncher +
+ Hydra + + 		+ + zamitto +
+ Null + + 		+ + fzanutto +
+ Null + + 		+ + JackEnx +
+ Null + + 		+ + Magrid0 +
+ Magrid + + 		+ + fhilipecrash +
+ Fhilipe Coelho + +
+ + jps14 +
+ José Luís + + 		+ + shadowtosser +
+ Null + + 		+ + pmenta +
+ João Martins + + 		+ + ferivoq +
+ FeriVOQ + + 		+ + xbozo +
+ Guilherme Viana + + 		+ + eltociear +
+ Ikko Eltociear Ashimine + +
+ + Netflixyapp +
+ Netflixy + + 		+ + Hachi-R +
+ Hachi + + 		+ + FerNikoMF +
+ Firdavs + + 		+ + userMacieG +
+ Maciej Ratyński + + 		+ + Tunchichi +
+ Ruslan + +
+ + +## License + +Hydra лицензирована в соответствии с лицензией [MIT License](LICENSE). diff --git a/docs/screenshot.png b/docs/screenshot.png index b98fab75..413f2ac1 100644 Binary files a/docs/screenshot.png and b/docs/screenshot.png differ diff --git a/package.json b/package.json index 7ba9bdf4..55b64d05 100644 --- a/package.json +++ b/package.json @@ -37,6 +37,7 @@ "@sentry/vite-plugin": "^2.16.1", "@vanilla-extract/css": "^1.14.2", "@vanilla-extract/recipes": "^0.5.2", + "auto-launch": "^5.0.6", "axios": "^1.6.8", "better-sqlite3": "^9.5.0", "check-disk-space": "^3.4.0", @@ -66,6 +67,7 @@ "@electron-toolkit/eslint-config-ts": "^1.0.1", "@electron-toolkit/tsconfig": "^1.0.1", "@swc/core": "^1.4.16", + "@types/auto-launch": "^5.0.5", "@types/jsdom": "^21.1.6", "@types/lodash-es": "^4.17.12", "@types/node": "^20.12.7", diff --git a/src/locales/en/translation.json b/src/locales/en/translation.json index b6d1b882..ccc31520 100644 --- a/src/locales/en/translation.json +++ b/src/locales/en/translation.json @@ -138,7 +138,8 @@ "telemetry": "Telemetry", "telemetry_description": "Enable anonymous usage statistics", "behavior": "Behavior", - "quit_app_instead_hiding": "Close app instead of minimizing to tray" + "quit_app_instead_hiding": "Close app instead of minimizing to tray", + "launch_with_system": "Launch app on system start-up" }, "notifications": { "download_complete": "Download complete", diff --git a/src/locales/es/translation.json b/src/locales/es/translation.json index 8f36c12f..1a8f5d48 100644 --- a/src/locales/es/translation.json +++ b/src/locales/es/translation.json @@ -15,9 +15,12 @@ "checking_files": "{{title}} ({{percentage}} - Analizando archivos…)", "paused": "{{title}} (Pausado)", "downloading": "{{title}} ({{percentage}} - Descargando…)", - "filter": "Filtrar biblioteca", + "filter": "Buscar en la biblioteca", + "follow_us": "Síguenos", "home": "Inicio", - "follow_us": "Síguenos" + "discord": "Únete a nuestro Discord", + "x": "Síguenos en X", + "github": "Contribuye en GitHub" }, "header": { "search": "Buscar", @@ -45,7 +48,7 @@ "remove": "Eliminar", "remove_from_list": "Quitar", "space_left_on_disk": "{{space}} restantes en el disco", - "eta": "Finalizando {{eta}}", + "eta": "Finalizando en {{eta}}", "downloading_metadata": "Descargando metadatos…", "checking_files": "Analizando archivos…", "filter": "Filtrar repacks", @@ -55,14 +58,12 @@ "no_minimum_requirements": "Sin requisitos mínimos para {{title}}", "no_recommended_requirements": "{{title}} no tiene requisitos recomendados", "paused_progress": "{{progress}} (Pausado)", - "release_date": "Fecha de lanzamiento {{date}}", - "publisher": "Publicado por {{publisher}}", + "release_date": "Fecha de lanzamiento: {{date}}", + "publisher": "Publicado por: {{publisher}}", "copy_link_to_clipboard": "Copiar enlace", "copied_link_to_clipboard": "Enlace copiado", "hours": "horas", "minutes": "minutos", - "amount_hours": "{{amount}} horas", - "amount_minutes": "{{amount}} minutos", "accuracy": "{{accuracy}}% precisión", "add_to_library": "Agregar a la biblioteca", "remove_from_library": "Eliminar de la biblioteca", @@ -75,7 +76,21 @@ "close": "Cerrar", "deleting": "Eliminando instalador…", "playing_now": "Jugando ahora", - "last_time_played": "Jugado por última vez {{period}}" + "last_time_played": "Jugado por última vez {{period}}", + "got_it": "Entendido", + "change": "Cambiar", + "repacks_modal_description": "Selecciona el repack que quieres descargar", + "downloads_path": "Ruta de descarga", + "select_folder_hint": "Para cambiar la carpeta predeterminada, accede a", + "settings": "Ajustes", + "download_now": "Descargar ahora", + "installation_instructions": "Instrucciones de instalación", + "installation_instructions_description": "Se requieren de pasos adicionales para instalar este juego", + "online_fix_instruction": "Los juegos de OnlineFix requieren una contraseña para ser extraídos. Cuando se requiera, usa la siguiente contraseña:", + "dodi_installation_instruction": "Cuando abras el instalador de DODI, presiona la tecla hacia arriba del teclado <0 /> para iniciar el proceso de instalación:", + "dont_show_it_again": "No mostrar de nuevo", + "copy_to_clipboard": "Copiar", + "copied_to_clipboard": "Copiado" }, "activation": { "title": "Activar Hydra", @@ -88,7 +103,7 @@ "downloads": { "resume": "Resumir", "pause": "Pausa", - "eta": "Finalizando {{eta}}", + "eta": "Finalizando en {{eta}}", "paused": "En Pausa", "verifying": "Verificando…", "completed_at": "Completado el {{date}}", @@ -103,8 +118,8 @@ "starting_download": "Iniciando descarga…", "remove_from_list": "Eliminar", "delete": "Eliminar instalador", - "delete_modal_description": "Esto eliminará todos los archivos de instalación de su computadora.", - "delete_modal_title": "¿Está seguro?", + "delete_modal_description": "Esto eliminará todos los archivos de instalación de tu computadora.", + "delete_modal_title": "¿Estás seguro?", "deleting": "Eliminando instalador…", "install": "Instalar" }, @@ -136,6 +151,9 @@ "description": "Los ejecutables de Wine o Lutris no se encontraron en su sistema", "instructions": "Comprueba como instalar de forma correcta uno de los dos en tu distro de Linux para ejecutar el juego con normalidad" }, + "modal": { + "close": "Botón de cierre" + }, "catalogue": { "next_page": "Siguiente página", "previous_page": "Pagina anterior" diff --git a/src/locales/index.ts b/src/locales/index.ts index 209c4d4c..66f5a05f 100644 --- a/src/locales/index.ts +++ b/src/locales/index.ts @@ -4,4 +4,5 @@ export { default as es } from "./es/translation.json"; export { default as fr } from "./fr/translation.json"; export { default as hu } from "./hu/translation.json"; export { default as it } from "./it/translation.json"; +export { default as pl } from "./pl/translation.json"; export { default as ru } from "./ru/translation.json"; diff --git a/src/locales/pl/translation.json b/src/locales/pl/translation.json new file mode 100644 index 00000000..5623c74e --- /dev/null +++ b/src/locales/pl/translation.json @@ -0,0 +1,147 @@ +{ + "home": { + "featured": "Wyróżnione", + "recently_added": "Ostatnio dodane", + "trending": "Trendujące", + "surprise_me": "Zaskocz mnie", + "no_results": "Nie znaleziono wyników" + }, + "sidebar": { + "catalogue": "Katalog", + "downloads": "Pobrane", + "settings": "Ustawienia", + "my_library": "Moja biblioteka", + "downloading_metadata": "{{title}} (Pobieranie metadata…)", + "checking_files": "{{title}} ({{percentage}} - Sprawdzanie plików…)", + "paused": "{{title}} (Zatrzymano)", + "downloading": "{{title}} ({{percentage}} - Pobieranie…)", + "filter": "Filtruj biblioteke", + "follow_us": "Śledź nas", + "home": "Główna" + }, + "header": { + "search": "Szukaj", + "home": "Główna", + "catalogue": "Katalog", + "downloads": "Pobrane", + "search_results": "Wyniki wyszukiwania", + "settings": "Ustawienia" + }, + "bottom_panel": { + "no_downloads_in_progress": "Brak pobierań w toku", + "downloading_metadata": "Pobieranie {{title}} metadata…", + "checking_files": "Sprawdzanie {{title}} plików… (ukończone w {{percentage}})", + "downloading": "Pobieranie {{title}}… (ukończone w {{percentage}}) - Podsumowanie {{eta}} - {{speed}}" + }, + "catalogue": { + "next_page": "Następna strona", + "previous_page": "Poprzednia strona" + }, + "game_details": { + "open_download_options": "Otwórz opcje pobierania", + "download_options_zero": "Brak opcji pobierania", + "download_options_one": "{{count}} opcja pobierania", + "download_options_other": "{{count}} opcji pobierania", + "updated_at": "Zaktualizowano {{updated_at}}", + "install": "Instaluj", + "resume": "Wznów", + "pause": "Zatrzymaj", + "cancel": "Anuluj", + "remove": "Usuń", + "remove_from_list": "Usuń", + "space_left_on_disk": "{{space}} wolnego na dysku", + "eta": "Podsumowanie {{eta}}", + "downloading_metadata": "Pobieranie metadata…", + "checking_files": "Sprawdzanie plików…", + "filter": "Filtruj repacki", + "requirements": "Wymagania systemowe", + "minimum": "Minimalne", + "recommended": "Zalecane", + "no_minimum_requirements": "{{title}} nie zawiera informacji o minimalnych wymaganiach", + "no_recommended_requirements": "{{title}} nie zawiera informacji o zalecanych wymaganiach", + "paused_progress": "{{progress}} (Zatrzymano)", + "release_date": "Wydano w {{date}}", + "publisher": "Opublikowany przez {{publisher}}", + "copy_link_to_clipboard": "Kopiuj łącze", + "copied_link_to_clipboard": "Skopiowano łącze", + "hours": "godzin", + "minutes": "minut", + "accuracy": "{{accuracy}}% dokładność", + "add_to_library": "Dodaj do biblioteki", + "remove_from_library": "Usuń z biblioteki", + "no_downloads": "Brak dostępnych plików do pobrania", + "play_time": "Grano przez {{amount}}", + "last_time_played": "Ostatnio grano {{period}}", + "not_played_yet": "Nie grano {{title}}", + "next_suggestion": "Następna sugestia", + "play": "Graj", + "deleting": "Usuwanie instalatora…", + "close": "Zamknij", + "playing_now": "Granie teraz", + "change": "Zmień", + "repacks_modal_description": "Wybierz repack, który chcesz pobrać", + "downloads_path": "Ścieżka pobierania", + "select_folder_hint": "Aby zmienić domyślny folder, przejdź do", + "settings": "Ustawienia Hydra", + "download_now": "Pobierz teraz" + }, + "activation": { + "title": "Aktywuj Hydra", + "installation_id": "Identyfikator instalacji:", + "enter_activation_code": "Enter your activation code", + "message": "Jeśli nie wiesz, gdzie o to poprosić, to nie powinieneś/aś tego mieć.", + "activate": "Aktywuj", + "loading": "Ładowanie…" + }, + "downloads": { + "resume": "Wznów", + "pause": "Zatrzymaj", + "eta": "Podsumowanie {{eta}}", + "paused": "Zatrzymano", + "verifying": "Weryfikowanie…", + "completed_at": "Zakończono w {{date}}", + "completed": "Zakończono", + "cancelled": "Anulowano", + "download_again": "Pobierz ponownie", + "cancel": "Anuluj", + "filter": "Filtruj pobrane gry", + "remove": "Usuń", + "downloading_metadata": "Pobieranie metadata…", + "checking_files": "Sprawdzanie plików…", + "starting_download": "Rozpoczęto pobieranie…", + "deleting": "Usuwanie instalatora…", + "delete": "Usuń instalator", + "remove_from_list": "Usuń", + "delete_modal_title": "Czy na pewno?", + "delete_modal_description": "Spowoduje to usunięcie wszystkich plików instalacyjnych z komputera", + "install": "Instaluj" + }, + "settings": { + "downloads_path": "Ścieżka pobierania", + "change": "Aktualizuj", + "notifications": "Powiadomienia", + "enable_download_notifications": "Gdy pobieranie zostanie zakończone", + "enable_repack_list_notifications": "Gdy dodawany jest nowy repack", + "telemetry": "Telemetria", + "telemetry_description": "Włącz anonimowe statystyki użycia" + }, + "notifications": { + "download_complete": "Pobieranie zakończone", + "game_ready_to_install": "{{title}} jest gotowe do zainstalowania", + "repack_list_updated": "Lista repacków zaktualizowana", + "repack_count_one": "{{count}} repack dodany", + "repack_count_other": "{{count}} repacki dodane" + }, + "system_tray": { + "open": "Otwórz Hydra", + "quit": "Wyjdź" + }, + "game_card": { + "no_downloads": "Brak dostępnych plików do pobrania" + }, + "binary_not_found_modal": { + "title": "Programy nie są zainstalowane", + "description": "Pliki wykonywalne Wine lub Lutris nie zostały znalezione na twoim systemie", + "instructions": "Sprawdź prawidłowy sposób instalacji dowolnego z nich w swojej dystrybucji Linuksa, aby gra działała normalnie" + } +} diff --git a/src/locales/pt/translation.json b/src/locales/pt/translation.json index fce8eb36..c5e66c02 100644 --- a/src/locales/pt/translation.json +++ b/src/locales/pt/translation.json @@ -134,7 +134,8 @@ "telemetry": "Telemetria", "telemetry_description": "Habilitar estatísticas de uso anônimas", "behavior": "Comportamento", - "quit_app_instead_hiding": "Fechar o aplicativo em vez de minimizá-lo" + "quit_app_instead_hiding": "Fechar o aplicativo em vez de minimizá-lo", + "launch_with_system": "Iniciar aplicativo na inicialização do sistema" }, "notifications": { "download_complete": "Download concluído", diff --git a/src/locales/ru/translation.json b/src/locales/ru/translation.json index 1af29e2c..2f5244ff 100644 --- a/src/locales/ru/translation.json +++ b/src/locales/ru/translation.json @@ -17,7 +17,10 @@ "downloading": "{{title}} ({{percentage}} - Загрузка…)", "filter": "Фильтровать библиотеку", "follow_us": "Подписывайтесь на нас", - "home": "Главная" + "home": "Главная", + "discord": "Присоединяйся к Discord", + "x": "Подписывайтесь на X", + "github": "Внести свой вклад в GitHub" }, "header": { "search": "Поиск", @@ -66,6 +69,8 @@ "copied_link_to_clipboard": "Ссылка скопирована", "hours": "часов", "minutes": "минут", + "amount_hours": "{{amount}} часов", + "amount_minutes": "{{amount}} минут", "accuracy": "{{accuracy}}% точность", "add_to_library": "Добавить в библиотеку", "remove_from_library": "Удалить из библиотеки", @@ -83,7 +88,15 @@ "downloads_path": "Путь загрузок", "select_folder_hint": "Чтобы изменить папку по умолчанию, откройте", "settings": "Настройки Hydra", - "download_now": "Загрузить сейчас" + "download_now": "Загрузить сейчас", + "installation_instructions": "Инструкция по установке", + "installation_instructions_description": "Для установки этой игры требуются дополнительные шаги", + "online_fix_instruction": "В играх с OnlineFix требуется ввести пароль для извлеченияя.При необходимости используйте следующий пароль:", + "dodi_installation_instruction": "При открытии установщика Dodi нажмите клавишу вверх клавиатуру <0 />, чтобы запустить процесс установки:", + "dont_show_it_again": "Не показывать это снова", + "copy_to_clipboard": "Копировать", + "copied_to_clipboard": "Скопировано", + "got_it": "Понятно" }, "activation": { "title": "Активировать Hydra", @@ -123,7 +136,10 @@ "enable_download_notifications": "По завершении загрузки", "enable_repack_list_notifications": "При добавлении нового репака", "telemetry": "Телеметрия", - "telemetry_description": "Включить анонимную статистику использования" + "telemetry_description": "Включить анонимную статистику использования", + "behavior": "Поведение", + "quit_app_instead_hiding": "Закрывать приложение вместо того, чтобы сворачивать его в трей" + "launch_with_system": "Запуск приложения при запуске системы" }, "notifications": { "download_complete": "Загрузка завершена", @@ -143,5 +159,8 @@ "title": "Программы не установлены", "description": "Исполняемые файлы Wine или Lutris не найдены на вашей системе", "instructions": "Узнайте правильный способ установить любой из них на вашем дистрибутиве Linux, чтобы игра могла нормально работать" + }, + "modal": { + "close": "Кнопка закрытия" } } diff --git a/src/main/entity/user-preferences.entity.ts b/src/main/entity/user-preferences.entity.ts index 501bd77d..9d2e35ce 100644 --- a/src/main/entity/user-preferences.entity.ts +++ b/src/main/entity/user-preferences.entity.ts @@ -29,6 +29,9 @@ export class UserPreferences { @Column("boolean", { default: false }) preferQuitInsteadOfHiding: boolean; + @Column("boolean", { default: false }) + runAtStartup: boolean; + @CreateDateColumn() createdAt: Date; diff --git a/src/main/events/index.ts b/src/main/events/index.ts index 4ce550c6..822cb9d5 100644 --- a/src/main/events/index.ts +++ b/src/main/events/index.ts @@ -18,7 +18,6 @@ import "./library/open-game"; import "./library/open-game-installer"; import "./library/remove-game"; import "./library/remove-game-from-library"; -import "./misc/get-or-cache-image"; import "./misc/open-external"; import "./misc/show-open-dialog"; import "./torrenting/cancel-game-download"; @@ -27,6 +26,7 @@ import "./torrenting/resume-game-download"; import "./torrenting/start-game-download"; import "./user-preferences/get-user-preferences"; import "./user-preferences/update-user-preferences"; +import "./user-preferences/auto-launch"; ipcMain.handle("ping", () => "pong"); ipcMain.handle("getVersion", () => app.getVersion()); diff --git a/src/main/events/library/add-game-to-library.ts b/src/main/events/library/add-game-to-library.ts index ba528dbc..49f42d5f 100644 --- a/src/main/events/library/add-game-to-library.ts +++ b/src/main/events/library/add-game-to-library.ts @@ -3,7 +3,7 @@ import { gameRepository } from "@main/repository"; import { registerEvent } from "../register-event"; import type { GameShop } from "@types"; -import { getImageBase64 } from "@main/helpers"; +import { getFileBase64 } from "@main/helpers"; import { getSteamGameIconUrl } from "@main/services"; const addGameToLibrary = async ( @@ -11,7 +11,7 @@ const addGameToLibrary = async ( objectID: string, title: string, gameShop: GameShop, - executablePath: string + executablePath: string | null ) => { const game = await gameRepository.findOne({ where: { @@ -31,7 +31,7 @@ const addGameToLibrary = async ( } ); } else { - const iconUrl = await getImageBase64(await getSteamGameIconUrl(objectID)); + const iconUrl = await getFileBase64(await getSteamGameIconUrl(objectID)); return gameRepository.insert({ title, diff --git a/src/main/events/misc/get-or-cache-image.ts b/src/main/events/misc/get-or-cache-image.ts deleted file mode 100644 index 3dd86358..00000000 --- a/src/main/events/misc/get-or-cache-image.ts +++ /dev/null @@ -1,40 +0,0 @@ -import crypto from "node:crypto"; -import fs from "node:fs"; -import path from "node:path"; - -import { registerEvent } from "../register-event"; -import { getFileBuffer } from "@main/helpers"; -import { logger } from "@main/services"; -import { imageCachePath } from "@main/constants"; - -const getOrCacheImage = async ( - _event: Electron.IpcMainInvokeEvent, - url: string -) => { - if (!fs.existsSync(imageCachePath)) fs.mkdirSync(imageCachePath); - - const extname = path.extname(url); - - const checksum = crypto.createHash("sha256").update(url).digest("hex"); - const cachePath = path.join(imageCachePath, `${checksum}${extname}`); - - const cache = fs.existsSync(cachePath); - - if (cache) return `hydra://${cachePath}`; - - getFileBuffer(url).then((buffer) => - fs.writeFile(cachePath, buffer, (err) => { - if (err) { - logger.error(`Failed to cache image`, err, { - method: "getOrCacheImage", - }); - } - }) - ); - - return url; -}; - -registerEvent(getOrCacheImage, { - name: "getOrCacheImage", -}); diff --git a/src/main/events/misc/show-open-dialog.ts b/src/main/events/misc/show-open-dialog.ts index 123a47d6..baa6a016 100644 --- a/src/main/events/misc/show-open-dialog.ts +++ b/src/main/events/misc/show-open-dialog.ts @@ -5,7 +5,11 @@ import { registerEvent } from "../register-event"; const showOpenDialog = async ( _event: Electron.IpcMainInvokeEvent, options: Electron.OpenDialogOptions -) => dialog.showOpenDialog(WindowManager.mainWindow, options); +) => { + if (WindowManager.mainWindow) { + dialog.showOpenDialog(WindowManager.mainWindow, options); + } +}; registerEvent(showOpenDialog, { name: "showOpenDialog", diff --git a/src/main/events/torrenting/start-game-download.ts b/src/main/events/torrenting/start-game-download.ts index 1bdb1a6b..8a42ef70 100644 --- a/src/main/events/torrenting/start-game-download.ts +++ b/src/main/events/torrenting/start-game-download.ts @@ -5,7 +5,7 @@ import { GameStatus } from "@main/constants"; import { registerEvent } from "../register-event"; import type { GameShop } from "@types"; -import { getImageBase64 } from "@main/helpers"; +import { getFileBase64 } from "@main/helpers"; import { In } from "typeorm"; const startGameDownload = async ( @@ -72,7 +72,7 @@ const startGameDownload = async ( return game; } else { - const iconUrl = await getImageBase64(await getSteamGameIconUrl(objectID)); + const iconUrl = await getFileBase64(await getSteamGameIconUrl(objectID)); const createdGame = await gameRepository.save({ title, diff --git a/src/main/events/user-preferences/auto-launch.ts b/src/main/events/user-preferences/auto-launch.ts new file mode 100644 index 00000000..f4e91587 --- /dev/null +++ b/src/main/events/user-preferences/auto-launch.ts @@ -0,0 +1,21 @@ +import { registerEvent } from "../register-event"; +import AutoLaunch from "auto-launch"; +import { app } from "electron"; + +const autoLaunch = async ( + _event: Electron.IpcMainInvokeEvent, + enabled: boolean +) => { + const appLauncher = new AutoLaunch({ + name: app.getName(), + }); + if (enabled) { + appLauncher.enable().catch(); + } else { + appLauncher.disable().catch(); + } +}; + +registerEvent(autoLaunch, { + name: "autoLaunch", +}); diff --git a/src/main/helpers/index.ts b/src/main/helpers/index.ts index a6807378..364d4897 100644 --- a/src/main/helpers/index.ts +++ b/src/main/helpers/index.ts @@ -79,10 +79,24 @@ export const getFileBuffer = async (url: string) => response.arrayBuffer().then((buffer) => Buffer.from(buffer)) ); -export const getImageBase64 = async (url: string) => - getFileBuffer(url).then((buffer) => { - return `data:image/jpeg;base64,${Buffer.from(buffer).toString("base64")}`; - }); +export const getFileBase64 = async (url: string) => + fetch(url, { method: "GET" }).then((response) => + response.arrayBuffer().then((buffer) => { + const base64 = Buffer.from(buffer).toString("base64"); + const contentType = response.headers.get("content-type"); + + return `data:${contentType};base64,${base64}`; + }) + ); + +export const steamUrlBuilder = { + library: (objectID: string) => + `https://steamcdn-a.akamaihd.net/steam/apps/${objectID}/header.jpg`, + libraryHero: (objectID: string) => + `https://steamcdn-a.akamaihd.net/steam/apps/${objectID}/library_hero.jpg`, + logo: (objectID: string) => + `https://cdn.cloudflare.steamstatic.com/steam/apps/${objectID}/logo.png`, +}; export * from "./formatters"; export * from "./ps"; diff --git a/src/main/index.ts b/src/main/index.ts index 4d953022..54f0d5b8 100644 --- a/src/main/index.ts +++ b/src/main/index.ts @@ -85,7 +85,7 @@ app.on("second-instance", (_event, commandLine) => { WindowManager.createMainWindow(); } - const [, path] = commandLine.pop().split("://"); + const [, path] = commandLine.pop()?.split("://") ?? []; if (path) WindowManager.redirect(path); }); diff --git a/src/main/services/steam-250.ts b/src/main/services/steam-250.ts index 0ece8ae5..db505b47 100644 --- a/src/main/services/steam-250.ts +++ b/src/main/services/steam-250.ts @@ -41,7 +41,8 @@ export const getSteam250List = async () => { ).flat(); const gamesMap: Map = gamesList.reduce((map, item) => { - map.set(item.objectID, item); + if (item) map.set(item.objectID, item); + return map; }, new Map()); diff --git a/src/main/services/torrent-client.ts b/src/main/services/torrent-client.ts index 6ddb34ba..2743c82a 100644 --- a/src/main/services/torrent-client.ts +++ b/src/main/services/torrent-client.ts @@ -1,6 +1,5 @@ import path from "node:path"; import cp from "node:child_process"; -import crypto from "node:crypto"; import fs from "node:fs"; import * as Sentry from "@sentry/electron/main"; import { Notification, app, dialog } from "electron"; @@ -99,25 +98,6 @@ export class TorrentClient { return game.progress; } - private static createTempIcon(encodedIcon: string): Promise { - return new Promise((resolve, reject) => { - const hash = crypto.randomBytes(16).toString("hex"); - const iconPath = path.join(app.getPath("temp"), `${hash}.png`); - - fs.writeFile( - iconPath, - Buffer.from( - encodedIcon.replace("data:image/jpeg;base64,", ""), - "base64" - ), - (err) => { - if (err) reject(err); - resolve(iconPath); - } - ); - }); - } - public static async onSocketData(data: Buffer) { const message = Buffer.from(data).toString("utf-8"); @@ -159,10 +139,7 @@ export class TorrentClient { }); if (userPreferences?.downloadNotificationsEnabled) { - const iconPath = await this.createTempIcon(game.iconUrl); - new Notification({ - icon: iconPath, title: t("download_complete", { ns: "notifications", lng: userPreferences.language, diff --git a/src/main/services/window-manager.ts b/src/main/services/window-manager.ts index cc94c073..f810acd5 100644 --- a/src/main/services/window-manager.ts +++ b/src/main/services/window-manager.ts @@ -26,7 +26,7 @@ export class WindowManager { } } - public static async createMainWindow() { + public static createMainWindow() { // Create the browser window. this.mainWindow = new BrowserWindow({ width: 1200, @@ -50,11 +50,15 @@ export class WindowManager { this.loadURL(); this.mainWindow.removeMenu(); - const userPreferences = await userPreferencesRepository.findOne({ - where: { id: 1 }, + this.mainWindow.on("ready-to-show", () => { + if (!app.isPackaged) WindowManager.mainWindow?.webContents.openDevTools(); }); - this.mainWindow.on("close", () => { + this.mainWindow.on("close", async () => { + const userPreferences = await userPreferencesRepository.findOne({ + where: { id: 1 }, + }); + if (userPreferences?.preferQuitInsteadOfHiding) { app.quit(); } diff --git a/src/main/workers/torrent-parser.worker.ts b/src/main/workers/torrent-parser.worker.ts index 555c0947..f8cf2e70 100644 --- a/src/main/workers/torrent-parser.worker.ts +++ b/src/main/workers/torrent-parser.worker.ts @@ -1,13 +1,16 @@ import { parentPort } from "worker_threads"; import parseTorrent from "parse-torrent"; -import { getFileBuffer } from "@main/helpers"; const port = parentPort; if (!port) throw new Error("IllegalState"); +export const getFileBuffer = async (url: string) => + fetch(url, { method: "GET" }).then((response) => + response.arrayBuffer().then((buffer) => Buffer.from(buffer)) + ); + port.on("message", async (url: string) => { const buffer = await getFileBuffer(url); const torrent = await parseTorrent(buffer); - port.postMessage(torrent); }); diff --git a/src/preload/index.d.ts b/src/preload/index.d.ts index 4ca7b2fb..51163f1a 100644 --- a/src/preload/index.d.ts +++ b/src/preload/index.d.ts @@ -48,6 +48,7 @@ contextBridge.exposeInMainWorld("electron", { getUserPreferences: () => ipcRenderer.invoke("getUserPreferences"), updateUserPreferences: (preferences: UserPreferences) => ipcRenderer.invoke("updateUserPreferences", preferences), + autoLaunch: (enabled: boolean) => ipcRenderer.invoke("autoLaunch", enabled), /* Library */ addGameToLibrary: ( @@ -94,7 +95,6 @@ contextBridge.exposeInMainWorld("electron", { getDiskFreeSpace: () => ipcRenderer.invoke("getDiskFreeSpace"), /* Misc */ - getOrCacheImage: (url: string) => ipcRenderer.invoke("getOrCacheImage", url), ping: () => ipcRenderer.invoke("ping"), getVersion: () => ipcRenderer.invoke("getVersion"), getDefaultDownloadsPath: () => ipcRenderer.invoke("getDefaultDownloadsPath"), diff --git a/src/preload/index.ts b/src/preload/index.ts index c4f8ca96..7d5eb7fe 100644 --- a/src/preload/index.ts +++ b/src/preload/index.ts @@ -57,6 +57,7 @@ contextBridge.exposeInMainWorld("electron", { getUserPreferences: () => ipcRenderer.invoke("getUserPreferences"), updateUserPreferences: (preferences: UserPreferences) => ipcRenderer.invoke("updateUserPreferences", preferences), + autoLaunch: (enabled: boolean) => ipcRenderer.invoke("autoLaunch", enabled), /* Library */ addGameToLibrary: ( @@ -104,7 +105,6 @@ contextBridge.exposeInMainWorld("electron", { ipcRenderer.invoke("getDiskFreeSpace", path), /* Misc */ - getOrCacheImage: (url: string) => ipcRenderer.invoke("getOrCacheImage", url), ping: () => ipcRenderer.invoke("ping"), getVersion: () => ipcRenderer.invoke("getVersion"), getDefaultDownloadsPath: () => ipcRenderer.invoke("getDefaultDownloadsPath"), diff --git a/src/renderer/index.html b/src/renderer/index.html index ea90e311..be1d3222 100644 --- a/src/renderer/index.html +++ b/src/renderer/index.html @@ -6,7 +6,7 @@ Hydra diff --git a/src/renderer/src/components/async-image/async-image.tsx b/src/renderer/src/components/async-image/async-image.tsx deleted file mode 100644 index e3c0ee45..00000000 --- a/src/renderer/src/components/async-image/async-image.tsx +++ /dev/null @@ -1,29 +0,0 @@ -import { forwardRef, useEffect, useState } from "react"; - -export interface AsyncImageProps - extends React.DetailedHTMLProps< - React.ImgHTMLAttributes, - HTMLImageElement - > { - onSettled?: (url: string) => void; -} - -export const AsyncImage = forwardRef( - ({ onSettled, ...props }, ref) => { - const [source, setSource] = useState(null); - - useEffect(() => { - if (props.src && props.src.startsWith("http")) { - window.electron.getOrCacheImage(props.src).then((url) => { - setSource(url); - - if (onSettled) onSettled(url); - }); - } - }, [props.src, onSettled]); - - return ; - } -); - -AsyncImage.displayName = "AsyncImage"; diff --git a/src/renderer/src/components/game-card/game-card.tsx b/src/renderer/src/components/game-card/game-card.tsx index ce9789c8..f7f6ffe4 100644 --- a/src/renderer/src/components/game-card/game-card.tsx +++ b/src/renderer/src/components/game-card/game-card.tsx @@ -4,8 +4,6 @@ import type { CatalogueEntry } from "@types"; import SteamLogo from "@renderer/assets/steam-logo.svg?react"; import EpicGamesLogo from "@renderer/assets/epic-games-logo.svg?react"; -import { AsyncImage } from "../async-image/async-image"; - import * as styles from "./game-card.css"; import { useAppSelector } from "@renderer/hooks"; import { useTranslation } from "react-i18next"; @@ -43,11 +41,7 @@ export function GameCard({ game, disabled, ...props }: GameCardProps) { disabled={disabled} >
- + {game.title}
diff --git a/src/renderer/src/components/hero/hero.tsx b/src/renderer/src/components/hero/hero.tsx index c3d27a3d..3ab110e9 100644 --- a/src/renderer/src/components/hero/hero.tsx +++ b/src/renderer/src/components/hero/hero.tsx @@ -1,5 +1,4 @@ import { useNavigate } from "react-router-dom"; -import { AsyncImage } from "@renderer/components"; import * as styles from "./hero.css"; import { useEffect, useState } from "react"; import { ShopDetails } from "@types"; @@ -35,14 +34,14 @@ export function Hero() { className={styles.hero} >
-
- - + {game.title} {getGameTitle(game)} diff --git a/src/renderer/src/declaration.d.ts b/src/renderer/src/declaration.d.ts index 661253d0..c20afe66 100644 --- a/src/renderer/src/declaration.d.ts +++ b/src/renderer/src/declaration.d.ts @@ -56,7 +56,7 @@ declare global { objectID: string, title: string, shop: GameShop, - executablePath: string + executablePath: string | null ) => Promise; getLibrary: () => Promise; getRepackersFriendlyNames: () => Promise>; @@ -74,12 +74,12 @@ declare global { updateUserPreferences: ( preferences: Partial ) => Promise; + autoLaunch: (enabled: boolean) => Promise; /* Hardware */ getDiskFreeSpace: (path: string) => Promise; /* Misc */ - getOrCacheImage: (url: string) => Promise; openExternal: (src: string) => Promise; getVersion: () => Promise; ping: () => string; diff --git a/src/renderer/src/helpers.ts b/src/renderer/src/helpers.ts index 89da2bca..6548938f 100644 --- a/src/renderer/src/helpers.ts +++ b/src/renderer/src/helpers.ts @@ -24,5 +24,7 @@ export const getSteamLanguage = (language: string) => { if (language.startsWith("ru")) return "russian"; if (language.startsWith("it")) return "italian"; if (language.startsWith("hu")) return "hungarian"; + if (language.startsWith("pl")) return "polish"; + return "english"; }; diff --git a/src/renderer/src/pages/downloads/downloads.tsx b/src/renderer/src/pages/downloads/downloads.tsx index ca9903a3..0f625490 100644 --- a/src/renderer/src/pages/downloads/downloads.tsx +++ b/src/renderer/src/pages/downloads/downloads.tsx @@ -1,7 +1,7 @@ import { useTranslation } from "react-i18next"; import { useNavigate } from "react-router-dom"; -import { AsyncImage, Button, TextField } from "@renderer/components"; +import { Button, TextField } from "@renderer/components"; import { formatDownloadProgress, steamUrlBuilder } from "@renderer/helpers"; import { useDownload, useLibrary } from "@renderer/hooks"; import type { Game } from "@types"; @@ -103,6 +103,7 @@ export function Downloads() { ); } + if (game?.status === "cancelled") return

{t("cancelled")}

; if (game?.status === "downloading_metadata") return

{t("starting_download")}

; @@ -115,6 +116,8 @@ export function Downloads() { ); } + + return null; }; const openDeleteModal = (gameId: number) => { @@ -210,6 +213,12 @@ export function Downloads() { ); }; + const handleDeleteGame = () => { + if (gameToBeDeleted.current) { + deleteGame(gameToBeDeleted.current).then(updateLibrary); + } + }; + return (
setShowDeleteModal(false)} - deleteGame={() => - deleteGame(gameToBeDeleted.current).then(updateLibrary) - } + deleteGame={handleDeleteGame} /> @@ -235,7 +242,7 @@ export function Downloads() { cancelled: game.status === "cancelled", })} > - { - average(url, { amount: 1, format: "hex" }) + const heroImage = steamUrlBuilder.libraryHero(objectID!); + + const handleHeroLoad = () => { + average(heroImage, { amount: 1, format: "hex" }) .then((color) => { const darkColor = new Color(color).darken(0.6).toString() as string; setColor({ light: color as string, dark: darkColor }); }) .catch(() => {}); - }, []); + }; const getGame = useCallback(() => { window.electron @@ -218,15 +220,15 @@ export function GameDetails() { ) : (
-
- diff --git a/src/renderer/src/pages/game-details/hero/hero-panel-actions.tsx b/src/renderer/src/pages/game-details/hero/hero-panel-actions.tsx index 4bc6df17..4c4b9a5a 100644 --- a/src/renderer/src/pages/game-details/hero/hero-panel-actions.tsx +++ b/src/renderer/src/pages/game-details/hero/hero-panel-actions.tsx @@ -68,7 +68,7 @@ export function HeroPanelActions({ try { if (game) { await removeGameFromLibrary(game.id); - } else { + } else if (gameDetails) { const gameExecutablePath = await selectGameExecutable(); await window.electron.addGameToLibrary( @@ -87,30 +87,37 @@ export function HeroPanelActions({ }; const openGameInstaller = () => { - window.electron.openGameInstaller(game.id).then((isBinaryInPath) => { - if (!isBinaryInPath) openBinaryNotFoundModal(); - updateLibrary(); - }); + if (game) { + window.electron.openGameInstaller(game.id).then((isBinaryInPath) => { + if (!isBinaryInPath) openBinaryNotFoundModal(); + updateLibrary(); + }); + } }; const openGame = async () => { - if (game.executablePath) { - window.electron.openGame(game.id, game.executablePath); - return; - } + if (game) { + if (game.executablePath) { + window.electron.openGame(game.id, game.executablePath); + return; + } - if (game?.executablePath) { - window.electron.openGame(game.id, game.executablePath); - return; - } + if (game?.executablePath) { + window.electron.openGame(game.id, game.executablePath); + return; + } - const gameExecutablePath = await selectGameExecutable(); - window.electron.openGame(game.id, gameExecutablePath); + const gameExecutablePath = await selectGameExecutable(); + if (gameExecutablePath) + window.electron.openGame(game.id, gameExecutablePath); + } }; - const closeGame = () => window.electron.closeGame(game.id); + const closeGame = () => { + if (game) window.electron.closeGame(game.id); + }; - const deleting = isGameDeleting(game?.id); + const deleting = game ? isGameDeleting(game?.id) : false; const toggleGameOnLibraryButton = ( ))} diff --git a/src/renderer/src/pages/settings/settings.tsx b/src/renderer/src/pages/settings/settings.tsx index 53245565..bb6ad339 100644 --- a/src/renderer/src/pages/settings/settings.tsx +++ b/src/renderer/src/pages/settings/settings.tsx @@ -12,6 +12,7 @@ export function Settings() { repackUpdatesNotificationsEnabled: false, telemetryEnabled: false, preferQuitInsteadOfHiding: false, + runAtStartup: false, }); const { t } = useTranslation("settings"); @@ -30,6 +31,7 @@ export function Settings() { telemetryEnabled: userPreferences?.telemetryEnabled ?? false, preferQuitInsteadOfHiding: userPreferences?.preferQuitInsteadOfHiding ?? false, + runAtStartup: userPreferences?.runAtStartup ?? false, }); }); }, []); @@ -123,6 +125,15 @@ export function Settings() { ) } /> + + { + updateUserPreferences("runAtStartup", !form.runAtStartup); + window.electron.autoLaunch(!form.runAtStartup); + }} + checked={form.runAtStartup} + />
); diff --git a/src/types/index.ts b/src/types/index.ts index 1b63f13b..10538022 100644 --- a/src/types/index.ts +++ b/src/types/index.ts @@ -43,7 +43,7 @@ export interface SteamAppDetails { minimum: string; recommended: string; }; - linux_requirmenets: { + linux_requirements: { minimum: string; recommended: string; }; @@ -121,6 +121,7 @@ export interface UserPreferences { repackUpdatesNotificationsEnabled: boolean; telemetryEnabled: boolean; preferQuitInsteadOfHiding: boolean; + runAtStartup: boolean; } export interface HowLongToBeatCategory { diff --git a/torrent-client/setup.py b/torrent-client/setup.py index 901a40b6..a8b8c2a5 100644 --- a/torrent-client/setup.py +++ b/torrent-client/setup.py @@ -15,6 +15,6 @@ setup( executables=[Executable( "torrent-client/main.py", target_name="hydra-download-manager", - icon="images/icon.ico" + icon="build/icon.ico" )] ) diff --git a/yarn.lock b/yarn.lock index 501653a1..2d18890c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1316,6 +1316,11 @@ resolved "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz" integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== +"@types/auto-launch@^5.0.5": + version "5.0.5" + resolved "https://registry.yarnpkg.com/@types/auto-launch/-/auto-launch-5.0.5.tgz#439ed36aaaea501e2e2cfbddd8a20c366c34863b" + integrity sha512-/nGvQZSzM/pvCMCh4Gt2kIeiUmOP/cKGJbjlInI+A+5MoV/7XmT56DJ6EU8bqc3+ItxEe4UC2GVspmPzcCc8cg== + "@types/babel__core@^7.20.5": version "7.20.5" resolved "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz" @@ -1822,6 +1827,11 @@ app-root-path@^3.1.0: resolved "https://registry.npmjs.org/app-root-path/-/app-root-path-3.1.0.tgz" integrity sha512-biN3PwB2gUtjaYy/isrU3aNWI5w+fAfvHkSvCKeQGxhmYpwKFUxudR3Yya+KqVRHBmEDYh+/lTozYCFbmzX4nA== +applescript@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/applescript/-/applescript-1.0.0.tgz#bb87af568cad034a4e48c4bdaf6067a3a2701317" + integrity sha512-yvtNHdWvtbYEiIazXAdp/NY+BBb65/DAseqlNiJQjOx9DynuzOYDbVLBJvuc0ve0VL9x6B3OHF6eH52y9hCBtQ== + argparse@^2.0.1: version "2.0.1" resolved "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz" @@ -1949,6 +1959,17 @@ at-least-node@^1.0.0: resolved "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz" integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== +auto-launch@^5.0.6: + version "5.0.6" + resolved "https://registry.yarnpkg.com/auto-launch/-/auto-launch-5.0.6.tgz#ccc238ddc07b2fa84e96a1bc2fd11b581a20cb2d" + integrity sha512-OgxiAm4q9EBf9EeXdPBiVNENaWE3jUZofwrhAkWjHDYGezu1k3FRZHU8V2FBxGuSJOHzKmTJEd0G7L7/0xDGFA== + dependencies: + applescript "^1.0.0" + mkdirp "^0.5.1" + path-is-absolute "^1.0.0" + untildify "^3.0.2" + winreg "1.2.4" + available-typed-arrays@^1.0.7: version "1.0.7" resolved "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz" @@ -4381,6 +4402,13 @@ mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: resolved "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz" integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== +mkdirp@^0.5.1: + version "0.5.6" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" + integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== + dependencies: + minimist "^1.2.6" + mkdirp@^1.0.3: version "1.0.4" resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz" @@ -5763,6 +5791,11 @@ unplugin@1.0.1: webpack-sources "^3.2.3" webpack-virtual-modules "^0.5.0" +untildify@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/untildify/-/untildify-3.0.3.tgz#1e7b42b140bcfd922b22e70ca1265bfe3634c7c9" + integrity sha512-iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA== + update-browserslist-db@^1.0.13: version "1.0.14" resolved "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.14.tgz" @@ -5975,6 +6008,11 @@ which@^2.0.1, which@^2.0.2: dependencies: isexe "^2.0.0" +winreg@1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/winreg/-/winreg-1.2.4.tgz#ba065629b7a925130e15779108cf540990e98d1b" + integrity sha512-IHpzORub7kYlb8A43Iig3reOvlcBJGX9gZ0WycHhghHtA65X0LYnMRuJs+aH1abVnMJztQkvQNlltnbPi5aGIA== + winston-transport@^4.7.0: version "4.7.0" resolved "https://registry.npmjs.org/winston-transport/-/winston-transport-4.7.0.tgz"