Explorar o código

Update cmd for PCSX2

Colin Powell %!s(int64=3) %!d(string=hai) anos
pai
achega
28bc63a812
Modificáronse 3 ficheiros con 24 adicións e 11 borrados
  1. 1 1
      emus/settings.py
  2. 19 6
      games/models.py
  3. 4 4
      templates/games/game_detail.html

+ 1 - 1
emus/settings.py

@@ -331,7 +331,7 @@ GAME_SYSTEM_DEFAULTS = {
     "ps2": {
         "name": "Playstation 2",
         "color": "111CAA",
-        "emulator": "pcsx2",
+        "emulator": "PCSX2",
     },
     "psp": {
         "name": "Playstation Portable",

+ 19 - 6
games/models.py

@@ -219,15 +219,17 @@ class Game(BaseModel):
 
     @property
     def retroarch_core_path(self):
-        path = ""
+        path = None
         retroarch_core = self.game_system.defaults.get("retroarch_core", None)
         if retroarch_core:
-            path = os.path.join(
-                settings.ROMS_DIR,
-                "cores",
-                retroarch_core + "_libretro.so",
+            path = quote(
+                os.path.join(
+                    settings.ROMS_DIR,
+                    "cores",
+                    retroarch_core + "_libretro.so",
+                )
             )
-        return quote(path)
+        return path
 
     @property
     def webretro_url(self):
@@ -243,3 +245,14 @@ class Game(BaseModel):
             return ""
         rom_file = quote(self.rom_file.path)
         return f"retroarch -L {self.retroarch_core_path} {rom_file}"
+
+    def cmd(self, platform="linux"):
+        cmd = None
+        if self.retroarch_cmd(platform):
+            return self.retroarch_cmd(platform)
+
+        rom_file = quote(self.rom_file.path)
+        emulator = self.game_system.defaults.get("emulator", None)
+        if emulator == "PCSX2":
+            cmd = f"{emulator} --console --fullscreen --nogui {rom_file}"
+        return cmd

+ 4 - 4
templates/games/game_detail.html

@@ -74,13 +74,14 @@ $(document).ready(function() {
     </dl>
 
     {% if object.webretro_url  %}
-    <p><a href="{{game.webretro_url}}" class="btn btn-primary" targe="_blank">Play</a></p>
-    {% elif object.retroarch_cmd %}
+    <p><a href="{{game.webretro_url}}" class="btn btn-primary" targe="_blank">Play in browser</a></p>
+    {% endif %}
+    <h5>Retroarch command</h5>
     <p>
         <form>
             <div class="input-group">
                 <input type="text" class="form-control"
-                    value="{{object.retroarch_cmd}}" placeholder="" id="copy-input">
+                    value="{{object.cmd}}" placeholder="" id="copy-input">
                 <span class="input-group-btn">
                 <button class="btn btn-default" type="button" id="copy-button"
                     data-toggle="tooltip" data-placement="button"
@@ -91,7 +92,6 @@ $(document).ready(function() {
             </div>
         </form>
     </p>
-    {% endif %}
 
     <p>{{object.description}}</p>
 {% endblock %}