skullbite/cartridges
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve playlist file opening check

Browse Source
This commit is contained in:
Rilic
2023-07-16 15:58:50 +01:00
parent 9ccb315a2d
commit 86a34f1596
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/importer/sources/retroarch_source.py
View File

@@ -27,8 +27,7 @@ from time import time
from src import shared from src import shared
from src.game import Game from src.game import Game
from src.importer.sources.location import Location from src.importer.sources.location import Location
from src.importer.sources.source import (Source, SourceIterationResult, from src.importer.sources.source import Source, SourceIterationResult, SourceIterator
SourceIterator)
class RetroarchSourceIterator(SourceIterator): class RetroarchSourceIterator(SourceIterator):
@@ -40,13 +39,13 @@ class RetroarchSourceIterator(SourceIterator):
if file.endswith(".lpl"): if file.endswith(".lpl"):
playlist_files.append(file) playlist_files.append(file)
playlist_items = []
for playlist_file in playlist_files: for playlist_file in playlist_files:
open_file = open(
str(self.source.config_location["playlists"]) + "/" + playlist_file
)
try: try:
playlist_json = json.load(open_file) with open(
self.source.config_location["playlists"] / playlist_file,
encoding="utf-8",
) as open_file:
playlist_json = json.load(open_file)
except (JSONDecodeError, OSError, KeyError): except (JSONDecodeError, OSError, KeyError):
logging.warning("Cannot read playlist file: %s", str(playlist_file)) logging.warning("Cannot read playlist file: %s", str(playlist_file))
continue continue
@@ -114,11 +113,11 @@ class RetroarchSource(Source):
"thumbnails": (True, "thumbnails"), "thumbnails": (True, "thumbnails"),
}, },
) )
@property @property
def executable_format(self): def executable_format(self):
self.config_location.resolve() self.config_location.resolve()
is_flatpak = self.config_location.root.is_relative_to(shared.flatpak_dir) is_flatpak = self.config_location.root.is_relative_to(shared.flatpak_dir)
base = "flatpak run org.libretro.RetroArch" if is_flatpak else "retroarch" base = "flatpak run org.libretro.RetroArch" if is_flatpak else "retroarch"
args = '-L "{core_path}" "{rom_path}"' args = '-L "{core_path}" "{rom_path}"'
return f"{base} {args}" return f"{base} {args}"