mirror of
https://github.com/MasterAcnolo/Freedom-Loader.git
synced 2026-09-27 20:11:15 +02:00
Compare commits
3 Commits
copilot/fi
...
187e3af559
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
187e3af559 | ||
|
|
e8c499fe23 | ||
|
|
99b7164ff8 |
@@ -122,6 +122,7 @@ function initAutoUpdater(mainWindow) {
|
|||||||
* Separated from init for reusability and testability.
|
* Separated from init for reusability and testability.
|
||||||
*/
|
*/
|
||||||
async function checkForUpdates() {
|
async function checkForUpdates() {
|
||||||
|
if (process.env.SNAP || process.env.FLATPAK_ID) return;
|
||||||
if (!require("electron").app.isPackaged) return;
|
if (!require("electron").app.isPackaged) return;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -140,7 +141,6 @@ async function downloadUpdate() {
|
|||||||
await autoUpdater.downloadUpdate();
|
await autoUpdater.downloadUpdate();
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
logger.error("Download failed:", err.message);
|
logger.error("Download failed:", err.message);
|
||||||
throw err;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,12 @@ async function sendReport(params) {
|
|||||||
|
|
||||||
if (includeLogs === "yes" && logDir) {
|
if (includeLogs === "yes" && logDir) {
|
||||||
// YYYY-MM-DD
|
// YYYY-MM-DD
|
||||||
const today = new Date().toISOString().split("T")[0];
|
const now = new Date();
|
||||||
|
const today = [
|
||||||
|
now.getFullYear(),
|
||||||
|
String(now.getMonth() + 1).padStart(2, "0"),
|
||||||
|
String(now.getDate()).padStart(2, "0")
|
||||||
|
].join("-");
|
||||||
|
|
||||||
const logFilePath = path.join(logDir, `LOGS-${today}.log`);
|
const logFilePath = path.join(logDir, `LOGS-${today}.log`);
|
||||||
|
|
||||||
|
|||||||
@@ -45,31 +45,13 @@ async function initUpdateUI() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const initialButtonText = btn.textContent;
|
btn.onclick = () => {
|
||||||
const initialIconText = icon.textContent;
|
window.electronAPI.downloadUpdate();
|
||||||
const initialTitleText = title.textContent;
|
|
||||||
const initialSubText = sub.textContent;
|
|
||||||
|
|
||||||
btn.onclick = async () => {
|
|
||||||
btn.disabled = true;
|
btn.disabled = true;
|
||||||
btn.textContent = "Downloading...";
|
btn.textContent = "Downloading...";
|
||||||
icon.textContent = "download";
|
icon.textContent = "download";
|
||||||
title.textContent = "Downloading update";
|
title.textContent = "Downloading update";
|
||||||
progressWrap.style.display = "flex";
|
progressWrap.style.display = "flex";
|
||||||
|
|
||||||
try {
|
|
||||||
await window.electronAPI.downloadUpdate();
|
|
||||||
} catch {
|
|
||||||
btn.disabled = false;
|
|
||||||
btn.textContent = initialButtonText;
|
|
||||||
icon.textContent = initialIconText;
|
|
||||||
title.textContent = initialTitleText;
|
|
||||||
sub.textContent = initialSubText;
|
|
||||||
progressWrap.style.display = "none";
|
|
||||||
progressFill.style.width = "0%";
|
|
||||||
progressPct.textContent = "0%";
|
|
||||||
progressEta.textContent = "";
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
window.electronAPI.onDownloadProgress((progress) => {
|
window.electronAPI.onDownloadProgress((progress) => {
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ class BugReportModal {
|
|||||||
window.electronAPI.logInfo("Submitting:", data);
|
window.electronAPI.logInfo("Submitting:", data);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const success = await window.electronAPI.sendReport(data);
|
const success = await window.topbarAPI.sendReport(data);
|
||||||
|
|
||||||
if (success) {
|
if (success) {
|
||||||
localStorage.removeItem("draft_bug_title");
|
localStorage.removeItem("draft_bug_title");
|
||||||
|
|||||||
@@ -1,53 +0,0 @@
|
|||||||
const mockDownloadUpdate = jest.fn();
|
|
||||||
const mockCheckForUpdates = jest.fn();
|
|
||||||
const mockOn = jest.fn();
|
|
||||||
const mockQuitAndInstall = jest.fn();
|
|
||||||
|
|
||||||
jest.mock("electron-updater", () => ({
|
|
||||||
autoUpdater: {
|
|
||||||
autoDownload: true,
|
|
||||||
autoInstallOnAppQuit: true,
|
|
||||||
on: mockOn,
|
|
||||||
checkForUpdates: mockCheckForUpdates,
|
|
||||||
downloadUpdate: mockDownloadUpdate,
|
|
||||||
quitAndInstall: mockQuitAndInstall,
|
|
||||||
},
|
|
||||||
}));
|
|
||||||
|
|
||||||
jest.mock("electron", () => ({
|
|
||||||
app: {
|
|
||||||
isPackaged: true,
|
|
||||||
},
|
|
||||||
}));
|
|
||||||
|
|
||||||
const mockLoggerError = jest.fn();
|
|
||||||
jest.mock("../../server/logger", () => ({
|
|
||||||
logger: {
|
|
||||||
info: jest.fn(),
|
|
||||||
warn: jest.fn(),
|
|
||||||
error: mockLoggerError,
|
|
||||||
},
|
|
||||||
}));
|
|
||||||
|
|
||||||
const { downloadUpdate } = require("../../app/autoUpdater");
|
|
||||||
|
|
||||||
describe("autoUpdater.downloadUpdate", () => {
|
|
||||||
beforeEach(() => {
|
|
||||||
jest.clearAllMocks();
|
|
||||||
});
|
|
||||||
|
|
||||||
test("resolves when electron-updater download succeeds", async () => {
|
|
||||||
mockDownloadUpdate.mockResolvedValue(undefined);
|
|
||||||
|
|
||||||
await expect(downloadUpdate()).resolves.toBeUndefined();
|
|
||||||
expect(mockDownloadUpdate).toHaveBeenCalledTimes(1);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("rejects when electron-updater download fails", async () => {
|
|
||||||
const error = new Error("network down");
|
|
||||||
mockDownloadUpdate.mockRejectedValue(error);
|
|
||||||
|
|
||||||
await expect(downloadUpdate()).rejects.toThrow("network down");
|
|
||||||
expect(mockLoggerError).toHaveBeenCalledWith("Download failed:", "network down");
|
|
||||||
});
|
|
||||||
});
|
|
||||||
Reference in New Issue
Block a user