From c2b9b4bf2c168d25947c665cff773ea38db340d7 Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Tue, 28 Jun 2022 17:07:52 +0200
Subject: [PATCH] Added experimental support for Vita3K for the psvita system
 on Unix and Windows.

---
 es-app/assets/Windows_Portable_README.txt           |  1 +
 resources/systems/unix/es_find_rules.xml            | 12 ++++++++++++
 resources/systems/unix/es_systems.xml               |  5 +++--
 resources/systems/windows/es_find_rules.xml         | 13 +++++++++++++
 .../systems/windows/es_find_rules_portable.xml      | 10 ++++++++++
 resources/systems/windows/es_systems.xml            |  5 +++--
 6 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/es-app/assets/Windows_Portable_README.txt b/es-app/assets/Windows_Portable_README.txt
index 5a82d626b..ef6cc73f5 100644
--- a/es-app/assets/Windows_Portable_README.txt
+++ b/es-app/assets/Windows_Portable_README.txt
@@ -54,6 +54,7 @@ Emulators\scummvm\scummvm.exe
 Emulators\snes9x\snes9x-x64.exe
 Emulators\Supermodel\Supermodel.exe
 Emulators\VBA-M\visualboyadvance-m.exe
+Emulators\Vita3K\Vita3K.exe
 Emulators\xemu\xemu.exe
 Emulators\xenia\xenia.exe
 Emulators\yuzu\yuzu-windows-msvc\yuzu.exe
diff --git a/resources/systems/unix/es_find_rules.xml b/resources/systems/unix/es_find_rules.xml
index 820683507..9ddd05c23 100644
--- a/resources/systems/unix/es_find_rules.xml
+++ b/resources/systems/unix/es_find_rules.xml
@@ -378,6 +378,18 @@
             <entry>visualboyadvance-m</entry>
         </rule>
     </emulator>
+    <emulator name="VITA3K">
+        <!-- Sony PlayStation Vita emulator Vita3K -->
+        <rule type="systempath">
+            <entry>vita3k</entry>
+            <entry>Vita3K</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>~/Applications/Vita3K/Vita3K</entry>
+            <entry>~/.local/bin/Vita3K/Vita3K</entry>
+            <entry>~/bin/Vita3K/Vita3K</entry>
+        </rule>
+    </emulator>
     <emulator name="XEMU">
         <!-- Microsoft Xbox emulator xemu -->
         <rule type="systempath">
diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml
index 1594b53b3..44be916be 100644
--- a/resources/systems/unix/es_systems.xml
+++ b/resources/systems/unix/es_systems.xml
@@ -1075,8 +1075,9 @@
         <name>psvita</name>
         <fullname>Sony PlayStation Vita</fullname>
         <path>%ROMPATH%/psvita</path>
-        <extension>.7z .7Z .zip .ZIP</extension>
-        <command>PLACEHOLDER %ROM%</command>
+        <extension>.psvita .PSVITA .desktop</extension>
+        <command label="Vita3K Title ID (Standalone)">%EMULATOR_VITA3K% -r %BASENAME%</command>
+        <command label="Vita3K Shortcut (Standalone)">%RUNINBACKGROUND% %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
         <platform>psvita</platform>
         <theme>psvita</theme>
     </system>
diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml
index bf729419b..0582ee736 100644
--- a/resources/systems/windows/es_find_rules.xml
+++ b/resources/systems/windows/es_find_rules.xml
@@ -410,6 +410,19 @@
             <entry>%ESPATH%\..\VBA-M\visualboyadvance-m.exe</entry>
         </rule>
     </emulator>
+    <emulator name="VITA3K">
+        <!-- Sony PlayStation Vita emulator Vita3K -->
+        <rule type="systempath">
+            <entry>Vita3K.exe</entry>
+        </rule>
+        <rule type="staticpath">
+            <rule type="staticpath">
+                <entry>%ESPATH%\Emulators\Vita3K\Vita3K.exe</entry>
+                <entry>%ESPATH%\Vita3K\Vita3K.ex</entry>
+                <entry>%ESPATH%\..\Vita3K\Vita3K.ex</entry>
+            </rule>
+        </rule>
+    </emulator>
     <emulator name="XEMU">
         <!-- Microsoft Xbox emulator xemu -->
         <rule type="systempath">
diff --git a/resources/systems/windows/es_find_rules_portable.xml b/resources/systems/windows/es_find_rules_portable.xml
index f04153aef..ce5c146d7 100644
--- a/resources/systems/windows/es_find_rules_portable.xml
+++ b/resources/systems/windows/es_find_rules_portable.xml
@@ -269,6 +269,16 @@
             <entry>%ESPATH%\..\VBA-M\visualboyadvance-m.exe</entry>
         </rule>
     </emulator>
+    <emulator name="VITA3K">
+        <!-- Sony PlayStation Vita emulator Vita3K -->
+        <rule type="staticpath">
+            <rule type="staticpath">
+                <entry>%ESPATH%\Emulators\Vita3K\Vita3K.exe</entry>
+                <entry>%ESPATH%\Vita3K\Vita3K.ex</entry>
+                <entry>%ESPATH%\..\Vita3K\Vita3K.ex</entry>
+            </rule>
+        </rule>
+    </emulator>
     <emulator name="XEMU">
         <!-- Microsoft Xbox emulator xemu -->
         <rule type="staticpath">
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index ac36a4287..3ae96d499 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -1073,8 +1073,9 @@
         <name>psvita</name>
         <fullname>Sony PlayStation Vita</fullname>
         <path>%ROMPATH%\psvita</path>
-        <extension>.7z .7Z .zip .ZIP</extension>
-        <command>PLACEHOLDER %ROM%</command>
+        <extension>.psvita .PSVITA .lnk .LNK</extension>
+        <command label="Vita3K Title ID (Standalone)">%EMULATOR_VITA3K% -r %BASENAME%</command>
+        <command label="Vita3K Shortcut (Standalone)">%HIDEWINDOW% %ESCAPESPECIALS% %EMULATOR_OS-SHELL% /C %ROM%</command>
         <platform>psvita</platform>
         <theme>psvita</theme>
     </system>