From b2a953c0e52d6e9b1e973626f61204a9062f1c37 Mon Sep 17 00:00:00 2001
From: Xevion <xevioni@yandex.com>
Date: Mon, 20 Apr 2020 02:30:21 -0500
Subject: [PATCH] implement getAnimations, correct regex patterns with
 capturing groups

---
 triple-dungeon/sprites.py | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/triple-dungeon/sprites.py b/triple-dungeon/sprites.py
index eb77079..35ff8e8 100644
--- a/triple-dungeon/sprites.py
+++ b/triple-dungeon/sprites.py
@@ -2,6 +2,7 @@
 sprites.py
 A file dedicated to managing sprites and animations for characters.
 """
+import os
 import re
 
 
@@ -16,8 +17,17 @@ class AnimationSet(object):
 
         :param directory: A directory containing valid animation files in the correct format.
         """
-        pass
 
+        self.animations = os.path.listdir(directory)
+
+    def getAnimations(self, pattern: re.Pattern) -> iter:
+        # Finds all matching files
+        matches = [file for file in self.animations if re.match(pattern, file)]
+        # Sort in ascending order based on the connected animation index. Zero-indexing or not does not affect order.
+        matches.sort(key=lambda match : int(match.group(1)))
+        # Grab the filename and load it to the file directory
+        matches = list(map(lambda match : os.path.join(directory, match.group(0)), matches))
+        return matches
 
 class PlayerAnimations(AnimationSet):
     """
@@ -32,10 +42,11 @@ class PlayerAnimations(AnimationSet):
 
         super(PlayerAnimations, self).__init__()
 
-        self.idles = self.getAnimations(re.compile(r'idle_\d+.png'))
-        self.down = self.getAnimations(re.compile(r'run_down_\d+.png'))
-        self.right = self.getAnimations(re.compile(r'run_right_\d+.png'))
-        self.up = self.getAnimations(re.compile(r'run_up_\d+.png'))
-        self.down = self.getAnimations(re.compile(r'run_left_\d+.png'))
+        # Grabs all animations needed. These are infinite iters, use next(iter) to grab the next animation.
+        self.idles = self.getAnimations(re.compile(r'idle_(\d+).png'))
+        self.down = self.getAnimations(re.compile(r'run_down_(\d+).png'))
+        self.right = self.getAnimations(re.compile(r'run_right_(\d+).png'))
+        self.up = self.getAnimations(re.compile(r'run_up_(\d+).png'))
+        self.down = self.getAnimations(re.compile(r'run_left_(\d+).png'))
 
     def __loadAnimations(self):
\ No newline at end of file