Merge branch 'main' into main

src/locales/ru/translation.json

@@ -176,5 +176,11 @@
   },
   "modal": {
     "close": "Закрыть"
+  },
+  "splash": {
+    "downloading_version": "Загрузка версии {{version}}",
+    "searching_updates": "Поиск обновлений",
+    "update_found": "Найдена новая версия {{version}}",
+    "restarting_and_applying": "Перезапуск и внесение изменений"
   }
 }

src/locales/zh/translation.json

@@ -174,5 +174,11 @@
   },
   "modal": {
     "close": "关闭按钮"
+  },
+  "splash": {
+    "downloading_version": "正在下载新版本 {{version}}",
+    "searching_updates": "检查更新...",
+    "update_found": "有新版本 {{version}} 可用",
+    "restarting_and_applying": "重启并应用更新"
   }
 }

src/main/services/logger.ts

@@ -1,11 +1,30 @@
-import winston from "winston";
+import { app } from "electron";
+import log from "electron-log";
+import path from "path";
 
-export const logger = winston.createLogger({
-  level: "info",
-  format: winston.format.json(),
-  transports: [
-    new winston.transports.File({ filename: "error.log", level: "error" }),
-    new winston.transports.File({ filename: "info.log", level: "info" }),
-    new winston.transports.File({ filename: "combined.log" }),
-  ],
+const logsPath = app.isPackaged
+  ? path.join(app.getAppPath(), "..", "..", "logs")
+  : path.join(app.getAppPath(), "logs");
+
+log.transports.file.resolvePathFn = (
+  _: log.PathVariables,
+  message?: log.LogMessage | undefined
+) => {
+  if (message?.level === "error") {
+    return path.join(logsPath, "error.txt");
+  }
+
+  if (message?.level === "info") {
+    return path.join(logsPath, "info.txt");
+  }
+
+  return path.join(logsPath, "logs.txt");
+};
+
+log.errorHandler.startCatching({
+  showDialog: false,
 });
+
+log.initialize();
+
+export const logger = log.scope("main");

src/renderer/src/logger/index.ts

@@ -0,0 +1,3 @@
+import log from "electron-log/renderer";
+
+export const logger = log.scope("renderer");