diff --git a/app/tasks/importtasks.py b/app/tasks/importtasks.py index dc512b3..9903655 100644 --- a/app/tasks/importtasks.py +++ b/app/tasks/importtasks.py @@ -78,8 +78,6 @@ def postReleaseCheckUpdate(self, release: PackageRelease, path): tree = build_tree(path, expected_type=ContentType[release.package.type.name], author=release.package.author.username, name=release.package.name) - if tree.name is not None and release.package.name != tree.name and tree.type == ContentType.TOOL: - raise MinetestCheckError(f"Expected {tree.relative} to have technical name {release.package.name}, instead has name {tree.name}") cache = {} def getMetaPackages(names): @@ -103,11 +101,6 @@ def postReleaseCheckUpdate(self, release: PackageRelease, path): depends.discard(tool) optional_depends.discard(tool) - # Raise error on unresolved game dependencies - if package.type == PackageType.GAME and len(depends) > 0: - deps = ", ".join(depends) - raise MinetestCheckError("Game has unresolved hard dependencies: " + deps) - # Add dependencies for meta in getMetaPackages(depends): db.session.add(Dependency(package, meta=meta, optional=False)) diff --git a/app/tasks/minetestcheck/__init__.py b/app/tasks/minetestcheck/__init__.py index 43e36d8..8343546 100644 --- a/app/tasks/minetestcheck/__init__.py +++ b/app/tasks/minetestcheck/__init__.py @@ -22,18 +22,6 @@ class ContentType(Enum): """ assert other - if self == ContentType.TOOL: - if not other.isModLike(): - raise MinetestCheckError("Expected a tool or modpack, found " + other.value) - - elif self == ContentType.ASSETPACK: - if other != ContentType.UNKNOWN and other != ContentType.ASSETPACK: - raise MinetestCheckError("expected a " + self.value + ", found a " + other.value) - - elif other != self: - raise MinetestCheckError("Expected a " + self.value + ", found a " + other.value) - - from .tree import PackageTreeNode, get_base_dir def build_tree(path, expected_type=None, author=None, repo=None, name=None): diff --git a/app/tasks/minetestcheck/tree.py b/app/tasks/minetestcheck/tree.py index a4af714..04a0665 100644 --- a/app/tasks/minetestcheck/tree.py +++ b/app/tasks/minetestcheck/tree.py @@ -53,13 +53,7 @@ class PackageTreeNode: self.read_meta() 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("mods") - elif self.type == ContentType.TOOL: - if self.name and not basenamePattern.match(self.name): - raise MinetestCheckError("Invalid base name for tool {} at {}, names must only contain a-z0-9_." \ - .format(self.name, self.relative)) elif self.type == ContentType.MODPACK: self.add_children_from_mod_dir(None) @@ -94,14 +88,7 @@ class PackageTreeNode: conf = parse_conf(myfile.read()) for key, value in conf.items(): result[key] = value - except SyntaxError as e: - raise MinetestCheckError("Error while reading {}: {}".format(meta_file_rel , e.msg)) - except IOError: - pass - - if "release" in result: - raise MinetestCheckError("{} should not contain 'release' key, as this is for use by ContentDB only.".format(meta_file_rel)) - + except IOError: pass # description.txt if not "description" in result: @@ -139,6 +126,7 @@ class PackageTreeNode: result["optional_depends"] = [] +<<<<<<< HEAD def checkDependencies(deps): for dep in deps: if not basenamePattern.match(dep): @@ -149,6 +137,9 @@ class PackageTreeNode: raise MinetestCheckError( "Invalid dependency name '{}' for tool at {}, names must only contain a-z0-9_." \ .format(dep, self.relative)) +======= + def checkDependencies(deps): pass +>>>>>>> origin/minetestcheck # Check dependencies checkDependencies(result["depends"]) @@ -187,12 +178,15 @@ class PackageTreeNode: path = os.path.join(dir, entry) if not entry.startswith('.') and os.path.isdir(path): child = PackageTreeNode(path, relative + entry + "/", name=entry) +<<<<<<< HEAD if not child.type.isModLike(): raise MinetestCheckError("Expecting tool or modpack, found {} at {} inside {}" \ .format(child.type.value, child.relative, self.type.value)) if child.name is None: raise MinetestCheckError("Missing base name for tool at {}".format(self.relative)) +======= +>>>>>>> origin/minetestcheck self.children.append(child)