From a123f422911c7c543b35ca405ecb4524f905a1a9 Mon Sep 17 00:00:00 2001
From: rubenwardy <rw@rubenwardy.com>
Date: Sun, 12 Jul 2020 03:09:01 +0100
Subject: Fix incorrect mod name fold in MinetestCheck

---
 app/tasks/minetestcheck/tree.py | 40 ++++++++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 14 deletions(-)

(limited to 'app/tasks/minetestcheck/tree.py')

diff --git a/app/tasks/minetestcheck/tree.py b/app/tasks/minetestcheck/tree.py
index d078545..66dcbc8 100644
--- a/app/tasks/minetestcheck/tree.py
+++ b/app/tasks/minetestcheck/tree.py
@@ -144,26 +144,38 @@ class PackageTreeNode:
 
 				self.children.append(child)
 
+	def getModNames(self):
+		return self.fold("name", type=ContentType.MOD)
+
+	# attr: Attribute name
+	# key: Key in attribute
+	# retval: Accumulator
+	# type: Filter to type
+	def fold(self, attr, key=None, retval=None, type=None):
+		if retval is None:
+			retval = set()
+
+		# Iterate through children
+		for child in self.children:
+			child.fold(attr, key, retval, type)
 
-	def fold(self, attr, key=None, acc=None):
-		if acc is None:
-			acc = set()
-
-		if self.meta is None:
-			return acc
+		# Filter on type
+		if type and type != self.type:
+			return retval
 
+		# Get attribute
 		at = getattr(self, attr)
-		value = at if key is None else at.get(key)
+		if not at:
+			return retval
 
+		# Get value
+		value = at if key is None else at.get(key)
 		if isinstance(value, list):
-			acc |= set(value)
-		elif value is not None:
-			acc.add(value)
-
-		for child in self.children:
-			child.fold(attr, key, acc)
+			retval |= set(value)
+		elif value:
+			retval.add(value)
 
-		return acc
+		return retval
 
 	def get(self, key):
 		return self.meta.get(key)
-- 
cgit v1.2.3