feat: Run with Flash / Ruffle in dropdown

refactor: Make 'Create' view button always visible at top of left

refactor: Move default to top of tags page again

fix: Search view ref not updated on duplicate

Author: colin969

extensions/core-ruffle/src/extension.ts

@@ -66,6 +66,23 @@ export async function activate(context: flashpoint.ExtensionContext): Promise<vo
     const supportedEnabled = flashpoint.getExtConfigValue('com.ruffle.enabled');
     const unsupportedEnabled = flashpoint.getExtConfigValue('com.ruffle.enabled-all');
 
+    if (launchInfo.launchInfo.override === 'flash') {
+      return;
+    }
+
+    if (launchInfo.launchInfo.override === 'ruffle') {
+      flashpoint.log.info('Using Standalone Ruffle for overriden game...');
+        const defaultConfig = standaloneMiddleware.getDefaultConfig(launchInfo.game);
+        standaloneMiddleware.execute(launchInfo, {
+          middlewareId: '',
+          name: '',
+          enabled: true,
+          version: defaultConfig.version,
+          config: defaultConfig.config,
+        });
+        return;
+    }
+
     if (supportedEnabled || curation) {
       if (launchInfo.game.ruffleSupport.toLowerCase() === 'standalone') {
         flashpoint.log.info('Using Standalone Ruffle for supported game...');

extensions/core-ruffle/src/util.ts

@@ -93,6 +93,7 @@ export async function getGithubAsset(nameRegex: RegExp, logDev: (text: string) =
     logDev(`No binaries found for this system, checking older releases...`);
   }
   logDev(`No binaries found in 7 releases, stopping...`);
+  return null;
 }
 
 export function getPlatformRegex(): RegExp {

lang/en.json

@@ -211,7 +211,7 @@
     "deleteOnlyBrowseView": "Delete Search View (Must have another custom view)",
     "renameView": "Rename Search View",
     "duplicateView": "Duplicate Search View",
-    "createNewView": "Create New Search view",
+    "createNewView": "Create New Search View",
     "errorLoadingServices": "An error occurred while loading services. Please check the logs for more details."
   },
   "filter": {
@@ -362,6 +362,7 @@
     "noLaunchCommand": "No Launch Command",
     "searching": "Searching...",
     "library": "Library",
+    "noLibrary": "No Library",
     "defaultLibrary": "Default Library",
     "fpfssGame": "FPFSS Game",
     "uninstallGame": "Uninstall Game",
@@ -411,7 +412,10 @@
     "notArchived": "Not Archived",
     "archived": "Archived",
     "playOnline": "Play Online",
-    "tagFilterIcon": "Tag Filter Icon"
+    "tagFilterIcon": "Tag Filter Icon",
+    "runWithFlashPlayer": "Run with Flash Player",
+    "runWithRuffle": "Run with Ruffle",
+    "runWithRuffleUnsupported": "Run with Ruffle (Unsupported)"
   },
   "tags": {
     "name": "Name",

src/back/GameLauncher.ts

@@ -9,7 +9,7 @@ import { formatString } from '@shared/utils/StringFormatter';
 import * as child_process from 'child_process';
 import { ChildProcess } from 'child_process';
 import { EventEmitter } from 'events';
-import { AdditionalApp, AppPathOverride, DialogStateTemplate, Game, GameConfig, GameData, GameLaunchInfo, ManagedChildProcess, Platform } from 'flashpoint-launcher';
+import { AdditionalApp, AppPathOverride, DialogStateTemplate, Game, GameConfig, GameData, GameLaunchInfo, GameLaunchOverride, LaunchInfo, ManagedChildProcess, Platform } from 'flashpoint-launcher';
 import * as fs from 'fs-extra';
 import * as minimist from 'minimist';
 import * as path from 'path';
@@ -32,15 +32,6 @@ export type LaunchGameOpts = LaunchBaseOpts & {
   native: boolean;
 }
 
-export type LaunchInfo = {
-  gamePath: string;
-  gameArgs: string | string[];
-  useWine: boolean;
-  env: NodeJS.ProcessEnv;
-  cwd?: string;
-  noshell?: boolean;
-}
-
 type LaunchBaseOpts = {
   changeServer: (server?: string) => Promise<void>;
   fpPath: string;
@@ -62,6 +53,7 @@ type LaunchBaseOpts = {
   state: BackState;
   activeConfig: GameConfig | null;
   autoClearWininetCache: boolean;
+  override: GameLaunchOverride;
 }
 
 export namespace GameLauncher {
@@ -109,6 +101,7 @@ export namespace GameLauncher {
           await handleGameDataParams(opts, serverOverride, gameData || undefined);
         }
         const launchInfo: LaunchInfo = {
+          override: opts.override,
           gamePath: gamePath,
           gameArgs: appArgs,
           useWine,
@@ -168,6 +161,7 @@ export namespace GameLauncher {
         state: opts.state,
         activeConfig: opts.activeConfig,
         autoClearWininetCache: opts.autoClearWininetCache,
+        override: opts.override,
       };
       for (const addApp of opts.game.addApps) {
         if (addApp.autoRunBefore) {
@@ -253,6 +247,7 @@ export namespace GameLauncher {
             game: opts.game,
             activeData: gameData,
             launchInfo: {
+              override: opts.override,
               gamePath: process.execPath,
               gameArgs: browserLaunchArgs,
               useWine: false,
@@ -298,6 +293,7 @@ export namespace GameLauncher {
       game: opts.game,
       activeData: gameData,
       launchInfo: {
+        override: opts.override,
         gamePath,
         gameArgs,
         useWine,

src/back/responses.ts

@@ -559,7 +559,7 @@ export function registerRequestCallbacks(state: BackState, init: () => Promise<v
     return state.execMappings;
   });
 
-  state.socketServer.register(BackIn.LAUNCH_ADDAPP, async (event, id) => {
+  state.socketServer.register(BackIn.LAUNCH_ADDAPP, async (event, id, override) => {
     const addApp = await fpDatabase.findAddAppById(id);
     if (addApp) {
       // Force load relation
@@ -614,14 +614,16 @@ export function registerRequestCallbacks(state: BackState, init: () => Promise<v
         state,
         parentGame,
         runAddApp: runAddAppFactory(state),
-        autoClearWininetCache: state.preferences.autoClearWininetCache
+        autoClearWininetCache: state.preferences.autoClearWininetCache,
+        override,
       }, false);
       state.apiEmitters.games.onDidLaunchAddApp.fireAlert(state, addApp, event.client, 'Error during post add app launch api event');
     }
   });
 
-  state.socketServer.register(BackIn.LAUNCH_GAME, async (event, id) => {
+  state.socketServer.register(BackIn.LAUNCH_GAME, async (event, id, override) => {
     const game = await fpDatabase.findGame(id);
+    console.log('override: ' + override);
 
     if (game) {
       // Make sure Server is set to configured server - Curations may have changed it
@@ -750,6 +752,7 @@ export function registerRequestCallbacks(state: BackState, init: () => Promise<v
         activeConfig: activeConfig ? activeConfig : null,
         state,
         autoClearWininetCache: state.preferences.autoClearWininetCache,
+        override,
       },
       state.apiEmitters.games.onWillLaunchGame.fireableFactory(state, event.client, 'Error during game launch api event'), false);
       await state.apiEmitters.games.onDidLaunchGame.fireAlert(state, game, event.client, 'Error from post game launch api event');
@@ -1772,6 +1775,7 @@ export function registerRequestCallbacks(state: BackState, init: () => Promise<v
         activeConfig: null,
         state,
         autoClearWininetCache: state.preferences.autoClearWininetCache,
+        override: data.override,
       },
       state.apiEmitters.games.onWillLaunchCurationGame.fireableFactory(state, event.client, 'Error during curate game launch api event'),
       state.apiEmitters.games.onDidLaunchCurationGame.fireableFactory(state, event.client, 'Error during curate post game launch api event'),
@@ -1809,6 +1813,7 @@ export function registerRequestCallbacks(state: BackState, init: () => Promise<v
         state,
         parentGame: newGame(),
         autoClearWininetCache: state.preferences.autoClearWininetCache,
+        override: data.override,
       },
       state.apiEmitters.games.onWillLaunchCurationAddApp.fireableFactory(state, event.client, 'Error during curate add app launch api event'),
       state.apiEmitters.games.onDidLaunchCurationAddApp.fireableFactory(state, event.client, 'Error during curate post add app launch api event'));

src/renderer/components/GameGrid.tsx

@@ -9,7 +9,7 @@ import { GameGridItem } from './GameGridItem';
 import { GameItemContainer } from './GameItemContainer';
 import { GameDragData, GameDragEventData } from './pages/BrowsePage';
 import { ScreenshotPreviewMode } from '@shared/BrowsePageLayout';
-import { TagFilter } from 'flashpoint-launcher';
+import { GameLaunchOverride, TagFilter } from 'flashpoint-launcher';
 
 const RENDERER_OVERSCAN = 5;
 
@@ -22,7 +22,7 @@ type ColumnsRows = {
 };
 
 export type GameGridProps = {
-  onGameLaunch: (gameId: string) => void;
+  onGameLaunch: (gameId: string, override: GameLaunchOverride) => void;
   /** All games that will be shown in the grid (filter it before passing it here). */
   games: ViewGameSet;
   /** Total number of games in the results view there are. */
@@ -319,7 +319,7 @@ export class GameGrid extends React.Component<GameGridProps, GameGridState> {
   onKeyPress = (event: React.KeyboardEvent): void => {
     if (event.key === 'Enter') {
       if (this.props.selectedGameId) {
-        this.props.onGameLaunch(this.props.selectedGameId);
+        this.props.onGameLaunch(this.props.selectedGameId, null);
       }
     }
   };
@@ -346,7 +346,7 @@ export class GameGrid extends React.Component<GameGridProps, GameGridState> {
    * @param gameId ID of Game to launch
    */
   onGameLaunch = (event: React.MouseEvent, gameId: string): void => {
-    this.props.onGameLaunch(gameId);
+    this.props.onGameLaunch(gameId, null);
   };
 
   /**

src/renderer/components/GameList.tsx

@@ -9,7 +9,7 @@ import { GameItemContainer } from './GameItemContainer';
 import { GameListHeader } from './GameListHeader';
 import { GameListItem } from './GameListItem';
 import { GameDragData, GameDragEventData } from './pages/BrowsePage';
-import { TagFilter } from 'flashpoint-launcher';
+import { GameLaunchOverride, TagFilter } from 'flashpoint-launcher';
 
 /** A function that receives an HTML element. */
 type RefFunc<T extends HTMLElement> = (instance: T | null) => void;
@@ -41,7 +41,7 @@ export type OwnProps = {
   /** Called when the user attempts to select a game. */
   onGameSelect: (gameId?: string, row?: number) => void;
   /** Called when the user attempts to launch a game. */
-  onGameLaunch: (gameId: string) => void;
+  onGameLaunch: (gameId: string, override: GameLaunchOverride) => void;
   /** Called when the user attempts to open a context menu (at a game). */
   onContextMenu: (gameId: string) => void;
   /** Called when the user starts to drag a game. */
@@ -231,7 +231,7 @@ class _GameList extends React.Component<GameListProps> {
   onKeyPress = (event: React.KeyboardEvent): void => {
     if (event.key === 'Enter') {
       if (this.props.selectedGameId) {
-        this.props.onGameLaunch(this.props.selectedGameId);
+        this.props.onGameLaunch(this.props.selectedGameId, null);
       }
     }
   };
@@ -254,7 +254,7 @@ class _GameList extends React.Component<GameListProps> {
    * @param gameId ID of Game to launch
    */
   onGameLaunch = (event: React.MouseEvent, gameId: string): void => {
-    this.props.onGameLaunch(gameId);
+    this.props.onGameLaunch(gameId, null);
   };
 
   /**

src/renderer/components/Header.tsx

@@ -331,6 +331,10 @@ export class Header extends React.Component<HeaderProps, HeaderState> {
                     link={joinLibraryRoute(view)}
                     onContextMenu={() => {
                       const contextButtons: MenuItemConstructorOptions[] = [
+                        {
+                          label: strings.createNewView,
+                          click: this.onCreateNewView,
+                        },
                         {
                           label: strings.renameView,
                           click: () => this.onRenameView(view),
@@ -345,12 +349,6 @@ export class Header extends React.Component<HeaderProps, HeaderState> {
                           click: () => this.onDeleteView(view),
                         },
                       ];
-                      if (this.props.preferencesData.hideNewViewButton) {
-                        contextButtons.push({
-                          label: strings.createNewView,
-                          click: this.onCreateNewView,
-                        });
-                      }
                       const menu = remote.Menu.buildFromTemplate(contextButtons);
                       menu.popup({ window: remote.getCurrentWindow() });
                     }}/>