Don't bundle prelease owlet compliancies in stable AdvantageScope rel…

…eases

src/main/UpdateChecker.ts

@@ -1,7 +1,7 @@
 import { app, dialog, shell } from "electron";
 import fetch from "electron-fetch";
-import { isBeta } from "./BetaConfig";
 import { REPOSITORY, WINDOW_ICON } from "./Constants";
+import { isBeta } from "./betaUtil";
 
 /** Checks for updates from GitHub and prompts the user when requested. */
 export default class UpdateChecker {

src/main/betaConfig2.ts

@@ -0,0 +1,12 @@
+export const BETA_CONFIG: BetaConfig | null = {
+  year: "2025",
+  expiration: new Date(2025, 0, 4),
+  surveyUrl:
+    "https://docs.google.com/forms/d/e/1FAIpQLSe7xxOln2NUO6pNrGQAPAJ5W7HH2dcIfcCYYi0etTQQE5ORwg/viewform?usp=pp_url&entry.1466744914=__version__"
+};
+
+export type BetaConfig = {
+  year: string;
+  expiration: Date;
+  surveyUrl: string;
+};

src/main/BetaConfig.ts → src/main/betaUtil.ts

@@ -5,14 +5,8 @@ import path from "path";
 import { DISTRIBUTOR, Distributor } from "../shared/buildConstants";
 import { scaleValue } from "../shared/util";
 import { APP_VERSION } from "./Constants";
+import { BETA_CONFIG } from "./betaConfig2";
 
-// Constants
-const BETA_CONFIG: BetaConfig | null = {
-  year: "2025",
-  expiration: new Date(2025, 0, 4),
-  surveyUrl:
-    "https://docs.google.com/forms/d/e/1FAIpQLSe7xxOln2NUO6pNrGQAPAJ5W7HH2dcIfcCYYi0etTQQE5ORwg/viewform?usp=pp_url&entry.1466744914=__version__"
-};
 const BETA_STATE_FILENAME =
   BETA_CONFIG === null ? null : path.join(app.getPath("userData"), "beta-" + BETA_CONFIG.year + ".json");
 
@@ -110,11 +104,6 @@ export function openBetaSurvey(): void {
 }
 
 // Types
-type BetaConfig = {
-  year: string;
-  expiration: Date;
-  surveyUrl: string;
-};
 type BetaState = {
   welcomeComplete: boolean;
   surveyStatus: number | boolean;

src/main/main.ts

@@ -35,15 +35,6 @@ import { SourceListConfig, SourceListItemState, SourceListTypeMemory } from "../
 import TabType, { getAllTabTypes, getDefaultTabTitle, getTabAccelerator, getTabIcon } from "../shared/TabType";
 import { BUILD_DATE, COPYRIGHT, DISTRIBUTOR, Distributor } from "../shared/buildConstants";
 import { MAX_RECENT_UNITS, NoopUnitConversion, UnitConversionPreset } from "../shared/units";
-import {
-  delayBetaSurvey,
-  isBeta,
-  isBetaExpired,
-  isBetaWelcomeComplete,
-  openBetaSurvey,
-  saveBetaWelcomeComplete,
-  shouldPromptBetaSurvey
-} from "./BetaConfig";
 import {
   APP_VERSION,
   DEFAULT_PREFS,
@@ -78,6 +69,15 @@ import UpdateChecker from "./UpdateChecker";
 import { VideoProcessor } from "./VideoProcessor";
 import { getAssetDownloadStatus, startAssetDownloadLoop } from "./assetsDownload";
 import { convertLegacyAssets, createAssetFolders, getUserAssetsPath, loadAssets } from "./assetsUtil";
+import {
+  delayBetaSurvey,
+  isBeta,
+  isBetaExpired,
+  isBetaWelcomeComplete,
+  openBetaSurvey,
+  saveBetaWelcomeComplete,
+  shouldPromptBetaSurvey
+} from "./betaUtil";
 import { getOwletDownloadStatus, startOwletDownloadLoop } from "./owletDownloadLoop";
 import { checkHootIsPro, convertHoot } from "./owletInterface";
 

src/main/owletDownload.ts

@@ -51,7 +51,7 @@ function getOwletPlatform(electronPlatform: string): string {
  * @param target Target folder where owlet is stored
  * @param platform Platform key in Electron format
  */
-export async function downloadOwletInternal(target: string, platform: string): Promise<void> {
+export async function downloadOwletInternal(target: string, platform: string, stableOnly = false): Promise<void> {
   // Create target folder
   if (!fs.existsSync(target)) {
     fs.mkdirSync(target, { recursive: true });
@@ -67,6 +67,12 @@ export async function downloadOwletInternal(target: string, platform: string): P
 
   // Loop through each compliancy version
   for (let i = 0; i < redistIndex.ChannelCompliancy.length; i++) {
+    // Check if stable
+    let compliancyName = redistIndex.ChannelCompliancy[i].Name.toLowerCase();
+    if (stableOnly && (compliancyName.includes("beta") || compliancyName.includes("alpha"))) {
+      continue;
+    }
+
     // Find latest version for compliancy
     let compatibleVersions = owletIndex.Items.filter(
       (version) => version.Compliancy === redistIndex.ChannelCompliancy[i].Compliancy

src/runOwletDownload.ts

@@ -1,8 +1,9 @@
 import path from "path";
+import { BETA_CONFIG } from "./main/betaConfig2";
 import { downloadOwletInternal } from "./main/owletDownload";
 
 function download(platform: string) {
-  downloadOwletInternal(path.join("owlet", platform), platform).then(() => {
+  downloadOwletInternal(path.join("owlet", platform), platform, BETA_CONFIG === null).then(() => {
     console.log("Finished downloading for " + platform);
   });
 }