From 5cd64c1b8393367e0b5f190a8360c80d91eeb96f Mon Sep 17 00:00:00 2001 From: cuu Date: Tue, 31 Jul 2018 10:54:21 +0800 Subject: [PATCH] mpd title list bug,auto detect retroarch-local.cfg as RETRO_CONFIG --- Menu/GameShell/Music Player/play_list_page.py | 6 +++++- sys.py/UI/main_screen.py | 10 +++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Menu/GameShell/Music Player/play_list_page.py b/Menu/GameShell/Music Player/play_list_page.py index d999321..2463b0b 100644 --- a/Menu/GameShell/Music Player/play_list_page.py +++ b/Menu/GameShell/Music Player/play_list_page.py @@ -97,7 +97,11 @@ class PlayListPage(Page): li._Fonts["normal"] = self._ListFont if "title" in v: - li.Init( v["title"]) + if isinstance(v["title"], (list,)): + li.Init(" | ".join(v["title"])) + else: + li.Init( v["title"]) + if "file" in v: li._Path = v["file"] diff --git a/sys.py/UI/main_screen.py b/sys.py/UI/main_screen.py index d830e95..292d5d2 100644 --- a/sys.py/UI/main_screen.py +++ b/sys.py/UI/main_screen.py @@ -454,14 +454,18 @@ class MainScreen(object): with f: content = f.readlines() content = [x.strip() for x in content] - for i in content: - pis = i.split("=") + for c in content: + pis = c.split("=") if len(pis) > 1: if "EXT" in pis[0]: obj[pis[0]] = pis[1].split(",") else: obj[pis[0]] = pis[1] - + + if FileExists(_dir+"/"+i+"/retroarch-local.cfg"): + obj["RETRO_CONFIG"] = os.path.abspath( _dir+"/"+i+"/retroarch-local.cfg" ) + print("a local retroarch cfg:", obj["RETRO_CONFIG"]) + em = MyEmulator() em._Emulator = obj