Skip to content

Commit 4af97e0

Browse files
dragoonDorisedragoonDorise
committed
parsers fix
1 parent 9cebef3 commit 4af97e0

File tree

1 file changed

+44
-26
lines changed

1 file changed

+44
-26
lines changed

‎src/renderer/pages/ParserSelectorPage.jsx‎

Lines changed: 44 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ function ParserSelectorPage() {
6565
const ipcChannel = window.electron.ipcRenderer;
6666
const navigate = useNavigate();
6767
const { state, setState } = useContext(GlobalContext);
68-
const { device, installEmus, emulatorAlternative, revertParsers } = state;
68+
const { device, installEmus, emulatorAlternative, revertParsers, system } =
69+
state;
6970

7071
useEffect(() => {
7172
const ogStateEmus = state.installEmus;
@@ -83,13 +84,13 @@ function ParserSelectorPage() {
8384
const { disabledNext, disabledBack, data, modal, lastSelected, dom } =
8485
statePage;
8586

86-
const setAlternativeParser = (system, emuName, emuName2, disable) => {
87+
const setAlternativeParser = (systemCode, emuName, emuName2, disable) => {
8788
if (emuName === 'ra' || emuName === 'ares') {
8889
setState({
8990
...state,
9091
emulatorAlternative: {
9192
...emulatorAlternative,
92-
[system]: emuName,
93+
[systemCode]: emuName,
9394
},
9495
installEmus: {
9596
...installEmus,
@@ -101,7 +102,7 @@ function ParserSelectorPage() {
101102
...state,
102103
emulatorAlternative: {
103104
...emulatorAlternative,
104-
[system]: emuName,
105+
[systemCode]: emuName,
105106
},
106107
});
107108
} else {
@@ -111,7 +112,7 @@ function ParserSelectorPage() {
111112
...state,
112113
emulatorAlternative: {
113114
...emulatorAlternative,
114-
[system]: emuName,
115+
[systemCode]: emuName,
115116
},
116117
installEmus: {
117118
...installEmus,
@@ -405,7 +406,7 @@ function ParserSelectorPage() {
405406
let emuOption2;
406407
let emuID1;
407408
let emuID2;
408-
let system;
409+
let systemCode;
409410
let multiemulatorName;
410411
let multiemulatorID;
411412

@@ -431,7 +432,7 @@ function ParserSelectorPage() {
431432
emuOption2 = 'RetroArch';
432433
emuID2 = 'ares';
433434
emuID1 = 'ra';
434-
system = 'multiemulator';
435+
systemCode = 'multiemulator';
435436
modalData = {
436437
active: true,
437438
body: (
@@ -472,7 +473,7 @@ function ParserSelectorPage() {
472473
type="button"
473474
aria={emuOption1}
474475
onClick={() =>
475-
setAlternativeParser(system, emuID2, emuID1, false)
476+
setAlternativeParser(systemCode, emuID2, emuID1, false)
476477
}
477478
disabled={false}
478479
>
@@ -483,7 +484,7 @@ function ParserSelectorPage() {
483484
type="button"
484485
aria={emuOption2}
485486
onClick={() =>
486-
setAlternativeParser(system, emuID1, emuID2, true)
487+
setAlternativeParser(systemCode, emuID1, emuID2, true)
487488
}
488489
disabled={false}
489490
>
@@ -493,7 +494,7 @@ function ParserSelectorPage() {
493494
css="btn-simple--3"
494495
type="button"
495496
aria="Go Back"
496-
onClick={() => setAlternativeParser(system, 'both', 'both')}
497+
onClick={() => setAlternativeParser(systemCode, 'both', 'both')}
497498
>
498499
Both
499500
</BtnSimple>
@@ -520,7 +521,7 @@ function ParserSelectorPage() {
520521
emuOption2 = multiemulatorName;
521522
emuID2 = 'mgba';
522523
emuID1 = multiemulatorID;
523-
system = 'gba';
524+
systemCode = 'gba';
524525
modalData = {
525526
active: true,
526527
body: (
@@ -572,7 +573,7 @@ function ParserSelectorPage() {
572573
emuOption2 = multiemulatorName;
573574
emuID2 = 'rmg';
574575
emuID1 = multiemulatorID;
575-
system = 'n64';
576+
systemCode = 'n64';
576577
modalData = {
577578
active: true,
578579
body: (
@@ -622,7 +623,7 @@ function ParserSelectorPage() {
622623
emuOption2 = multiemulatorName;
623624
emuID2 = 'duckstation';
624625
emuID1 = multiemulatorID;
625-
system = 'psx';
626+
systemCode = 'psx';
626627
modalData = {
627628
active: true,
628629
body: (
@@ -672,7 +673,7 @@ function ParserSelectorPage() {
672673
emuOption2 = multiemulatorName;
673674
emuID2 = 'melonDS';
674675
emuID1 = multiemulatorID;
675-
system = 'nds';
676+
systemCode = 'nds';
676677
modalData = {
677678
active: true,
678679
body: (
@@ -722,7 +723,7 @@ function ParserSelectorPage() {
722723
emuOption2 = multiemulatorName;
723724
emuID2 = 'ppsspp';
724725
emuID1 = multiemulatorID;
725-
system = 'psp';
726+
systemCode = 'psp';
726727
modalData = {
727728
active: true,
728729
body: (
@@ -773,7 +774,7 @@ function ParserSelectorPage() {
773774
emuOption2 = multiemulatorName;
774775
emuID2 = 'mame';
775776
emuID1 = multiemulatorID;
776-
system = 'mame';
777+
systemCode = 'mame';
777778
modalData = {
778779
active: true,
779780
body: (
@@ -818,7 +819,7 @@ function ParserSelectorPage() {
818819
emuOption2 = multiemulatorName;
819820
emuID2 = 'scummvm';
820821
emuID1 = multiemulatorID;
821-
system = 'scummvm';
822+
systemCode = 'scummvm';
822823
modalData = {
823824
active: true,
824825
body: (
@@ -868,7 +869,7 @@ function ParserSelectorPage() {
868869
type="button"
869870
aria={emuOption1}
870871
onClick={() =>
871-
setAlternativeParser(system, emuID2, emuID1, false)
872+
setAlternativeParser(systemCode, emuID2, emuID1, false)
872873
}
873874
disabled={false}
874875
>
@@ -878,7 +879,9 @@ function ParserSelectorPage() {
878879
css="btn-simple--2"
879880
type="button"
880881
aria={emuOption2}
881-
onClick={() => setAlternativeParser(system, emuID1, emuID2, true)}
882+
onClick={() =>
883+
setAlternativeParser(systemCode, emuID1, emuID2, true)
884+
}
882885
disabled={false}
883886
>
884887
{emuOption2}
@@ -887,7 +890,7 @@ function ParserSelectorPage() {
887890
css="btn-simple--3"
888891
type="button"
889892
aria="Go Back"
890-
onClick={() => setAlternativeParser(system, 'both', 'both')}
893+
onClick={() => setAlternativeParser(systemCode, 'both', 'both')}
891894
>
892895
Both
893896
</BtnSimple>
@@ -913,9 +916,18 @@ function ParserSelectorPage() {
913916
modal: modalData,
914917
});
915918

916-
ipcChannel.sendMessage('emudeck', [
917-
`parsersUpdate|||$(. ~/.config/EmuDeck/backend/functions/all.sh && setSetting emuGBA ${state.emulatorAlternative.gba} >/dev/null && setSetting emuMAME ${state.emulatorAlternative.mame} >/dev/null && setSetting emuMULTI ${state.emulatorAlternative.multiemulator} >/dev/null && setSetting emuN64 ${state.emulatorAlternative.n64} >/dev/null && setSetting emuNDS ${state.emulatorAlternative.nds} >/dev/null && setSetting emuPSP ${state.emulatorAlternative.psp} >/dev/null && setSetting emuPSX ${state.emulatorAlternative.psx} >/dev/null && setSetting emuSCUMMVM ${state.emulatorAlternative.scummvm} >/dev/null && setSetting doInstallPrimeHack ${installEmus.primehack.status} >/dev/null && setSetting doInstallRPCS3 ${installEmus.rpcs3.status} >/dev/null && setSetting doInstallCitra ${installEmus.citra.status} >/dev/null && setSetting doInstallDolphin ${installEmus.dolphin.status} >/dev/null && setSetting doInstallPPSSPP ${installEmus.ppsspp.status} >/dev/null && setSetting doInstallXemu ${installEmus.xemu.status} >/dev/null && setSetting doInstallCemu ${installEmus.cemu.status} >/dev/null && setSetting doInstallXenia ${installEmus.xenia.status} >/dev/null && setSetting doInstallScummVM ${installEmus.scummvm.status} >/dev/null && setSetting doInstallRMG ${installEmus.rmg.status} >/dev/null && setSetting doInstallmelonDS ${installEmus.melonds.status} >/dev/null && setSetting doInstallVita3K ${installEmus.vita3k.status} >/dev/null && setSetting doInstallMGBA ${installEmus.mgba.status} >/dev/null && setSetting doInstallMAME ${installEmus.mame.status} >/dev/null && setSetting doInstallYuzu ${installEmus.yuzu.status} >/dev/null && setSetting doInstallRyujinx ${installEmus.ryujinx.status} >/dev/null && setSetting doInstallPCSX2QT ${installEmus.pcsx2.status} >/dev/null) >/dev/null && . ~/.config/EmuDeck/backend/functions/all.sh && SRM_init`,
918-
]);
919+
if (system === 'win32') {
920+
ipcChannel.sendMessage('emudeck', [
921+
`parsersUpdatePrev|||setSetting emuGBA ${state.emulatorAlternative.gba}; setSetting emuMAME ${state.emulatorAlternative.mame}; setSetting emuMULTI ${state.emulatorAlternative.multiemulator}; setSetting emuN64 ${state.emulatorAlternative.n64}; setSetting emuNDS ${state.emulatorAlternative.nds}; setSetting emuPSP ${state.emulatorAlternative.psp}; setSetting emuPSX ${state.emulatorAlternative.psx}; setSetting emuSCUMMVM ${state.emulatorAlternative.scummvm}; setSetting doInstallPrimeHack ${installEmus.primehack.status}; setSetting doInstallRPCS3 ${installEmus.rpcs3.status}; setSetting doInstallCitra ${installEmus.citra.status}; setSetting doInstallDolphin ${installEmus.dolphin.status}; setSetting doInstallPPSSPP ${installEmus.ppsspp.status}; setSetting doInstallXemu ${installEmus.xemu.status}; setSetting doInstallCemu ${installEmus.cemu.status}; setSetting doInstallXenia ${installEmus.xenia.status}; setSetting doInstallScummVM ${installEmus.scummvm.status}; setSetting doInstallRMG ${installEmus.rmg.status}; setSetting doInstallmelonDS ${installEmus.melonds.status}; setSetting doInstallVita3K ${installEmus.vita3k.status}; setSetting doInstallMGBA ${installEmus.mgba.status}; setSetting doInstallMAME ${installEmus.mame.status}; setSetting doInstallYuzu ${installEmus.yuzu.status}; setSetting doInstallRyujinx ${installEmus.ryujinx.status}; setSetting doInstallPCSX2QT ${installEmus.pcsx2.status} >/dev/null`,
922+
]);
923+
ipcChannel.once(`parsersUpdatePrev`, (message) => {
924+
ipcChannel.sendMessage('emudeck', [`parsersUpdate|||SRM_init`]);
925+
});
926+
} else {
927+
ipcChannel.sendMessage('emudeck', [
928+
`parsersUpdate|||$(. ~/.config/EmuDeck/backend/functions/all.sh && setSetting emuGBA ${state.emulatorAlternative.gba} >/dev/null && setSetting emuMAME ${state.emulatorAlternative.mame} >/dev/null && setSetting emuMULTI ${state.emulatorAlternative.multiemulator} >/dev/null && setSetting emuN64 ${state.emulatorAlternative.n64} >/dev/null && setSetting emuNDS ${state.emulatorAlternative.nds} >/dev/null && setSetting emuPSP ${state.emulatorAlternative.psp} >/dev/null && setSetting emuPSX ${state.emulatorAlternative.psx} >/dev/null && setSetting emuSCUMMVM ${state.emulatorAlternative.scummvm} >/dev/null && setSetting doInstallPrimeHack ${installEmus.primehack.status} >/dev/null && setSetting doInstallRPCS3 ${installEmus.rpcs3.status} >/dev/null && setSetting doInstallCitra ${installEmus.citra.status} >/dev/null && setSetting doInstallDolphin ${installEmus.dolphin.status} >/dev/null && setSetting doInstallPPSSPP ${installEmus.ppsspp.status} >/dev/null && setSetting doInstallXemu ${installEmus.xemu.status} >/dev/null && setSetting doInstallCemu ${installEmus.cemu.status} >/dev/null && setSetting doInstallXenia ${installEmus.xenia.status} >/dev/null && setSetting doInstallScummVM ${installEmus.scummvm.status} >/dev/null && setSetting doInstallRMG ${installEmus.rmg.status} >/dev/null && setSetting doInstallmelonDS ${installEmus.melonds.status} >/dev/null && setSetting doInstallVita3K ${installEmus.vita3k.status} >/dev/null && setSetting doInstallMGBA ${installEmus.mgba.status} >/dev/null && setSetting doInstallMAME ${installEmus.mame.status} >/dev/null && setSetting doInstallYuzu ${installEmus.yuzu.status} >/dev/null && setSetting doInstallRyujinx ${installEmus.ryujinx.status} >/dev/null && setSetting doInstallPCSX2QT ${installEmus.pcsx2.status} >/dev/null) >/dev/null && . ~/.config/EmuDeck/backend/functions/all.sh && SRM_init`,
929+
]);
930+
}
919931

920932
ipcChannel.once(`parsersUpdate`, (message) => {
921933
const status = message.stdout;
@@ -980,9 +992,15 @@ function ParserSelectorPage() {
980992
useEffect(() => {
981993
if (revertParsers === true) {
982994
console.log({ installEmus });
983-
ipcChannel.sendMessage('emudeck', [
984-
`installupdate|||setSetting doInstallPrimeHack ${installEmus.primehack.status} >/dev/null && setSetting doInstallRPCS3 ${installEmus.rpcs3.status} >/dev/null && setSetting doInstallCitra ${installEmus.citra.status} >/dev/null && setSetting doInstallDolphin ${installEmus.dolphin.status} && setSetting doInstallPPSSPP ${installEmus.ppsspp.status} >/dev/null && setSetting doInstallXemu ${installEmus.xemu.status} >/dev/null && setSetting doInstallCemu ${installEmus.cemu.status} >/dev/null && setSetting doInstallXenia ${installEmus.xenia.status} >/dev/null && setSetting doInstallScummVM ${installEmus.scummvm.status} >/dev/null && setSetting doInstallRMG ${installEmus.rmg.status} >/dev/null && setSetting doInstallmelonDS ${installEmus.melonds.status} >/dev/null && setSetting doInstallVita3K ${installEmus.vita3k.status} >/dev/null && setSetting doInstallMGBA ${installEmus.mgba.status} >/dev/null && setSetting doInstallMAME ${installEmus.mame.status} >/dev/null && setSetting doInstallYuzu ${installEmus.yuzu.status} >/dev/null && setSetting doInstallRyujinx ${installEmus.ryujinx.status} >/dev/null && setSetting doInstallPCSX2QT ${installEmus.pcsx2.status} >/dev/null`,
985-
]);
995+
if (system === 'win32') {
996+
ipcChannel.sendMessage('emudeck', [
997+
`installupdate|||setSetting doInstallPrimeHack ${installEmus.primehack.status} ; setSetting doInstallRPCS3 ${installEmus.rpcs3.status} ; setSetting doInstallCitra ${installEmus.citra.status} ; setSetting doInstallDolphin ${installEmus.dolphin.status} ; setSetting doInstallPPSSPP ${installEmus.ppsspp.status} ; setSetting doInstallXemu ${installEmus.xemu.status} ; setSetting doInstallCemu ${installEmus.cemu.status} ; setSetting doInstallXenia ${installEmus.xenia.status} ; setSetting doInstallScummVM ${installEmus.scummvm.status} ; setSetting doInstallRMG ${installEmus.rmg.status} ; setSetting doInstallmelonDS ${installEmus.melonds.status} ; setSetting doInstallVita3K ${installEmus.vita3k.status} ; setSetting doInstallMGBA ${installEmus.mgba.status} ; setSetting doInstallMAME ${installEmus.mame.status} ; setSetting doInstallYuzu ${installEmus.yuzu.status} ; setSetting doInstallRyujinx ${installEmus.ryujinx.status} ; setSetting doInstallPCSX2QT ${installEmus.pcsx2.status}`,
998+
]);
999+
} else {
1000+
ipcChannel.sendMessage('emudeck', [
1001+
`installupdate|||setSetting doInstallPrimeHack ${installEmus.primehack.status} >/dev/null && setSetting doInstallRPCS3 ${installEmus.rpcs3.status} >/dev/null && setSetting doInstallCitra ${installEmus.citra.status} >/dev/null && setSetting doInstallDolphin ${installEmus.dolphin.status} && setSetting doInstallPPSSPP ${installEmus.ppsspp.status} >/dev/null && setSetting doInstallXemu ${installEmus.xemu.status} >/dev/null && setSetting doInstallCemu ${installEmus.cemu.status} >/dev/null && setSetting doInstallXenia ${installEmus.xenia.status} >/dev/null && setSetting doInstallScummVM ${installEmus.scummvm.status} >/dev/null && setSetting doInstallRMG ${installEmus.rmg.status} >/dev/null && setSetting doInstallmelonDS ${installEmus.melonds.status} >/dev/null && setSetting doInstallVita3K ${installEmus.vita3k.status} >/dev/null && setSetting doInstallMGBA ${installEmus.mgba.status} >/dev/null && setSetting doInstallMAME ${installEmus.mame.status} >/dev/null && setSetting doInstallYuzu ${installEmus.yuzu.status} >/dev/null && setSetting doInstallRyujinx ${installEmus.ryujinx.status} >/dev/null && setSetting doInstallPCSX2QT ${installEmus.pcsx2.status} >/dev/null`,
1002+
]);
1003+
}
9861004
ipcChannel.once(`installupdate`, (message) => {
9871005
const status = message.stdout;
9881006
status.replace('\n', '');

0 commit comments

Comments
 (0)