chore: bumping version

src/main/events/cloud-save/upload-save-game.ts

@@ -1,8 +1,6 @@
 import { CloudSync } from "@main/services";
 import { registerEvent } from "../register-event";
 import type { GameShop } from "@types";
-import { t } from "i18next";
-import { formatDate } from "date-fns";
 
 const uploadSaveGame = async (
   _event: Electron.IpcMainInvokeEvent,
@@ -14,10 +12,7 @@ const uploadSaveGame = async (
     objectId,
     shop,
     downloadOptionTitle,
-    t("backup_from", {
-      ns: "game_details",
-      date: formatDate(new Date(), "yyyy-MM-dd"),
-    })
+    CloudSync.getBackupLabel(false)
   );
 };
 

src/main/index.ts

@@ -3,7 +3,6 @@ import updater from "electron-updater";
 import i18n from "i18next";
 import path from "node:path";
 import url from "node:url";
-import kill from "kill-port";
 import { electronApp, optimizer } from "@electron-toolkit/utils";
 import { logger, WindowManager } from "@main/services";
 import resources from "@locales";
@@ -58,7 +57,7 @@ app.whenReady().then(async () => {
     return net.fetch(url.pathToFileURL(decodeURI(filePath)).toString());
   });
 
-  await kill(PythonRPC.RPC_PORT).finally(() => loadState());
+  await loadState();
 
   const language = await db.get<string, string>(levelKeys.language, {
     valueEncoding: "utf-8",

src/main/services/cloud-sync.ts

@@ -13,9 +13,28 @@ import { logger } from "./logger";
 import { WindowManager } from "./window-manager";
 import axios from "axios";
 import { Ludusavi } from "./ludusavi";
-import { SubscriptionRequiredError } from "@shared";
+import { formatDate, SubscriptionRequiredError } from "@shared";
+import i18next, { t } from "i18next";
 
 export class CloudSync {
+  public static getBackupLabel(automatic: boolean) {
+    const language = i18next.language;
+
+    const date = formatDate(new Date(), language);
+
+    if (automatic) {
+      return t("automatic_backup_from", {
+        ns: "game_details",
+        date,
+      });
+    }
+
+    return t("backup_from", {
+      ns: "game_details",
+      date,
+    });
+  }
+
   private static async bundleBackup(
     shop: GameShop,
     objectId: string,
@@ -25,7 +44,11 @@ export class CloudSync {
 
     // Remove existing backup
     if (fs.existsSync(backupPath)) {
-      fs.rmSync(backupPath, { recursive: true });
+      try {
+        await fs.promises.rm(backupPath, { recursive: true });
+      } catch (error) {
+        logger.error("Failed to remove backup path", error);
+      }
     }
 
     await Ludusavi.backupGame(shop, objectId, backupPath, winePrefix);
@@ -101,11 +124,10 @@ export class CloudSync {
       true
     );
 
-    fs.rm(bundleLocation, (err) => {
-      if (err) {
-        logger.error("Failed to remove tar file", err);
-        throw err;
-      }
-    });
+    try {
+      await fs.promises.unlink(bundleLocation);
+    } catch (error) {
+      logger.error("Failed to remove tar file", error);
+    }
   }
 }

src/main/services/process-watcher.ts

@@ -6,9 +6,7 @@ import axios from "axios";
 import { exec } from "child_process";
 import { ProcessPayload } from "./download/types";
 import { gamesSublevel, levelKeys } from "@main/level";
-import { t } from "i18next";
 import { CloudSync } from "./cloud-sync";
-import { formatDate } from "date-fns";
 
 const commands = {
   findWineDir: `lsof -c wine 2>/dev/null | grep '/drive_c/windows$' | head -n 1 | awk '{for(i=9;i<=NF;i++) printf "%s ", $i; print ""}'`,
@@ -234,10 +232,7 @@ function onOpenGame(game: Game) {
         game.objectId,
         game.shop,
         null,
-        t("automatic_backup_from", {
-          ns: "game_details",
-          date: formatDate(new Date(), "yyyy-MM-dd"),
-        })
+        CloudSync.getBackupLabel(true)
       );
     }
   } else {
@@ -308,10 +303,7 @@ const onCloseGame = (game: Game) => {
         game.objectId,
         game.shop,
         null,
-        t("automatic_backup_from", {
-          ns: "game_details",
-          date: formatDate(new Date(), "yyyy-MM-dd"),
-        })
+        CloudSync.getBackupLabel(true)
       );
     }
   } else {

src/renderer/src/hooks/use-date.ts

@@ -1,7 +1,6 @@
 import { formatDate, getDateLocale } from "@shared";
 import { format, formatDistance, subMilliseconds } from "date-fns";
 import type { FormatDistanceOptions } from "date-fns";
-import { enUS } from "date-fns/locale";
 import { useTranslation } from "react-i18next";
 
 export function useDate() {
@@ -41,10 +40,10 @@ export function useDate() {
     },
 
     formatDateTime: (date: number | Date | string): string => {
-      const locale = getDateLocale(language);
       return format(
         date,
-        locale == enUS ? "MM/dd/yyyy - HH:mm" : "dd/MM/yyyy HH:mm"
+        language == "en" ? "MM-dd-yyyy - hh:mm a" : "dd/MM/yyyy HH:mm",
+        { locale: getDateLocale(language) }
       );
     },
 

src/shared/index.ts

@@ -173,7 +173,5 @@ export const formatDate = (
   language: string
 ): string => {
   if (isNaN(new Date(date).getDate())) return "N/A";
-
-  const locale = getDateLocale(language);
-  return format(date, locale == enUS ? "MM/dd/yyyy" : "dd/MM/yyyy");
+  return format(date, language == "en" ? "MM-dd-yyyy" : "dd/MM/yyyy");
 };