Merge pull request #1318 from buttercup/feat/updater_pre_release

Pre-release channel support
buttercup · Mar 31, 2024 · ac89483 · ac89483
2 parents 29004b5 + 1bf100c
commit ac89483
Show file tree

Hide file tree

Showing 22 changed files with 103 additions and 92 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -211,7 +211,7 @@
     "debounce-promise": "^3.1.2",
     "delayable-setinterval": "^0.1.1",
     "electron-is-dev": "^2.0.0",
-    "electron-updater": "^5.3.0",
+    "electron-updater": "^6.1.8",
     "env-paths": "^2.2.1",
     "eventemitter3": "^4.0.7",
     "execution-time": "^1.4.1",

diff --git a/source/main/library/build.ts b/source/main/library/build.ts
@@ -1,3 +1,3 @@
 // This file updated automatically: changes made here will be overwritten!
 
-export const VERSION = "2.26.1";
+export const VERSION = "2.26.4";
diff --git a/source/main/services/config.ts b/source/main/services/config.ts
@@ -36,14 +36,23 @@ export async function getVaultSettings(sourceID: VaultSourceID): Promise<VaultSe
 }
 
 export async function initialise(): Promise<void> {
-    // Run migrations
+    // Initialise config
     const storage = getConfigStorage();
     const config = (await storage.getValues()) as unknown as Config;
+    // Run migrations
     const [updatedConfig, didMigrate] = runConfigMigrations(config);
     if (didMigrate) {
         logInfo("Detected config migration changes");
         await storage.setValues(updatedConfig);
     }
+    // Fill empty config values
+    for (const key in DEFAULT_CONFIG) {
+        const configKey = key as keyof Config;
+        if (typeof config[configKey] === "undefined") {
+            // Fill value
+            await setConfigValue(configKey, DEFAULT_CONFIG[configKey]);
+        }
+    }
     // Initialise preferences
     const preferences = naiveClone(await getConfigValue("preferences"));
     for (const key in PREFERENCES_DEFAULT) {

diff --git a/source/main/services/update.ts b/source/main/services/update.ts
@@ -8,6 +8,7 @@ import { clearDelayedInterval, setDelayedInterval } from "delayable-setinterval"
 import { getMainWindow } from "./windows";
 import { logErr, logInfo, logWarn } from "../library/log";
 import { fileExists } from "../library/file";
+import { getConfigValue } from "./config";
 import { UpdateProgressInfo } from "../types";
 
 const UPDATE_AUTO_CHECK = ms("30m");
@@ -80,6 +81,9 @@ async function checkForUpdateInternal() {
     __currentUpdate = null;
     __readyUpdate = null;
     __updateErrored = false;
+    const prefs = await getConfigValue("preferences");
+    logInfo(`Using pre-release channel for updates: ${prefs.prereleaseUpdates ? "yes" : "no"}`);
+    autoUpdater.allowPrerelease = prefs.prereleaseUpdates;
     autoUpdater.autoDownload = false;
     autoUpdater.setFeedURL({
         provider: "github",

diff --git a/source/renderer/components/PreferencesDialog.tsx b/source/renderer/components/PreferencesDialog.tsx
@@ -26,6 +26,7 @@ const LOCK_VAULTS_TIME_MAX = ms("1d") / 1000;
 const PAGE_CONNECTIVITY = "connectivity";
 const PAGE_GENERAL = "general";
 const PAGE_SECURITY = "security";
+const PAGE_UPDATES = "updates";
 const THEME_AUTO_NAME = "Auto (OS)";
 
 const DialogFreeWidth = styled(Dialog)`
@@ -252,6 +253,23 @@ export function PreferencesDialog() {
             </FormGroup>
         </>
     );
+    const pageUpdates = () => (
+        <>
+            <FormGroup label={t("preferences.item.pre-release.title")}>
+                <Callout icon="lab-test" intent={Intent.WARNING}>
+                    <div dangerouslySetInnerHTML={{ __html: t("preferences.item.pre-release.description") }} />
+                </Callout>
+                <Switch
+                    checked={preferences.prereleaseUpdates}
+                    label={t("preferences.item.pre-release.label")}
+                    onChange={(evt: React.ChangeEvent<HTMLInputElement>) => setPreferences({
+                        ...naiveClone(preferences),
+                        prereleaseUpdates: evt.target.checked
+                    })}
+                />
+            </FormGroup>
+        </>
+    );
     // Render
     return (
         <DialogFreeWidth isOpen={showPreferences.get()} onClose={close}>
@@ -283,21 +301,18 @@ export function PreferencesDialog() {
                                     text={t("preferences.section.connectivity")}
                                 />
                                 <Button
-                                    disabled
-                                    icon="eye-off"
-                                    text={t("preferences.section.privacy")}
-                                />
-                                <Button
-                                    disabled
-                                    icon="lab-test"
-                                    text={t("preferences.section.debug")}
+                                    active={currentPage === PAGE_UPDATES}
+                                    icon="updated"
+                                    onClick={() => setCurrentPage(PAGE_UPDATES)}
+                                    text={t("preferences.section.updates")}
                                 />
                             </PreferencesMenu>
                         </PreferencesSidebar>
                         <PageContent>
                             {currentPage === PAGE_GENERAL && pageGeneral()}
                             {currentPage === PAGE_SECURITY && pageSecurity()}
                             {currentPage === PAGE_CONNECTIVITY && pageConnectivity()}
+                            {currentPage === PAGE_UPDATES && pageUpdates()}
                         </PageContent>
                     </PreferencesContent>
                 )}

diff --git a/source/shared/i18n/trans.ts b/source/shared/i18n/trans.ts
@@ -2,11 +2,14 @@ import i18next, { TOptions } from "i18next";
 import translations from "./translations/index";
 import { DEFAULT_LANGUAGE } from "../symbols";
 
+let __lastLanguage: string | null = null;
+
 export async function changeLanguage(lang: string) {
     await i18next.changeLanguage(lang);
 }
 
 export async function initialise(lang: string) {
+    __lastLanguage = lang;
     await i18next.init({
         lng: lang,
         fallbackLng: DEFAULT_LANGUAGE,
@@ -24,7 +27,11 @@ export async function initialise(lang: string) {
 }
 
 export function onLanguageChanged(callback: (lang: string) => void): () => void {
-    const cb = (lang: string) => callback(lang);
+    const cb = (lang: string) => {
+        if (__lastLanguage === lang) return;
+        __lastLanguage = lang;
+        callback(lang);
+    };
     i18next.on("languageChanged", cb);
     return () => {
         i18next.off("languageChanged", cb);

diff --git a/source/shared/i18n/translations/ca_es.json b/source/shared/i18n/translations/ca_es.json
@@ -223,7 +223,6 @@
         },
         "section": {
             "connectivity": "Connectivitat",
-            "debug": "Depurar",
             "general": "General",
             "privacy": "Privacitat",
             "security": "Seguretat"