Mirrorlandia_minetest/contentdb
1
0
Fork 0
mirror of https://github.com/minetest/contentdb.git synced 2024-12-23 06:22:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add regex checking for dependency names

Browse Source
This commit is contained in:
rubenwardy 2020-08-18 13:57:56 +01:00
parent 0c81d0ae2b
commit 2f208d9239
1 changed files with 44 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
app/tasks/minetestcheck/tree.py
View File

@ -32,6 +32,9 @@ def detect_type(path):
def get_csv_line(line):
if line is None:
return []
return [x.strip() for x in line.split(",") if x.strip() != ""]
@ -52,13 +55,13 @@ class PackageTreeNode:
if self.type == ContentType.GAME:
if not os.path.isdir(baseDir + "/mods"):
raise MinetestCheckError(("Game at {} does not have a mods/ folder").format(self.relative))
self.add_children_from_mod_dir(baseDir + "/mods")
self.add_children_from_mod_dir("mods")
elif self.type == ContentType.MOD:
if self.name and not basenamePattern.match(self.name):
raise MinetestCheckError(("Invalid base name for mod {} at {}, names must only contain a-z0-9_.") \
.format(self.name, self.relative))
elif self.type == ContentType.MODPACK:
self.add_children_from_mod_dir(baseDir)
self.add_children_from_mod_dir(None)
def getMetaFilePath(self):
@ -97,16 +100,12 @@ class PackageTreeNode:
except IOError:
pass
# depends.txt
# Read dependencies
if "depends" in result or "optional_depends" in result:
if "depends" in result:
result["depends"] = get_csv_line(result["depends"])
result["depends"] = get_csv_line(result.get("depends"))
result["optional_depends"] = get_csv_line(result.get("optional_depends"))
if "optional_depends" in result:
result["optional_depends"] = get_csv_line(result["optional_depends"])
else:
try:
elif os.path.isfile(self.baseDir + "/depends.txt"):
pattern = re.compile("^([a-z0-9_]+)\??$")
with open(self.baseDir + "/depends.txt", "r") as myfile:
@ -124,8 +123,21 @@ class PackageTreeNode:
result["depends"] = hard
result["optional_depends"] = soft
except IOError:
pass
else:
result["depends"] = []
result["optional_depends"] = []
# Check dependencies
for dep in result["depends"]:
if not basenamePattern.match(dep):
raise MinetestCheckError(("Invalid dependency name '{}' for mod at {}, names must only contain a-z0-9_.") \
.format(dep, self.relative))
for dep in result["optional_depends"]:
if not basenamePattern.match(dep):
raise MinetestCheckError(("Invalid dependency name '{}' for mod at {}, names must only contain a-z0-9_.") \
.format(dep, self.relative))
# Fix games using "name" as "title"
@ -150,11 +162,17 @@ class PackageTreeNode:
self.meta = result
def add_children_from_mod_dir(self, dir):
def add_children_from_mod_dir(self, subdir):
dir = self.baseDir
relative = self.relative
if subdir:
dir += "/" + subdir
relative += subdir + "/"
for entry in next(os.walk(dir))[1]:
path = os.path.join(dir, entry)
if not entry.startswith('.') and os.path.isdir(path):
child = PackageTreeNode(path, self.relative + entry + "/", name=entry)
child = PackageTreeNode(path, relative + entry + "/", name=entry)
if not child.type.isModLike():
raise MinetestCheckError(("Expecting mod or modpack, found {} at {} inside {}") \
.format(child.type.value, child.relative, self.type.value))