From 84d643d2965529514f0eab236f7a8750a4501db2 Mon Sep 17 00:00:00 2001 From: frank Date: Fri, 28 Apr 2023 15:15:39 -0400 Subject: [PATCH] fix path prefix regex escape for cross platform path separator --- pgfw/Audio.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pgfw/Audio.py b/pgfw/Audio.py index cc129ed..1f360d0 100644 --- a/pgfw/Audio.py +++ b/pgfw/Audio.py @@ -123,10 +123,12 @@ class Audio(Animation): for node, branches, leaves in os.walk(root, followlinks=True): for leaf in leaves: # use path elements to prepend subdirectories to the SFX name - prefix = re.sub(r"{}".format(root), r"", r"{}".format(node)) - prefix = re.sub(r"^{}".format(os.path.sep), r"", prefix) + print(r"{}".format(re.escape(root)), r"{}".format(re.escape(node)), rf"{root}", rf"{node}") + prefix = re.sub(r"{}".format(re.escape(root)), r"", r"{}".format(node)) + print(prefix) + prefix = re.sub(rf"^\{os.path.sep}", r"", prefix) if prefix: - prefix = re.sub(r"{}".format(os.path.sep), r"_", prefix) + "_" + prefix = re.sub(rf"\{os.path.sep}", r"_", prefix) + "_" self.load_sfx_file(os.path.join(node, leaf,), prefix=prefix) def load_sfx_file(self, path, name=None, replace=False, prefix="", volume=1.0, fade_out=0, loops=0, maxtime=0):