Merge branch 'feat/migration-to-leveldb' into feature/torbox-integration

# Conflicts:
#	src/renderer/src/pages/downloads/download-group.tsx

src/main/events/helpers/get-downloads-path.ts

@@ -3,15 +3,14 @@ import { db, levelKeys } from "@main/level";
 import type { UserPreferences } from "@types";
 
 export const getDownloadsPath = async () => {
-  const userPreferences = await db.get<string, UserPreferences>(
+  const userPreferences = await db.get<string, UserPreferences | null>(
     levelKeys.userPreferences,
     {
       valueEncoding: "json",
     }
   );
 
-  if (userPreferences && userPreferences.downloadsPath)
-    return userPreferences.downloadsPath;
+  if (userPreferences?.downloadsPath) return userPreferences.downloadsPath;
 
   return defaultDownloadsPath;
 };

src/main/events/notifications/publish-new-repacks-notification.ts

@@ -10,7 +10,7 @@ const publishNewRepacksNotification = async (
 ) => {
   if (newRepacksCount < 1) return;
 
-  const userPreferences = await db.get<string, UserPreferences>(
+  const userPreferences = await db.get<string, UserPreferences | null>(
     levelKeys.userPreferences,
     {
       valueEncoding: "json",

src/main/events/user-preferences/get-user-preferences.ts

@@ -5,11 +5,11 @@ import type { UserPreferences } from "@types";
 
 const getUserPreferences = async () =>
   db
-    .get<string, UserPreferences>(levelKeys.userPreferences, {
+    .get<string, UserPreferences | null>(levelKeys.userPreferences, {
       valueEncoding: "json",
     })
     .then((userPreferences) => {
-      if (userPreferences.realDebridApiToken) {
+      if (userPreferences?.realDebridApiToken) {
         userPreferences.realDebridApiToken = Crypto.decrypt(
           userPreferences.realDebridApiToken
         );

src/main/events/user-preferences/update-user-preferences.ts

@@ -3,13 +3,14 @@ import { registerEvent } from "../register-event";
 import type { UserPreferences } from "@types";
 import i18next from "i18next";
 import { db, levelKeys } from "@main/level";
+import { Crypto } from "@main/services";
 import { patchUserProfile } from "../profile/update-profile";
 
 const updateUserPreferences = async (
   _event: Electron.IpcMainInvokeEvent,
   preferences: Partial<UserPreferences>
 ) => {
-  const userPreferences = await db.get<string, UserPreferences>(
+  const userPreferences = await db.get<string, UserPreferences | null>(
     levelKeys.userPreferences,
     { valueEncoding: "json" }
   );
@@ -23,6 +24,16 @@ const updateUserPreferences = async (
     patchUserProfile({ language: preferences.language }).catch(() => {});
   }
 
+  if (preferences.realDebridApiToken) {
+    preferences.realDebridApiToken = Crypto.encrypt(
+      preferences.realDebridApiToken
+    );
+  }
+
+  if (!preferences.downloadsPath) {
+    preferences.downloadsPath = null;
+  }
+
   await db.put<string, UserPreferences>(
     levelKeys.userPreferences,
     {

src/main/events/user/get-compared-unlocked-achievements.ts

@@ -10,7 +10,7 @@ const getComparedUnlockedAchievements = async (
   shop: GameShop,
   userId: string
 ) => {
-  const userPreferences = await db.get<string, UserPreferences>(
+  const userPreferences = await db.get<string, UserPreferences | null>(
     levelKeys.userPreferences,
     {
       valueEncoding: "json",
@@ -25,7 +25,7 @@ const getComparedUnlockedAchievements = async (
     {
       shop,
       objectId,
-      language: userPreferences?.language || "en",
+      language: userPreferences?.language ?? "en",
     }
   ).then((achievements) => {
     const sortedAchievements = achievements.achievements

src/main/events/user/get-unlocked-achievements.ts

@@ -12,7 +12,7 @@ export const getUnlockedAchievements = async (
     levelKeys.game(shop, objectId)
   );
 
-  const userPreferences = await db.get<string, UserPreferences>(
+  const userPreferences = await db.get<string, UserPreferences | null>(
     levelKeys.userPreferences,
     {
       valueEncoding: "json",

src/main/main.ts

@@ -27,7 +27,7 @@ export const loadState = async () => {
       valueEncoding: "json",
     });
 
-    return db.get<string, UserPreferences>(levelKeys.userPreferences, {
+    return db.get<string, UserPreferences | null>(levelKeys.userPreferences, {
       valueEncoding: "json",
     });
   });
@@ -114,24 +114,29 @@ const migrateFromSqlite = async () => {
       if (userPreferences.length > 0) {
         const { realDebridApiToken, ...rest } = userPreferences[0];
 
-        await db.put(levelKeys.userPreferences, {
-          ...rest,
-          realDebridApiToken: realDebridApiToken
-            ? Crypto.encrypt(realDebridApiToken)
-            : null,
-          preferQuitInsteadOfHiding: rest.preferQuitInsteadOfHiding === 1,
-          runAtStartup: rest.runAtStartup === 1,
-          startMinimized: rest.startMinimized === 1,
-          disableNsfwAlert: rest.disableNsfwAlert === 1,
-          seedAfterDownloadComplete: rest.seedAfterDownloadComplete === 1,
-          showHiddenAchievementsDescription:
-            rest.showHiddenAchievementsDescription === 1,
-          downloadNotificationsEnabled: rest.downloadNotificationsEnabled === 1,
-          repackUpdatesNotificationsEnabled:
-            rest.repackUpdatesNotificationsEnabled === 1,
-          achievementNotificationsEnabled:
-            rest.achievementNotificationsEnabled === 1,
-        });
+        await db.put<string, UserPreferences>(
+          levelKeys.userPreferences,
+          {
+            ...rest,
+            realDebridApiToken: realDebridApiToken
+              ? Crypto.encrypt(realDebridApiToken)
+              : null,
+            preferQuitInsteadOfHiding: rest.preferQuitInsteadOfHiding === 1,
+            runAtStartup: rest.runAtStartup === 1,
+            startMinimized: rest.startMinimized === 1,
+            disableNsfwAlert: rest.disableNsfwAlert === 1,
+            seedAfterDownloadComplete: rest.seedAfterDownloadComplete === 1,
+            showHiddenAchievementsDescription:
+              rest.showHiddenAchievementsDescription === 1,
+            downloadNotificationsEnabled:
+              rest.downloadNotificationsEnabled === 1,
+            repackUpdatesNotificationsEnabled:
+              rest.repackUpdatesNotificationsEnabled === 1,
+            achievementNotificationsEnabled:
+              rest.achievementNotificationsEnabled === 1,
+          },
+          { valueEncoding: "json" }
+        );
 
         if (rest.language) {
           await db.put(levelKeys.language, rest.language);

src/main/services/download/download-manager.ts

@@ -27,17 +27,20 @@ export class DownloadManager {
   ) {
     PythonRPC.spawn(
       download?.status === "active"
-        ? await this.getDownloadPayload(download).catch(() => undefined)
+        ? await this.getDownloadPayload(download).catch((err) => {
+            logger.error("Error getting download payload", err);
+            return undefined;
+          })
         : undefined,
       downloadsToSeed?.map((download) => ({
-        game_id: `${download.shop}-${download.objectId}`,
+        game_id: levelKeys.game(download.shop, download.objectId),
         url: download.uri,
         save_path: download.downloadPath,
       }))
     );
 
     if (download) {
-      this.downloadingGameId = `${download.shop}-${download.objectId}`;
+      this.downloadingGameId = levelKeys.game(download.shop, download.objectId);
     }
   }
 
@@ -280,7 +283,7 @@ export class DownloadManager {
         return {
           action: "start",
           game_id: downloadId,
-          url: `https://pixeldrain.com/api/file/${id}?download`,
+          url: `https://cdn.pd5-gamedriveorg.workers.dev/api/file/${id}`,
           save_path: download.downloadPath,
           out: name,
         };