Merge branch 'hotfix/9.0.1'

FlashpointProject · Jun 27, 2020 · 3240ba5 · 3240ba5
2 parents 069a974 + e10ed44
commit 3240ba5
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "flashpoint-launcher",
-  "version": "9.0.0",
+  "version": "9.0.1",
   "description": "A desktop application used to browse, manage and play games from BlueMaxima's Flashpoint",
   "main": "build/main/index.js",
   "config": {

diff --git a/src/back/index.ts b/src/back/index.ts
@@ -60,6 +60,7 @@ const state: BackState = {
   exePath: createErrorProxy('exePath'),
   localeCode: createErrorProxy('countryCode'),
   version: createErrorProxy('version'),
+  customVersion: undefined,
   gameManager: {
     platformsPath: '',
     saveQueue: new EventQueue(),
@@ -118,6 +119,16 @@ async function onProcessMessage(message: any, sendHandle: any): Promise<void> {
   state.preferences = pref;
   state.config = conf;
 
+  // Check for custom version to report
+  const versionFilePath = content.isDev ? path.join(process.cwd(), 'version.txt') : path.join(state.config.flashpointPath, 'version.txt');
+  await fs.access(versionFilePath, fs.constants.F_OK)
+  .then(async () => {
+    const data = await fs.readFile(versionFilePath, 'utf8');
+    state.customVersion = data;
+    log(state, { source: 'Launcher', content: `Data Version Detected: ${state.customVersion}`});
+  })
+  .catch(() => { /** File doesn't exist */ });
+
   // Setup DB
   if (!state.connection) {
     const options: ConnectionOptions = {

diff --git a/src/back/responses.ts b/src/back/responses.ts
@@ -91,6 +91,7 @@ export function registerRequestCallbacks(state: BackState): void {
         fileServerPort: state.fileServerPort,
         log: state.log,
         services: services,
+        customVersion: state.customVersion,
         languages: state.languages,
         language: state.languageContainer,
         themes: state.themeFiles.map(theme => ({ entryPath: theme.entryPath, meta: theme.meta })),

diff --git a/src/back/types.ts b/src/back/types.ts
@@ -39,6 +39,7 @@ export type BackState = {
   exePath: string;
   localeCode: string;
   version: string;
+  customVersion?: string,
   gameManager: GameManagerState;
   messageQueue: WebSocket.MessageEvent[];
   isHandling: boolean;

diff --git a/src/main/MainWindowPreload.ts b/src/main/MainWindowPreload.ts
@@ -77,6 +77,8 @@ window.Shared = {
 
   backUrl: createErrorProxy('backUrl'),
 
+  customVersion: undefined,
+
   initialLang: createErrorProxy('initialLang'),
   initialLangList: createErrorProxy('initialLangList'),
   initialThemes: createErrorProxy('initialThemes'),
@@ -123,6 +125,7 @@ const onInit = (async () => {
       window.Shared.fileServerPort = response.data.fileServerPort;
       window.Shared.log.entries = response.data.log;
       window.Shared.services = response.data.services;
+      window.Shared.customVersion = response.data.customVersion;
       window.Shared.initialLang = response.data.language;
       window.Shared.initialLangList = response.data.languages;
       window.Shared.initialThemes = response.data.themes;

diff --git a/src/renderer/app.tsx b/src/renderer/app.tsx
@@ -620,9 +620,12 @@ export class App extends React.Component<AppProps, AppState> {
               creditsLoaded={this.state.creditsDoneLoading}
               miscLoaded={this.state.loaded[BackInit.EXEC]} />
             {/* Title-bar (if enabled) */}
-            { window.Shared.config.data.useCustomTitlebar ? (
-              <TitleBar title={`${APP_TITLE} (${remote.app.getVersion()})`} />
-            ) : undefined }
+            { window.Shared.config.data.useCustomTitlebar ?
+              window.Shared.customVersion ? (
+                <TitleBar title={window.Shared.customVersion} />
+              ) : (
+                <TitleBar title={`${APP_TITLE} (${remote.app.getVersion()})`} />
+              ) : undefined }
             {/* "Content" */}
             { loaded ? (
               <>

diff --git a/src/shared/back/types.ts b/src/shared/back/types.ts
@@ -186,6 +186,7 @@ export type GetRendererInitDataResponse = {
   fileServerPort: number;
   log: ILogEntry[];
   services: IService[];
+  customVersion?: string;
   languages: LangFile[];
   language: LangContainer;
   themes: Theme[];

diff --git a/src/shared/interfaces.ts b/src/shared/interfaces.ts
@@ -87,6 +87,9 @@ export interface IMainWindowExternal {
   /** URL of the back websocket server. */
   backUrl: URL;
 
+  /** Custom version to display alongside launcher version (useful for packaged copies) */
+  customVersion?: string;
+
   initialLang: LangContainer;
   initialLangList: LangFile[];
   initialThemes: Theme[];