Merge pull request #685 from silentrald/bugfix/disable-linux-auto-update

[bugfix] remove auto update for linux builds

assets/jsons/translations/de.json

@@ -21,6 +21,9 @@
         "warning": "Achtung",
         "continue": "Weiter"
     },
+    "title-bar": {
+        "outdated": "veraltet"
+    },
     "nav-bar": {
         "add-version": "Version hinzufügen",
         "settings": "Einstellungen",

assets/jsons/translations/en.json

@@ -21,6 +21,9 @@
         "warning": "Warning",
         "continue": "Continue"
     },
+    "title-bar": {
+        "outdated": "outdated"
+    },
     "nav-bar": {
         "add-version": "Add a version",
         "settings": "Settings",

assets/jsons/translations/es.json

@@ -21,6 +21,9 @@
         "warning": "Advertencia",
         "continue": "Continuar"
     },
+    "title-bar": {
+        "outdated": "obsoleto"
+    },
     "nav-bar": {
         "add-version": "Agregar una versión",
         "settings": "Ajustes",

assets/jsons/translations/fr.json

@@ -21,6 +21,9 @@
         "warning": "Attention",
         "continue": "Continuer"
     },
+    "title-bar": {
+        "outdated": "obsolète"
+    },
     "nav-bar": {
         "add-version": "Ajouter une version",
         "settings": "Paramètres",

assets/jsons/translations/ja.json

@@ -21,6 +21,9 @@
         "warning": "警告",
         "continue": "続ける"
     },
+    "title-bar": {
+        "outdated": "時代遅れ"
+    },
     "nav-bar": {
         "add-version": "バージョンを追加",
         "settings": "設定",

assets/jsons/translations/ko.json

@@ -21,6 +21,9 @@
         "warning": "경고",
         "continue": "계속"
     },
+    "title-bar": {
+        "outdated": "구식"
+    },
     "nav-bar": {
         "add-version": "버전 추가",
         "settings": "설정",

assets/jsons/translations/ru.json

@@ -21,6 +21,9 @@
         "warning": "Внимание",
         "continue": "Продолжить"
     },
+    "title-bar": {
+        "outdated": "устаревший"
+    },
     "nav-bar": {
         "add-version": "Добавить версию игры",
         "settings": "Настройки",

assets/jsons/translations/zh-tw.json

@@ -21,6 +21,9 @@
         "warning": "警告",
         "continue": "繼續"
     },
+    "title-bar": {
+        "outdated": "過時"
+    },
     "nav-bar": {
         "add-version": "新增版本",
         "settings": "設定",

assets/jsons/translations/zh.json

@@ -21,6 +21,9 @@
         "warning": "警告",
         "continue": "继续"
     },
+    "title-bar": {
+        "outdated": "过时"
+    },
     "nav-bar": {
         "add-version": "添加版本",
         "settings": "设置",

src/main/main.ts

@@ -69,7 +69,7 @@ const installExtensions = async () => {
         .catch(log.error);
 };
 
-const createWindow = async (window: AppWindow = "launcher.html") => {
+const createWindow = async (window: AppWindow) => {
     if (isDebug) {
         await installExtensions();
     }
@@ -131,7 +131,9 @@ if (!gotTheLock) {
         } else if (associatedFile) {
             FileAssociationService.getInstance().handleFileAssociation(associatedFile);
         } else {
-            createWindow();
+            createWindow(process.platform === "linux"
+                ? "index.html" : "launcher.html"
+            );
         }
 
         SteamLauncherService.getInstance().restoreSteamVR();

src/main/services/auto-updater.service.ts

@@ -19,10 +19,16 @@ export class AutoUpdaterService {
         autoUpdater.autoDownload = false;
     }
 
-    public isUpdateAvailable(): Promise<boolean> {
-        return autoUpdater.checkForUpdates().then(info => {
-            return !!info?.updateInfo && gt(info.updateInfo.version, autoUpdater.currentVersion.version);
-        }).catch(() => false);
+    public async isUpdateAvailable(): Promise<boolean> {
+        return autoUpdater.checkForUpdates()
+            .then(info => {
+                return !!info?.updateInfo && gt(
+                info.updateInfo.version, autoUpdater.currentVersion.version
+            )})
+            .catch(error => {
+                log.error("Could not get update", error);
+                return false;
+            });
     }
 
     public downloadUpdate(): Observable<Progression> {

src/renderer/components/title-bar/title-bar.component.tsx

@@ -11,28 +11,59 @@ import "./title-bar.component.css";
 import { useService } from "renderer/hooks/use-service.hook";
 import { lastValueFrom } from "rxjs";
 import { useWindowControls } from "renderer/hooks/use-window-controls.hook";
+import { useTranslationV2 } from "renderer/hooks/use-translation.hook";
+
+function TitleBarTags() {
+    const ipcService = useService(IpcService);
+    const t = useTranslationV2();
+
+    const [previewVersion, setPreviewVersion] = useState("");
+    const [outdated, setOutdated] = useState(false);
+
+    useEffect(() => {
+        const requests: Promise<any>[] = [
+            lastValueFrom(ipcService.sendV2("current-version"))
+        ];
+        if (window.electron.platform === "linux") {
+            requests.push(lastValueFrom(ipcService.sendV2("check-update")));
+        }
+
+        Promise.all(requests).then(([ currentVersion, outdated ]) => {
+            handlePrerelease(currentVersion);
+            setOutdated(outdated);
+        });
+    }, []);
+
+    const handlePrerelease = (version: string) => {
+        if (version.toLowerCase().includes("alpha")) {
+            return setPreviewVersion("ALPHA");
+        }
+        if (version.toLowerCase().includes("beta")) {
+            return setPreviewVersion("BETA");
+        }
+    }
+
+    return <>
+        {previewVersion &&
+            <span className="bg-main-color-1 text-white dark:text-black dark:bg-white rounded-full ml-1 text-[10px] italic px-1 uppercase h-3.5 font-bold">
+                {previewVersion}
+            </span>
+        }
+        {outdated &&
+            <span className="bg-warning-500 text-black rounded-full ml-1 text-[10px] italic px-1 uppercase h-3.5 font-bold">
+                {t.text("title-bar.outdated")}
+            </span>
+        }
+    </>;
+}
 
 export default function TitleBar({ template = "index.html" }: { template: AppWindow }) {
-    const ipcService = useService(IpcService);
     const audio = useService(AudioPlayerService);
     const windowControls = useWindowControls();
 
     const volume = useObservable(() => audio.volume$, audio.volume);
     const color = useThemeColor("first-color");
 
-    const [previewVersion, setPreviewVersion] = useState(null);
-
-    useEffect(() => {
-        lastValueFrom(ipcService.sendV2("current-version")).then(version => {
-            if (version.toLowerCase().includes("alpha")) {
-                return setPreviewVersion("ALPHA");
-            }
-            if (version.toLowerCase().includes("beta")) {
-                return setPreviewVersion("BETA");
-            }
-        });
-    }, []);
-
     const [maximized, setMaximized] = useState(false);
 
     const closeWindow = () => {
@@ -76,7 +107,7 @@ export default function TitleBar({ template = "index.html" }: { template: AppWin
                 <div id="drag-region" className="grow basis-0 h-full">
                     <div id="window-title" className="pl-1">
                         <span className="text-gray-800 dark:text-gray-100 font-bold text-xs italic">BSManager</span>
-                        {previewVersion && <span className="bg-main-color-1 text-white dark:text-black dark:bg-white rounded-full ml-1 text-[10px] italic px-1 uppercase h-3.5 font-bold">{previewVersion}</span>}
+                        <TitleBarTags />
                     </div>
                 </div>
                 <div id="window-controls" className="h-full flex shrink-0 items-center">

src/renderer/services/auto-updater.service.ts

@@ -31,7 +31,7 @@ export class AutoUpdaterService {
         this.ipcService = IpcService.getInstance();
     }
 
-    public isUpdateAvailable(): Promise<boolean> {
+    public async isUpdateAvailable(): Promise<boolean> {
         return lastValueFrom(this.ipcService.sendV2("check-update")).catch(() => false);
     }