From a345a3ee7c37df980f0765d1f680e0e04be2cd33 Mon Sep 17 00:00:00 2001 From: silentrald Date: Fri, 25 Oct 2024 13:45:33 +0800 Subject: [PATCH] [bugfix-627] reverted #577 PR --- src/main/services/bs-version-lib.service.ts | 21 +------------------ .../services/static-configuration.service.ts | 2 -- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/src/main/services/bs-version-lib.service.ts b/src/main/services/bs-version-lib.service.ts index 15a95a67..29fb62ed 100644 --- a/src/main/services/bs-version-lib.service.ts +++ b/src/main/services/bs-version-lib.service.ts @@ -5,7 +5,6 @@ import { BSVersion } from "shared/bs-version.interface"; import { RequestService } from "./request.service"; import { readJSON } from "fs-extra"; import { allSettled } from "../../shared/helpers/promise.helpers"; -import { StaticConfigurationService } from "./static-configuration.service"; export class BSVersionLibService { private readonly REMOTE_BS_VERSIONS_URL: string = "https://raw.githubusercontent.com/Zagrios/bs-manager/master/assets/jsons/bs-versions.json"; @@ -15,14 +14,12 @@ export class BSVersionLibService { private utilsService: UtilsService; private requestService: RequestService; - private staticConfigurationService: StaticConfigurationService; private bsVersions: BSVersion[]; private constructor() { this.utilsService = UtilsService.getInstance(); this.requestService = RequestService.getInstance(); - this.staticConfigurationService = StaticConfigurationService.getInstance(); } public static getInstance(): BSVersionLibService { @@ -38,28 +35,12 @@ export class BSVersionLibService { private async getLocalVersions(): Promise { const localVersionsPath = path.join(this.utilsService.getAssestsJsonsPath(), this.VERSIONS_FILE); - - if (process.platform === "linux") { - let versions = this.staticConfigurationService.get("versions"); - if (!versions) { - versions = (await readJSON(localVersionsPath)) as BSVersion[]; - this.staticConfigurationService.set("versions", versions); - } - return versions; - } - return readJSON(localVersionsPath); } private async updateLocalVersions(versions: BSVersion[]): Promise { const localVersionsPath = path.join(this.utilsService.getAssestsJsonsPath(), this.VERSIONS_FILE); - - // Do not write on readonly memory in linux when running on AppImage - if (process.platform === "linux") { - this.staticConfigurationService.set("versions", versions); - } else { - writeFileSync(localVersionsPath, JSON.stringify(versions, null, "\t"), { encoding: "utf-8", flag: "w" }); - } + writeFileSync(localVersionsPath, JSON.stringify(versions, null, "\t"), { encoding: "utf-8", flag: "w" }); } private async loadBsVersions(): Promise { diff --git a/src/main/services/static-configuration.service.ts b/src/main/services/static-configuration.service.ts index 508df1ea..c1386130 100644 --- a/src/main/services/static-configuration.service.ts +++ b/src/main/services/static-configuration.service.ts @@ -3,7 +3,6 @@ import { pathExistsSync } from "fs-extra"; import path from "path"; import { PROTON_BINARY_PREFIX, WINE_BINARY_PREFIX } from "main/constants"; import { Observable, Subject } from "rxjs"; -import { BSVersion } from "shared/bs-version.interface"; import { CustomError } from "shared/models/exceptions/custom-error.class"; export class StaticConfigurationService { @@ -90,7 +89,6 @@ export interface StaticConfigKeyValues { "use-symlinks": boolean; // Linux Specific static configs - "versions": BSVersion[]; "proton-folder": string; };