feat: fixing real debrid download

2025-03-09 15:40:26 +00:00 · 2024-08-15 20:46:21 +01:00 · 2024-08-15 20:46:21 +01:00 · 68b361e605
commit 68b361e605
parent fffea84ef7
28 changed files with 241 additions and 185 deletions
--- a/src/renderer/src/app.css.ts
+++ b/src/renderer/src/app.css.ts
@ -26,7 +26,7 @@ globalStyle("html, body, #root, main", {
 globalStyle("body", {
  overflow: "hidden",
  userSelect: "none",
-  fontFamily: "'Fira Mono', monospace",
+  fontFamily: "Noto Sans, sans-serif",
  fontSize: vars.size.body,
  background: vars.color.background,
  color: vars.color.body,
--- a/src/renderer/src/components/hero/hero.css.ts
+++ b/src/renderer/src/components/hero/hero.css.ts
@ -45,7 +45,6 @@ export const description = style({
  maxWidth: "700px",
  color: vars.color.muted,
  textAlign: "left",
-  fontFamily: "'Fira Sans', sans-serif",
  lineHeight: "20px",
  marginTop: `${SPACING_UNIT * 2}px`,
 });
--- a/src/renderer/src/components/modal/modal.css.ts
+++ b/src/renderer/src/components/modal/modal.css.ts
@ -24,6 +24,7 @@ export const modal = recipe({
    animation: `${scaleFadeIn} 0.2s cubic-bezier(0.33, 1, 0.68, 1) 0s 1 normal none running`,
    backgroundColor: vars.color.background,
    borderRadius: "4px",
+    minWidth: "400px",
    maxWidth: "600px",
    color: vars.color.body,
    maxHeight: "100%",
--- a/src/renderer/src/main.tsx
+++ b/src/renderer/src/main.tsx
@ -8,12 +8,10 @@ import { HashRouter, Route, Routes } from "react-router-dom";

 import * as Sentry from "@sentry/electron/renderer";

-import "@fontsource/fira-mono/400.css";
-import "@fontsource/fira-mono/500.css";
-import "@fontsource/fira-mono/700.css";
-import "@fontsource/fira-sans/400.css";
-import "@fontsource/fira-sans/500.css";
-import "@fontsource/fira-sans/700.css";
+import "@fontsource/noto-sans/400.css";
+import "@fontsource/noto-sans/500.css";
+import "@fontsource/noto-sans/700.css";
+
 import "react-loading-skeleton/dist/skeleton.css";

 import { App } from "./app";
--- a/src/renderer/src/pages/downloads/downloads.tsx
+++ b/src/renderer/src/pages/downloads/downloads.tsx
@ -132,9 +132,7 @@ export function Downloads() {
            <ArrowDownIcon size={24} />
          </div>
          <h2>{t("no_downloads_title")}</h2>
-          <p style={{ fontFamily: "Fira Sans" }}>
-            {t("no_downloads_description")}
-          </p>
+          <p>{t("no_downloads_description")}</p>
        </div>
      )}
    </>
--- a/src/renderer/src/pages/game-details/description-header/description-header.tsx
+++ b/src/renderer/src/pages/game-details/description-header/description-header.tsx
@ -19,7 +19,10 @@ export function DescriptionHeader() {
            date: shopDetails?.release_date.date,
          })}
        </p>
-        <p>{t("publisher", { publisher: shopDetails.publishers[0] })}</p>
+
+        {Array.isArray(shopDetails.publishers) && (
+          <p>{t("publisher", { publisher: shopDetails.publishers[0] })}</p>
+        )}
      </section>
    </div>
  );
--- a/src/renderer/src/pages/game-details/game-details.css.ts
+++ b/src/renderer/src/pages/game-details/game-details.css.ts
@ -101,7 +101,6 @@ export const descriptionContent = style({
 export const description = style({
  userSelect: "text",
  lineHeight: "22px",
-  fontFamily: "'Fira Sans', sans-serif",
  fontSize: "16px",
  padding: `${SPACING_UNIT * 3}px ${SPACING_UNIT * 2}px`,
  "@media": {
--- a/src/renderer/src/pages/game-details/hero/hero-panel.css.ts
+++ b/src/renderer/src/pages/game-details/hero/hero-panel.css.ts
@ -9,6 +9,7 @@ export const panel = recipe({
    height: "72px",
    minHeight: "72px",
    padding: `${SPACING_UNIT * 2}px ${SPACING_UNIT * 3}px`,
+    backgroundColor: vars.color.darkBackground,
    display: "flex",
    alignItems: "center",
    justifyContent: "space-between",
--- a/src/renderer/src/pages/game-details/modals/download-settings-modal.tsx
+++ b/src/renderer/src/pages/game-details/modals/download-settings-modal.tsx
@ -60,14 +60,22 @@ export function DownloadSettingsModal({
        .then((defaultDownloadsPath) => setSelectedPath(defaultDownloadsPath));
    }

-    if (
-      userPreferences?.realDebridApiToken &&
-      downloaders.includes(Downloader.RealDebrid)
-    ) {
-      setSelectedDownloader(Downloader.RealDebrid);
-    } else {
-      setSelectedDownloader(downloaders[0]);
-    }
+    const filteredDownloaders = downloaders.filter((downloader) => {
+      if (downloader === Downloader.RealDebrid)
+        return userPreferences?.realDebridApiToken;
+      return true;
+    });
+
+    /* Gives preference to Real Debrid */
+    const selectedDownloader = filteredDownloaders.includes(
+      Downloader.RealDebrid
+    )
+      ? Downloader.RealDebrid
+      : filteredDownloaders[0];
+
+    setSelectedDownloader(
+      selectedDownloader === undefined ? null : selectedDownloader
+    );
  }, [
    userPreferences?.downloadsPath,
    downloaders,
--- a/src/renderer/src/pages/game-details/modals/game-options-modal.css.ts
+++ b/src/renderer/src/pages/game-details/modals/game-options-modal.css.ts
@ -15,7 +15,6 @@ export const gameOptionHeader = style({
 });

 export const gameOptionHeaderDescription = style({
-  fontFamily: "'Fira Sans', sans-serif",
  fontWeight: "400",
 });

--- a/src/renderer/src/pages/game-details/sidebar/sidebar.css.ts
+++ b/src/renderer/src/pages/game-details/sidebar/sidebar.css.ts
@ -46,7 +46,6 @@ export const requirementButton = style({
 export const requirementsDetails = style({
  padding: `${SPACING_UNIT * 2}px`,
  lineHeight: "22px",
-  fontFamily: "'Fira Sans', sans-serif",
  fontSize: "16px",
 });

--- a/src/renderer/src/pages/settings/settings-download-sources.tsx
+++ b/src/renderer/src/pages/settings/settings-download-sources.tsx
@ -82,9 +82,7 @@ export function SettingsDownloadSources() {
        onAddDownloadSource={handleAddDownloadSource}
      />

-      <p style={{ fontFamily: '"Fira Sans"' }}>
-        {t("download_sources_description")}
-      </p>
+      <p>{t("download_sources_description")}</p>

      <div className={styles.downloadSourcesHeader}>
        <Button
--- a/src/renderer/src/pages/settings/settings-real-debrid.css.ts
+++ b/src/renderer/src/pages/settings/settings-real-debrid.css.ts
@ -9,6 +9,5 @@ export const form = style({
 });

 export const description = style({
-  fontFamily: "'Fira Sans', sans-serif",
  marginBottom: `${SPACING_UNIT * 2}px`,
 });
--- a/src/renderer/src/pages/user/user-block-modal.tsx
+++ b/src/renderer/src/pages/user/user-block-modal.tsx
@ -25,9 +25,7 @@ export const UserBlockModal = ({
        onClose={onClose}
      >
        <div className={styles.signOutModalContent}>
-          <p style={{ fontFamily: "Fira Sans" }}>
-            {t("user_block_modal_text", { displayName })}
-          </p>
+          <p>{t("user_block_modal_text", { displayName })}</p>
          <div className={styles.signOutModalButtonsContainer}>
            <Button onClick={onConfirm} theme="danger">
              {t("block_user")}
--- a/src/renderer/src/pages/user/user-content.tsx
+++ b/src/renderer/src/pages/user/user-content.tsx
@ -371,11 +371,7 @@ export function UserContent({
                <TelescopeIcon size={24} />
              </div>
              <h2>{t("no_recent_activity_title")}</h2>
-              {isMe && (
-                <p style={{ fontFamily: "Fira Sans" }}>
-                  {t("no_recent_activity_description")}
-                </p>
-              )}
+              {isMe && <p>{t("no_recent_activity_description")}</p>}
            </div>
          ) : (
            <div
--- a/src/renderer/src/pages/user/user-sign-out-modal.tsx
+++ b/src/renderer/src/pages/user/user-sign-out-modal.tsx
@ -23,7 +23,7 @@ export const UserSignOutModal = ({
        onClose={onClose}
      >
        <div className={styles.signOutModalContent}>
-          <p style={{ fontFamily: "Fira Sans" }}>{t("sign_out_modal_text")}</p>
+          <p>{t("sign_out_modal_text")}</p>
          <div className={styles.signOutModalButtonsContainer}>
            <Button onClick={onConfirm} theme="danger">
              {t("sign_out")}