fix: Wrap rest of sidebar search fields in quotes

fix: Pathing issue when resolving data pack in makeCurationFromGame

fix: Make context menu use same code as right sidebar for initiating fpfss edits

fix: Remove outdated http proxying rules getting in the way of local fpfss dev

Author: colin969

src/back/curate/util.ts

@@ -378,7 +378,7 @@ export async function makeCurationFromGame(state: BackState, gameId: string, ski
       const activeData = await fpDatabase.findGameDataById(game.activeDataId);
       if (activeData && activeData.presentOnDisk && !skipDataPack) {
         // Extract data pack into curation folder
-        const dataPath = getGameDataFilename(activeData);
+        const dataPath = path.join(state.config.flashpointPath, state.preferences.dataPacksFolderPath, getGameDataFilename(activeData));
         await extractFullPromise([dataPath, curPath, { $bin: state.sevenZipPath }]);
         // Clean up content.json file from extracted data pack
         await fs.unlink(path.join(curPath, 'content.json'))

src/back/sync.ts

@@ -46,7 +46,8 @@ export async function syncPlatforms(source: GameMetadataSource): Promise<Date> {
 
   const res = await axios.get(platformsUrl)
   .catch((err) => {
-    throw 'Failed to search platforms';
+    console.log(err);
+    throw `Failed to search platforms - ${err}`;
   });
 
   const platforms = (res.data as RemotePlatformRaw[]).map<RemotePlatform>((v) => {

src/main/Main.ts

@@ -378,7 +378,7 @@ export function main(init: Init): void {
           )
         )
       );
-      if (!allow && !Util.isDev) {
+      if (Util.isDev ? false : !allow) {
         console.log(`Request Denied to ${url?.hostname || remoteHostname}`);
       }
 
@@ -428,11 +428,6 @@ export function main(init: Init): void {
       }
     });
 
-    webContents.session.setProxy({
-      proxyRules: 'http=localhost:22500;direct://',
-      proxyBypassRules: '<local>,*.unstable.life,*.flashpointarchive.org',
-    });
-
     function onNewPage(navigationUrl: string): void {
       shell.openExternal(navigationUrl);
     }

src/renderer/components/GameComponents.tsx

@@ -48,7 +48,7 @@ export function GameComponentSeries(props: GameComponentProps) {
     header={lang.browse.series}
     text={series}
     placeholder={lang.browse.noSeries}
-    onClick={() => { if (!editable) { doSearch(`series=${series}`); }}}
+    onClick={() => { if (!editable) { doSearch(`series="${series}"`); }}}
     onChange={(value) => updateGame({ series: value })}
     {...props} />;
 }
@@ -62,7 +62,7 @@ export function GameComponentPublisher(props: GameComponentProps) {
     header={lang.browse.publisher}
     text={publisher}
     placeholder={lang.browse.noPublisher}
-    onClick={() => { if (!editable) { doSearch(`publisher=${publisher}`); }}}
+    onClick={() => { if (!editable) { doSearch(`publisher="${publisher}"`); }}}
     onChange={(value) => updateGame({ publisher: value })}
     {...props} />;
 }
@@ -102,7 +102,7 @@ export function GameComponentLanguage(props: GameComponentProps) {
     header={lang.browse.language}
     text={language}
     placeholder={lang.browse.noLanguage}
-    onClick={() => { if (!editable) { doSearch(`language=${language}`); }}}
+    onClick={() => { if (!editable) { doSearch(`language="${language}"`); }}}
     onChange={(value) => updateGame({ language: value })}
     {...props} />;
 }
@@ -121,7 +121,7 @@ export function GameComponentPlayMode(props: GameComponentProps) {
         onChange={(event) => updateGame({ playMode: event.currentTarget.value })}
         className='browse-right-sidebar__searchable'
         editable={editable}
-        onClick={() => { if (!editable) { doSearch(`playMode=${playMode}`); }}}
+        onClick={() => { if (!editable) { doSearch(`playMode="${playMode}"`); }}}
         items={suggestions && filterSuggestions(suggestions.playMode) || []}
         onItemSelect={text => updateGame({ playMode: text })} />
     </div>
@@ -142,7 +142,7 @@ export function GameComponentStatus(props: GameComponentProps) {
         onChange={(event) => updateGame({ status: event.currentTarget.value })}
         className='browse-right-sidebar__searchable'
         editable={editable}
-        onClick={() => { if (!editable) { doSearch(`status=${status}`); }}}
+        onClick={() => { if (!editable) { doSearch(`status="${status}"`); }}}
         items={suggestions && filterSuggestions(suggestions.status) || []}
         onItemSelect={text => updateGame({ status: text })} />
     </div>

src/renderer/context/MenuContext.tsx

@@ -3,6 +3,7 @@ import { createErrorDialogWithPrefix, createNewDialog } from '@renderer/dialog';
 import { useAppDispatch, useAppSelector } from '@renderer/hooks/useAppSelector';
 import { useLocalization } from '@renderer/hooks/useLocalization';
 import { setCurrentCuration } from '@renderer/store/curate/slice';
+import { createFpfssEditGame } from '@renderer/store/fpfss/slice';
 import { getGameImagePath, getGameImageURL, getGamePath, openUrlInWindow } from '@renderer/Util';
 import { BackIn } from '@shared/back/types';
 import { Paths } from '@shared/Paths';
@@ -11,6 +12,7 @@ import { DialogStateTemplate, LangContainer, Playlist } from 'flashpoint-launche
 import { MenuContextStateProps, MenuItemType } from 'flashpoint-launcher-renderer';
 import React, { createContext, useEffect, useRef, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
+import { toast } from 'react-toastify';
 
 export const defaultMenuWidth = 230;
 export const menuDefHeight = 26;
@@ -56,7 +58,17 @@ export function MenuProvider({ children }: MenuContextProps) {
         label: strings.browse.editFpfssGame,
         enabled: enableEditing,
         onClick: () => {
-          // this.onFpfssEditGame(gameId);
+          dispatch(createFpfssEditGame(gameId)).unwrap()
+          .then(() => {
+            navigate(Paths.FPFSS + '/' + gameId);
+          })
+          .catch((error) => {
+            log.error('FPFSS', error.message);
+            toast(error.message, {
+              type: 'error',
+              autoClose: false
+            });
+          });
         }
       },
       {